feat(weechat): start from clean configs, autoconnect

.versions/krops.json

@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.krebsco.de/krops",
-  "rev": "cccebf3ff7a53336b3f106cb96dddd5892d427ed",
-  "date": "2021-03-23T22:47:37+01:00",
-  "path": "/nix/store/mz13xxnil35lwsf90hwnrm2agir7hb51-krops",
-  "sha256": "07mg3iaqjf1w49vmwfchi7b1w55bh7rvsbgicp2m47gnj9alwdb6",
+  "rev": "13ae434b140035e7e2664bd5a8ef4c475413b2e0",
+  "date": "2021-11-20T15:46:09+01:00",
+  "path": "/nix/store/ig76yx6z8wmc9papmxg5xnjhl9l22dvb-krops",
+  "sha256": "0mzn213dh3pklvdzfpwi4nin4lncdap447zvl11j81r809jll76j",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/stockholm.json

@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.lassul.us/stockholm",
-  "rev": "576c05cf3a0ceddefa29c2d0073108177c3cfa52",
-  "date": "2021-12-22T13:59:46+01:00",
-  "path": "/nix/store/yx1j5pardgd9114f0cf3c4xjfq6r4yfv-stockholm",
-  "sha256": "18napi4k8i2iizrismlp9ha3ga6c3n2dvrhijy59kl1jxqrsaq9l",
+  "rev": "e652f40200e5d86240be8f6cea0b9d1ddbbd0ad6",
+  "date": "2021-12-30T03:22:40+01:00",
+  "path": "/nix/store/l3bj9xb2bbs23314qwn0vjbvirksjllh-stockholm",
+  "sha256": "0rjjaqg6jfzfr61gg6jgknhc147rc9qwmyl8cwrfjv63vc60fyqs",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

configs/nix.nix

@@ -9,7 +9,7 @@
   };
   # enable `nix flake`
   nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = "experimental-features = nix-command flakes";
+    package = pkgs.nix;
+    # extraOptions = "experimental-features = nix-command flakes";
   };
 }

deploy.nix

@@ -1,68 +1,45 @@
 let
-  inherit (import ./lib/default.nix) sshPort;
+  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
+  lib = import "${krops}/lib";
+  pkgs = import "${krops}/pkgs" {};
 
+  importJson = (import <nixpkgs> {}).lib.importJSON;
   gitFromJson = path:
-    let object = importJson path;
+    let
+      object = importJson path;
     in {
       inherit (object) url;
       ref = object.rev;
     };
-  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
-  lib = import "${krops}/lib";
-  pkgs = import "${krops}/pkgs" { };
-  importJson = (import <nixpkgs> { }).lib.importJSON;
 
-  regularSystem = { path, name, address }: {
-    source = lib.evalSource [{
-      niveum.file = toString ./.;
-      system.file = toString path;
-      nixos-config.symlink = "system/configuration.nix";
+  source = name: {
+    niveum.file = toString ./.;
+    nixos-config.symlink =  "niveum/systems/${name}/configuration.nix";
 
-      nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
-      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
-      home-manager.git = gitFromJson .versions/home-manager.json;
-      stockholm.git = gitFromJson .versions/stockholm.json;
-      nix-writers.git = gitFromJson .versions/nix-writers.json;
-      retiolum.git = gitFromJson .versions/retiolum.json;
-      nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
-      system-secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "systems/${name}";
-      };
-      secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "shared";
-      };
-    }];
-    target = "root@${address}:${toString sshPort}";
+    nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
+    nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
+    home-manager.git = gitFromJson .versions/home-manager.json;
+    stockholm.git = gitFromJson .versions/stockholm.json;
+    nix-writers.git = gitFromJson .versions/nix-writers.json;
+    retiolum.git = gitFromJson .versions/retiolum.json;
+    nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
+    system-secrets.pass = {
+      dir = toString ~/.password-store;
+      name = "systems/${name}";
+    };
+    secrets.pass = {
+      dir = toString ~/.password-store;
+      name = "shared";
+    };
+  };
+
+  system = {name, host}: let inherit (import ./lib/default.nix) sshPort; in pkgs.krops.writeDeploy "deploy-${name}" {
+    source = lib.evalSource [ (source name) ];
+    target = "root@${host}:${toString sshPort}";
   };
-  inherit (pkgs.krops) writeDeploy;
 in {
-  zaatar = writeDeploy "deploy-zaatar" (regularSystem {
-    path = systems/zaatar;
-    name = "zaatar";
-    address = "zaatar.r";
-  });
-  kabsa = writeDeploy "deploy-kabsa" (regularSystem {
-    path = systems/kabsa;
-    name = "kabsa";
-    address = "kabsa.r";
-  });
-  toum = writeDeploy "deploy-toum" (regularSystem {
-    path = systems/toum;
-    name = "toum";
-    address = "toum.r";
-  }) // {
-    buildTarget = "${builtins.getEnv "USER"}@localhost/${builtins.getEnv "HOME"}/.cache/krops";
-  };
-  makanek = writeDeploy "deploy-makanek" (regularSystem {
-    path = systems/makanek;
-    name = "makanek";
-    address = "makanek.r";
-  });
-  manakish = writeDeploy "deploy-manakish" (regularSystem {
-    path = systems/manakish;
-    name = "manakish";
-    address = "manakish.r";
-  });
+  zaatar = system { name = "zaatar"; host = "zaatar.r"; };
+  kabsa = system { name = "kabsa"; host = "kabsa.r"; };
+  makanek = system { name = "makanek"; host = "makanek.r"; };
+  manakish = system { name = "manakish"; host = "manakish.r"; };
 }

shell.nix

@@ -26,7 +26,7 @@ let
       path = toString .versions/home-manager.json;
     };
     krops = {
-      ref = "refs/tags/v1.25.0";
+      ref = "refs/tags/1.26.2";
       url = "https://cgit.krebsco.de/krops";
       path = toString .versions/krops.json;
     };

systems/makanek/weechat.nix

@@ -21,75 +21,116 @@ in {
         bind-key C-s switch-client -l
       ''} "$@"
     '';
-    weechat = pkgs.weechat.override {
-      configure = { ... }: {
-        scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks pkgs.weechatScripts.weechat-matrix ];
-        init = let
-          coolColors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
-          nick = "kmein";
-        in ''
-          /mouse enable
-          /set irc.server_default.nicks "${nick}"
-          /set irc.server_default.msg_part "tschö mit ö"
-          /set irc.server_default.msg_quit "ciao kakao"
-          /set irc.server_default.msg_kick "warum machst du diese?"
-          /set irc.server_default.realname "${kieran.name}"
-
-          /set irc.look.color_nicks_in_nicklist "on"
-          /set weechat.color.chat_nick_colors "${lib.concatMapStringsSep "," toString coolColors}"
-
-          /server add hackint irc.hackint.org/6697 -ipv6 -ssl
-          /server add libera irc.libera.chat/6697 -ssl
-          /server add oftc irc.oftc.net/6697 -ssl -ipv6
-          /server add retiolum irc.r
-          /server add news news.r
-          /matrix server add nibbana nibbana.jp
-
-          /alias add mod /quote omode $channel +o $nick
-
-          /relay add weechat 9000
-          /set relay.network.password ${relayPassword}
-
-          /set matrix.server.nibbana.username ${nick}
-          /set matrix.server.nibbana.password "${lib.strings.fileContents <system-secrets/matrix/nibbana>}"
-
-          /set irc.server.oftc.command /msg nickserv IDENTIFY ${lib.strings.fileContents <system-secrets/irc/oftc>};/msg nickserv SET CLOAK ON
-          /set irc.server.oftc.autojoin "#osm,#osm-de,#home-manager"
-
-          /set irc.server.hackint.autojoin "#krebs,#nixos,#the_playlist"
-          /set irc.server.hackint.sasl_mechanism plain
-          /set irc.server.hackint.sasl_username ${nick}
-          /set irc.server.hackint.sasl_password ${lib.strings.fileContents <system-secrets/irc/hackint>}
-
-          /set irc.server.libera.autojoin "#flipdot,#haskell,#nixos,#fysi,#binaergewitter"
-          /set irc.server.libera.sasl_mechanism plain
-          /set irc.server.libera.sasl_username ${nick}
-          /set irc.server.libera.sasl_password ${lib.strings.fileContents <system-secrets/irc/libera>}
-
-          /set irc.server.retiolum.autojoin "#xxx,#brockman,#flix,#autowifi"
-          /set irc.server.retiolum.command "/oper admin aidsballs;/msg nickserv always-on true;/msg nickserv autoreplay-missed on;/msg nickserv auto-away"
-          /set irc.server.retiolum.sasl_mechanism plain
-          /set irc.server.retiolum.sasl_username ${nick}
-          /set irc.server.retiolum.sasl_password ${lib.strings.fileContents <system-secrets/irc/retiolum>}
-
-          /set irc.server.news.autojoin "#cook,#drachengame,#oepnv,#kmeinung,#memes"
-          /set irc.server.news.command "/oper aids balls"
-          /set logger.level.irc.news 0
-
-          /filter addreplace zerocovid * * [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
-          /filter addreplace joinquit * irc_join,irc_part,irc_quit,irc_nick *
-          /filter addreplace playlist_topic irc.*.#the_playlist irc_topic *
-          /filter addreplace brockman_notice irc.news.* irc_notice *
-
-          /set irc.look.server_buffer independent
-
-          /connect libera
-          /connect oftc
-          /connect hackint
-          /connect retiolum
-          /connect news
-          /matrix connect nibbana
-        '';
+    weechat = pkgs.weechat-declarative.override {
+      config = {
+        scripts = [
+          pkgs.weechatScripts.weechat-autosort
+          pkgs.weechatScripts.colorize_nicks
+          pkgs.weechatScripts.weechat-matrix
+        ];
+        settings = let nick = "kmein"; in {
+          weechat = {
+            look.mouse = true;
+            color.chat_nick_colors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
+          };
+          irc = {
+            look.server_buffer = "independent";
+            server_default = {
+              nicks = nick;
+              msg_part = "tschö mit ö";
+              msg_quit = "ciao kakao";
+              msg_kick = "warum machst du diese?";
+              realname = kieran.name;
+            };
+            server = {
+              hackint = {
+                autoconnect = true;
+                address = "irc.hackint.org/6697";
+                ipv6 = true;
+                ssl = true;
+                autojoin = [ "#krebs" "#nixos" "#the_playlist" ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = lib.strings.fileContents <system-secrets/irc/hackint>;
+              };
+              libera = {
+                autoconnect = true;
+                address = "irc.libera.chat/6697";
+                ssl = true;
+                autojoin = [ "#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = lib.strings.fileContents <system-secrets/irc/libera>;
+              };
+              oftc = {
+                autoconnect = true;
+                address = "irc.oftc.net/6697";
+                ssl = true;
+                ipv6 = true;
+                command = lib.concatStringsSep "\\;" [
+                  "/msg nickserv identify ${lib.strings.fileContents <system-secrets/irc/oftc>}"
+                  "/msg nickserv set cloak on"
+                ];
+                autojoin = [ "#osm" "#osm-de" "#home-manager" ];
+              };
+              retiolum = {
+                autoconnect = true;
+                address = "irc.r";
+                autojoin = [ "#xxx" "#brockman" "#flix" "#autowifi" ];
+                command = lib.concatStringsSep "\\;" [
+                  "/oper admin aidsballs"
+                  "/msg nickserv always-on true"
+                  "/msg nickserv autoreplay-missed on"
+                  "/msg nickserv auto-away"
+                ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = lib.strings.fileContents <system-secrets/irc/retiolum>;
+              };
+              news = {
+                autoconnect = true;
+                address = "news.r";
+                autojoin = [ "#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes" ];
+                command = "/oper aids balls";
+              };
+            };
+          };
+          logger.level.irc.news = 0;
+          matrix.server.nibbana = {
+            address = "nibbana.jp";
+            username = nick;
+            password = lib.strings.fileContents <system-secrets/matrix/nibbana>;
+            autoconnect = true;
+          };
+          alias.cmd.mod = "/quote omode $channel +o $nick";
+          relay = {
+            port.weechat = 9000;
+            network.password = relayPassword;
+          };
+          filters = {
+            zerocovid = {
+              buffer = "*";
+              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 = {
+              buffer = "*";
+              tags = [ "irc_join" "irc_part" "irc_quit" "irc_nick" ];
+              regex = "*";
+            };
+            playlist_topic = {
+              buffer = "irc.*.#the_playlist";
+              tags = "irc_topic";
+              regex = "*";
+            };
+            brockman_notice = {
+              buffer = "irc.news.*";
+              tags = "irc_notice";
+              regex = "*";
+            };
+          };
+        };
+        extraCommands = ''/matrix connect nibbana'';
       };
     };
   in {
@@ -99,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 = {