From ed788d318fa02cf84d7076d80cfa8b3a918aae3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 30 Dec 2021 03:37:53 +0100
Subject: [PATCH] feat(weechat): start from clean configs, autoconnect

---
 .versions/stockholm.json    |  8 ++++----
 systems/makanek/weechat.nix | 24 +++++++++++-------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.versions/stockholm.json b/.versions/stockholm.json
index 00c1a6e..dd0ea7d 100644
--- a/.versions/stockholm.json
+++ b/.versions/stockholm.json
@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.lassul.us/stockholm",
-  "rev": "dd565a928a42f870302b3a14eea28eebc575071f",
-  "date": "2021-12-30T02:14:35+01:00",
-  "path": "/nix/store/h7sgsx52qsawbs36ikb9ir0fz3nc4bgp-stockholm",
-  "sha256": "15i545kigizjvm2kh8c913c6fhysvpslsm6p6k1pqinwv85nlk6f",
+  "rev": "e652f40200e5d86240be8f6cea0b9d1ddbbd0ad6",
+  "date": "2021-12-30T03:22:40+01:00",
+  "path": "/nix/store/l3bj9xb2bbs23314qwn0vjbvirksjllh-stockholm",
+  "sha256": "0rjjaqg6jfzfr61gg6jgknhc147rc9qwmyl8cwrfjv63vc60fyqs",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/systems/makanek/weechat.nix b/systems/makanek/weechat.nix
index 7d473dd..9a0641d 100644
--- a/systems/makanek/weechat.nix
+++ b/systems/makanek/weechat.nix
@@ -44,7 +44,7 @@ in {
             };
             server = {
               hackint = {
-                autoconnect = false;
+                autoconnect = true;
                 address = "irc.hackint.org/6697";
                 ipv6 = true;
                 ssl = true;
@@ -54,7 +54,7 @@ in {
                 sasl_password = lib.strings.fileContents <system-secrets/irc/hackint>;
               };
               libera = {
-                autoconnect = false;
+                autoconnect = true;
                 address = "irc.libera.chat/6697";
                 ssl = true;
                 autojoin = [ "#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" ];
@@ -63,7 +63,7 @@ in {
                 sasl_password = lib.strings.fileContents <system-secrets/irc/libera>;
               };
               oftc = {
-                autoconnect = false;
+                autoconnect = true;
                 address = "irc.oftc.net/6697";
                 ssl = true;
                 ipv6 = true;
@@ -74,7 +74,7 @@ in {
                 autojoin = [ "#osm" "#osm-de" "#home-manager" ];
               };
               retiolum = {
-                autoconnect = false;
+                autoconnect = true;
                 address = "irc.r";
                 autojoin = [ "#xxx" "#brockman" "#flix" "#autowifi" ];
                 command = lib.concatStringsSep "\\;" [
@@ -88,7 +88,7 @@ in {
                 sasl_password = lib.strings.fileContents <system-secrets/irc/retiolum>;
               };
               news = {
-                autoconnect = false;
+                autoconnect = true;
                 address = "news.r";
                 autojoin = [ "#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes" ];
                 command = "/oper aids balls";
@@ -100,7 +100,7 @@ in {
             address = "nibbana.jp";
             username = nick;
             password = lib.strings.fileContents <system-secrets/matrix/nibbana>;
-            autoconnect = false;
+            autoconnect = true;
           };
           alias.cmd.mod = "/quote omode $channel +o $nick";
           relay = {
@@ -110,7 +110,7 @@ in {
           filters = {
             zerocovid = {
               buffer = "*";
-              tags = [ "*" ];
+              tags = "*";
               regex = "[kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert";
             };
             joinquit = {
@@ -120,20 +120,17 @@ in {
             };
             playlist_topic = {
               buffer = "irc.*.#the_playlist";
-              tags = [ "irc_topic" ];
+              tags = "irc_topic";
               regex = "*";
             };
             brockman_notice = {
               buffer = "irc.news.*";
-              tags = [ "irc_notice" ];
+              tags = "irc_notice";
               regex = "*";
             };
           };
         };
-        extraCommands = ''
-          /connect -all
-          /matrix connect nibbana
-        '';
+        extraCommands = ''/matrix connect nibbana'';
       };
     };
   in {
@@ -143,6 +140,7 @@ in {
     restartIfChanged = true;
     path = [ pkgs.alacritty.terminfo ];
     environment.WEECHAT_HOME = "/var/lib/weechat";
+    preStart = "${pkgs.coreutils}/bin/rm $WEECHAT_HOME/*.conf";
     script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";
     preStop = "${tmux} kill-session -t IM";
     serviceConfig = {