From 90528e8e5b7f822526c8c71e807a6149e96c3dcc Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date: Tue, 23 Dec 2014 09:57:00 +0200
Subject: [PATCH] irc/hexchat: update servlist.confs

---
 irc/hexchat/.servlist.conf.Mikaela | 109 +++--------------------------
 irc/hexchat/servlist.conf          |  51 +-------------
 2 files changed, 10 insertions(+), 150 deletions(-)

diff --git a/irc/hexchat/.servlist.conf.Mikaela b/irc/hexchat/.servlist.conf.Mikaela
index c7dd070..e69e73d 100644
--- a/irc/hexchat/.servlist.conf.Mikaela
+++ b/irc/hexchat/.servlist.conf.Mikaela
@@ -1,111 +1,55 @@
 v=2.11.0
 
-N=direct-athemenet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.atheme.org/6697
-
-N=direct-chatlounge
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.chatlounge.net/6697
-
-N=direct-chatspike
+N=chatspike
 L=10
 E=UTF-8 (Unicode)
 F=55
 D=0
 S=irc.chatspike.net/6697
 
-N=direct-efnet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.efnet.org/6697
-
-N=direct-entropynet
+N=entropynet
 L=10
 E=UTF-8 (Unicode)
 F=55
 D=0
 S=irc.entropynet.net/6697
 
-N=direct-freenode
+N=freenode
 L=10
 E=UTF-8 (Unicode)
 F=23
 D=0
 S=chat.freenode.net/6697
 
-N=direct-freenode-testnet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=testnet.freenode.net/9003
-
-N=direct-hackint
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.hackint.eu/6697
-
-N=direct-interlinked
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.interlinked.me/6697
-
-N=direct-ircnet
+N=ircnet
 E=UTF-8 (Unicode)
 F=19
 D=0
 S=irc.cs.tut.fi
 
-N=direct-nerv
+N=nerv
 L=10
 E=UTF-8 (Unicode)
 F=55
 D=0
 S=irc.nerv.fi/6697
 
-N=direct-oftc
+N=oftc
 L=10
 E=UTF-8 (Unicode)
 F=23
 D=0
 S=irc.oftc.net/6697
 
-N=direct-piratenet
+N=pirateirc
 L=10
 E=UTF-8 (Unicode)
 F=23
 D=0
 S=irc.pirateirc.net/6697
 
-N=direct-quakenet
-L=10
-E=UTF-8 (Unicode)
-F=19
-D=0
-S=irc.quakenet.org/6667
-
-N=znc-athemenet
-P=Mikaela@IDENTIFIER/athemenet:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc-chatlounge
-P=Mikaela@IDENTIFIER/chatlounge:
+N=znc-bitlbee
+P=Mikaela@IDENTIFIER/bitlbee:
 E=UTF-8 (Unicode)
 F=53
 D=0
@@ -118,13 +62,6 @@ F=53
 D=0
 S=lakka.kapsi.fi/62293
 
-N=znc-efnet
-P=Mikaela@IDENTIFIER/efnet:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
 N=znc-entropynet
 P=Mikaela@IDENTIFIER/entropynet:
 E=UTF-8 (Unicode)
@@ -139,27 +76,6 @@ F=53
 D=0
 S=lakka.kapsi.fi/62293
 
-N=znc-freenodetestnet
-P=Mikaela@IDENTIFIER/freenodetestnet:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc-hackint
-P=Mikaela@IDENTIFIER/hackint:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
-N=znc-interlinked
-P=Mikaela@IDENTIFIER/interlinked:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
 N=znc-ircnet
 P=Mikaela@IDENTIFIER/ircnet:
 E=UTF-8 (Unicode)
@@ -188,10 +104,3 @@ F=53
 D=0
 S=lakka.kapsi.fi/62293
 
-N=znc-quakenet
-P=Mikaela@IDENTIFIER/quakenet:
-E=UTF-8 (Unicode)
-F=53
-D=0
-S=lakka.kapsi.fi/62293
-
diff --git a/irc/hexchat/servlist.conf b/irc/hexchat/servlist.conf
index 2c21db2..6cbd972 100644
--- a/irc/hexchat/servlist.conf
+++ b/irc/hexchat/servlist.conf
@@ -1,19 +1,5 @@
 v=2.11.0
 
-N=athemenet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.atheme.org/6697
-
-N=chatlounge
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.chatlounge.net/6697
-
 N=chatspike
 L=10
 E=UTF-8 (Unicode)
@@ -21,13 +7,6 @@ F=55
 D=0
 S=irc.chatspike.net/6697
 
-N=efnet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.efnet.org/6697
-
 N=entropynet
 L=10
 E=UTF-8 (Unicode)
@@ -42,27 +21,6 @@ F=23
 D=0
 S=chat.freenode.net/6697
 
-N=freenode-testnet
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=testnet.freenode.net/9003
-
-N=hackint
-L=10
-E=UTF-8 (Unicode)
-F=55
-D=0
-S=irc.hackint.eu/6697
-
-N=interlinked
-L=10
-E=UTF-8 (Unicode)
-F=23
-D=0
-S=irc.interlinked.me/6697
-
 N=ircnet
 E=UTF-8 (Unicode)
 F=19
@@ -83,17 +41,10 @@ F=23
 D=0
 S=irc.oftc.net/6697
 
-N=piratenet
+N=pirateirc
 L=10
 E=UTF-8 (Unicode)
 F=23
 D=0
 S=irc.pirateirc.net/6697
 
-N=quakenet
-L=10
-E=UTF-8 (Unicode)
-F=19
-D=0
-S=irc.quakenet.org/6667
-