feat(mpd-fm): rename config file

.versions/home-manager.json

@@ -1,5 +1,5 @@
 {
-  "url": "https://github.com/rycee/home-manager.git",
+  "url": "https://github.com/nix-community/home-manager.git",
   "rev": "91bd34620d73340be03642279ee0d1c64110ee6c",
   "date": "2021-01-22T14:53:58+01:00",
   "path": "/nix/store/ybmjqanz6r1zg2k5hw5d9131cadms06s-home-manager",

configs/mail/accounts.nix

@@ -12,46 +12,85 @@ let
     notmuch.enable = true;
   };
 
+  settings = {
+    fastmail = {
+      smtp = {
+        host = "smtp.fastmail.com";
+        port = 465;
+        tls.enable = true;
+      };
+      imap = {
+        host = "imap.fastmail.com";
+        port = 993;
+        tls.enable = true;
+      };
+    };
+    cock = {
+      smtp = {
+        host = "mail.cock.li";
+        port = 587;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      imap = {
+        host = "mail.cock.li";
+        port = 993;
+        tls.enable = true;
+      };
+    };
+    posteo = {
+      smtp = {
+        host = "posteo.de";
+        port = 587;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      imap = {
+        host = "posteo.de";
+        port = 993;
+        tls.enable = true;
+      };
+    };
+    hu-berlin = {
+      smtp = {
+        host = "mailhost.cms.hu-berlin.de";
+        port = 25;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+      };
+      imap = {
+        host = "mailbox.cms.hu-berlin.de";
+        port = 993;
+        tls.enable = true;
+      };
+    };
+  };
+
   # turns out we have to escape $ because, if the password contains a $, it will get interpolated as a variable by the msmtp `passwordeval` which does: `bash -c "COMMAND; echo"`
   pass_ = file: "echo ${lib.escape ["$"] (lib.escapeShellArg (lib.strings.fileContents file))}";
 in
 {
   fysi = enableDefaults {
     primary = false;
-    smtp = {
-      host = "smtp.fastmail.com";
-      port = 465;
-      tls.enable = true;
-    };
-    imap = {
-      host = "imap.fastmail.com";
-      port = 993;
-      tls.enable = true;
-    };
     userName = "kieran@fysi.tech";
     address = "kieran@fysi.tech";
     realName = kieran.name;
     passwordCommand = pass_ <secrets/mail/fastmail>;
+    inherit (settings.fastmail) imap smtp;
   };
   cock = enableDefaults {
     primary = false;
-    smtp = {
-      host = "mail.cock.li";
-      port = 587;
-      tls = {
-        enable = true;
-        useStartTls = true;
-      };
-    };
-    imap = {
-      host = "mail.cock.li";
-      port = 993;
-      tls.enable = true;
-    };
     userName = "2210@cock.li";
     address = "2210@cock.li";
     realName = "2210";
     passwordCommand = pass_ <secrets/mail/cock>;
+    inherit (settings.cock) imap smtp;
   };
   kieran-gmail = enableDefaults {
     primary = false;
@@ -81,23 +120,11 @@ in
   };
   posteo = enableDefaults {
     primary = true;
-    smtp = {
-      host = "posteo.de";
-      port = 587;
-      tls = {
-        enable = true;
-        useStartTls = true;
-      };
-    };
-    imap = {
-      host = "posteo.de";
-      port = 993;
-      tls.enable = true;
-    };
     address = "kieran.meinhardt@posteo.net";
     realName = kieran.name;
     userName = "kieran.meinhardt@posteo.net";
     passwordCommand = pass_ <secrets/mail/posteo>;
+    inherit (settings.posteo) imap smtp;
   };
   hu-berlin = enableDefaults {
     primary = false;
@@ -105,19 +132,7 @@ in
     realName = kieran.name;
     userName = "meinhark";
     passwordCommand = pass_ <secrets/eduroam/password>;
-    smtp = {
+    inherit (settings.hu-berlin) imap smtp;
-      host = "mailhost.cms.hu-berlin.de";
-      port = 25;
-      tls = {
-        enable = true;
-        useStartTls = true;
-      };
-    };
-    imap = {
-      host = "mailbox.cms.hu-berlin.de";
-      port = 993;
-      tls.enable = true;
-    };
   };
   hu-berlin-work = enableDefaults {
     primary = false;
@@ -125,18 +140,6 @@ in
     realName = kieran.name;
     userName = "meinhaki";
     passwordCommand = pass_ <secrets/mail/meinhaki>;
-    smtp = {
+    inherit (settings.hu-berlin) imap smtp;
-      host = "mailhost.cms.hu-berlin.de";
-      port = 25;
-      tls = {
-        enable = true;
-        useStartTls = true;
-      };
-    };
-    imap = {
-      host = "mailbox.cms.hu-berlin.de";
-      port = 993;
-      tls.enable = true;
-    };
   };
 }

configs/weechat.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
-let inherit (import <niveum/lib>) kieran;
+let
+  inherit (import <niveum/lib>) kieran nixpkgs-unstable;
 in {
   systemd.services.weechat =
   let
@@ -21,21 +22,30 @@ in {
     '';
     weechat = pkgs.weechat.override {
       configure = { ... }: {
+        scripts = [ pkgs.weechatScripts.weechat-autosort nixpkgs-unstable.weechatScripts.colorize_nicks ];
         init = ''
           /set irc.server_default.nicks "kmein,kfm,kieran"
           /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}"
+
+          /server add hackint irc.hackint.org/6697 -ipv6 -ssl -autoconnect
           /server add freenode chat.freenode.org
           /server add irc.r irc.r
           /server add news.r news.r
+
           /alias add mod /quote omode $channel +o $nick
-          /set irc.server.freenode.autojoin "#krebs,##myengadin"
+
+          /set irc.server.freenode.autojoin "#krebs,#flipdot,##myengadin"
           /set irc.server.irc.r.autojoin "#xxx,#brockman"
           /set irc.server.news.r.autojoin "#drachengame,#memes,#all,#berlin"
           /set logger.level.irc.news.r.#all 0
-          /filter addreplace corona irc.news.r.* * corona|covid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi
+
+          /filter addreplace corona irc.news.r.* * [kc]orona|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi
+
+          /set irc.look.server_buffer independent
+
           /connect freenode
           /connect irc.r
           /connect news.r
@@ -46,7 +56,7 @@ in {
     description = "Weechat bouncer";
     after = [ "network.target" ];
     wantedBy = [ "multi-user.target" ];
-    restartIfChanged = false;
+    restartIfChanged = true;
     path = [ pkgs.alacritty.terminfo ];
     environment.WEECHAT_HOME = "/var/lib/weechat";
     script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";

shell.nix

@@ -12,7 +12,7 @@ let
     };
     home-manager = {
       ref = "refs/heads/release-${release}";
-      url = "https://github.com/rycee/home-manager.git";
+      url = "https://github.com/nix-community/home-manager.git";
       path = toString .versions/home-manager.json;
     };
     krops = {

systems/zaatar/configuration.nix

@@ -7,7 +7,7 @@
     <niveum/configs/keyboard.nix>
     <niveum/modules/retiolum.nix>
     <niveum/configs/spacetime.nix>
-    <niveum/configs/mpd.nix>
+    <niveum/configs/mpd-fm.nix>
     <niveum/configs/sshd.nix>
     <niveum/configs/version.nix>
     <niveum/configs/spotifyd.nix>