From 21c9dd899c5fff7703aae23ce8534cf1bbe0c24a Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Wed, 9 Dec 2020 12:16:57 +0200
Subject: [PATCH] irc/hexchat: modernize servlist.conf

Resolves: #2
---
 irc/hexchat/.servlist.conf.Mikaela | 106 -----------------------------
 irc/hexchat/servlist.conf          |  62 +++++++++--------
 2 files changed, 35 insertions(+), 133 deletions(-)
 delete mode 100644 irc/hexchat/.servlist.conf.Mikaela

diff --git a/irc/hexchat/.servlist.conf.Mikaela b/irc/hexchat/.servlist.conf.Mikaela
deleted file mode 100644
index 69e4e46..0000000
--- a/irc/hexchat/.servlist.conf.Mikaela
+++ /dev/null
@@ -1,106 +0,0 @@
-v=2.12.0
-
-N=chatspike
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.chatspike.net/6697
-
-N=freenode
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=chat.freenode.net/6697
-
-N=linuxchix
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.linuxchix.org/6697
-
-N=oftc
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.oftc.net/6697
-
-N=pirateirc
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.pirateirc.net/6697
-
-N=znc1-bitlbee
-P=Mikaela@hexchat/bitlbee:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-chatspike
-P=Mikaela@hexchat/chatspike:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-freenode
-P=Mikaela@hexchat/freenode:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-helnodeslack
-P=Mikaela@hexchat/helnodeslack:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-linuxchix
-P=Mikaela@hexchat/linuxchix:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-oftc
-P=Mikaela@hexchat/oftc:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-piraatitslack
-P=Mikaela@hexchat/piraatitslack:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc1-pirateirc
-P=Mikaela@hexchat/pirateirc:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc2-freenode
-P=Mikaela@hexchat/freenode:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=vardiera.mikaela.info/1234
-
-N=znc2-pirateirc
-P=Mikaela@hexchat/pirateirc:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=vardiera.mikaela.info/1234
-
diff --git a/irc/hexchat/servlist.conf b/irc/hexchat/servlist.conf
index 6a25a7f..adc4ad2 100644
--- a/irc/hexchat/servlist.conf
+++ b/irc/hexchat/servlist.conf
@@ -1,36 +1,44 @@
-v=2.12.0
+v=2.14.3
 
-N=chatspike
-L=10
+N=PirateIRC2
+I=Mikaela
+i=Ciblia
+U=MikaelaSuomalainen@HEXCHAT
+R=Mikaela Suomalainen
+P=
+L=6
 E=UTF-8 (Unicode)
-F=55
+F=93
 D=0
-S=irc.chatspike.net/6697
+S=irc2.piraattipuolue.fi/6697
+C=OPER MikaelaSuomalainen 
+J=#antikupla
+J=#cz-feed
+J=#globalPirates
+J=#Mikaela.info
+J=#opers
+J=#piraatit
+J=#piraattinuoret
+J=#syotteet
+J=#TeknologiaAvoimeksi
+J=#test
+J=#verkkopalvelut
+J=#Yggdrasil
 
-N=freenode
-L=10
+N=Oragono Testnet
+U=Mikaela@HEXCHAT
+P=
+L=6
 E=UTF-8 (Unicode)
-F=23
+F=93
 D=0
-S=chat.freenode.net/6697
+S=testnet.oragono.io/6697
 
-N=linuxchix
+N=NixNet
+U=Mikaela@HEXCHAT
+P=
+L=6
 E=UTF-8 (Unicode)
-F=55
+F=93
 D=0
-S=irc.linuxchix.org/6697
-
-N=oftc
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.oftc.net/6697
-
-N=pirateirc
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.pirateirc.net/6697
-
+S=irc.nixnet.services/6697