From 7eee2b197a3b7b6bdbeede3c5f06c84a8e8ab19e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 3 Dec 2022 04:20:00 +0000 Subject: [PATCH] treewide: use liberachat and OFTC in examples Freenode was taken over by a wannabe bitcoin millionaire [1], which prompted the migration of communities to Libera Chat and OFTC [2]. [1] https://blog.bofh.it/debian/id_461 [2] https://hackaday.com/2021/05/20/freenode-debacle-prompts-staff-exodus-new-network/ (cherry picked from commit 6ce326cef9798c6275882954b11cd824b6e31df2) --- modules/programs/hexchat.nix | 8 +++----- modules/programs/irssi.nix | 4 ++-- .../basic-configuration-expected-serverlist-config | 6 ++---- tests/modules/programs/hexchat/basic-configuration.nix | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/modules/programs/hexchat.nix b/modules/programs/hexchat.nix index a23ea622..4eda0755 100644 --- a/modules/programs/hexchat.nix +++ b/modules/programs/hexchat.nix @@ -170,7 +170,7 @@ let servers = mkOption { type = listOf str; default = [ ]; - example = [ "chat.freenode.net" "irc.freenode.net" ]; + example = [ "irc.oftc.net" ]; description = "IRC Server Address List."; }; }; @@ -239,11 +239,10 @@ in { default = { }; example = literalExpression '' { - freenode = { + oftc = { autojoin = [ "#home-manager" "#linux" - "#nixos" ]; charset = "UTF-8 (Unicode)"; commands = [ @@ -263,8 +262,7 @@ in { password = "my_password"; realName = "my_realname"; servers = [ - "chat.freenode.net" - "irc.freenode.net" + "irc.oftc.net" ]; userName = "my_username"; }; diff --git a/modules/programs/irssi.nix b/modules/programs/irssi.nix index 355be085..d0953ed7 100644 --- a/modules/programs/irssi.nix +++ b/modules/programs/irssi.nix @@ -185,10 +185,10 @@ in { default = { }; example = literalExpression '' { - freenode = { + liberachat = { nick = "hmuser"; server = { - address = "chat.freenode.net"; + address = "irc.libera.chat"; port = 6697; autoConnect = true; }; diff --git a/tests/modules/programs/hexchat/basic-configuration-expected-serverlist-config b/tests/modules/programs/hexchat/basic-configuration-expected-serverlist-config index 29d23284..e550ca48 100644 --- a/tests/modules/programs/hexchat/basic-configuration-expected-serverlist-config +++ b/tests/modules/programs/hexchat/basic-configuration-expected-serverlist-config @@ -8,7 +8,7 @@ S=irc.mzima.net S=irc.prison.net J=#computers -N=freenode +N=oftc L=6 E=UTF-8 (Unicode) F=12 @@ -17,8 +17,6 @@ i=user_ R=real_user U=user P=password -S=chat.freenode.net -S=irc.freenode.net +S=irc.oftc.net J=#home-manager -J=#nixos diff --git a/tests/modules/programs/hexchat/basic-configuration.nix b/tests/modules/programs/hexchat/basic-configuration.nix index 1aa39bd4..6371a0e0 100644 --- a/tests/modules/programs/hexchat/basic-configuration.nix +++ b/tests/modules/programs/hexchat/basic-configuration.nix @@ -6,7 +6,7 @@ enable = true; overwriteConfigFiles = true; channels = { - freenode = { + oftc = { charset = "UTF-8 (Unicode)"; userName = "user"; password = "password"; @@ -18,8 +18,8 @@ autoconnect = true; forceSSL = true; }; - servers = [ "chat.freenode.net" "irc.freenode.net" ]; - autojoin = [ "#home-manager" "#nixos" ]; + servers = [ "irc.oftc.net" ]; + autojoin = [ "#home-manager" ]; }; efnet = { options = { forceSSL = true; };