project-wide: Cleanup and services + private overhaul

hosts/athame/home/weechat.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, witch, lib, superConfig, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.weechat = {
@@ -16,7 +16,7 @@
       '')
       (lib.mkAfter "/matrix connect kat")
     ];
-    packageUnwrapped = pkgs.unstable.weechat-unwrapped;
+    packageUnwrapped = pkgs.weechat-unwrapped;
     homeDirectory = "${config.xdg.dataHome}/weechat";
     plugins.python = {
       enable = true;
@@ -32,9 +32,11 @@
       vimode-git
       weechat-matrix
       weechat-notify-send
-      weechat-title
+      title
     ];
     config = {
+      logger.level.irc = 0;
+      logger.level.matrix = 0;
       weechat = {
         look = { mouse = true; };
         bar = {
@@ -42,7 +44,6 @@
           nicklist = { size_max = 18; };
         };
       };
-      relay.network.password = witch.secrets.unscoped.weechat.relay;
       urlgrab.default.copycmd = "${pkgs.wl-clipboard}/bin/wl-copy";
       plugins.var.python.vimode.copy_clipboard_cmd = "wl-copy";
       plugins.var.python.vimode.paste_clipboard_cmd = "wl-paste --no-newline";
@@ -52,25 +53,7 @@
       plugins.var.python.title.title_suffix = " ]";
       plugins.var.python.notify_send.icon = "";
       plugins.var.python.go.short_name = true;
-      irc = {
-        look = { server_buffer = "independent"; };
-        server = {
-          freenode = {
-            address = "athame.kittywit.ch/5001";
-            password = "kat/freenode:${witch.secrets.unscoped.weechat.znc}";
-            ssl = true;
-            ssl_verify = false;
-            autoconnect = true;
-          };
-          espernet = {
-            address = "athame.kittywit.ch/5001";
-            password = "kat/espernet:${witch.secrets.unscoped.weechat.znc}";
-            ssl = true;
-            ssl_verify = false;
-            autoconnect = true;
-          };
-        };
-      };
+      irc = { look = { server_buffer = "independent"; }; };
       matrix = {
         network = {
           max_backlog_sync_events = 30;
@@ -82,13 +65,6 @@
           server_buffer = "independent";
           redactions = "notice";
         };
-        server.kat = {
-          address = "kittywit.ch";
-          device_name = "${superConfig.networking.hostName}/weechat";
-          username = "kat";
-          password = "${witch.secrets.unscoped.weechat.matrix}";
-          autoconnect = true;
-        };
       };
     };
   };

hosts/athame/nixos/default.nix

@@ -14,14 +14,12 @@ with lib;
     ../../../services/postgres.nix
     ../../../services/nginx.nix
     ../../../services/mail.nix
-    ../../../services/asterisk.nix
     ../../../services/gitea
     ../../../services/syncplay.nix
     ../../../services/weechat.nix
     ../../../services/bitwarden.nix
     ../../../services/taskserver.nix
     ../../../services/murmur.nix
-    ../../../services/znc.nix
     ../../../services/matrix.nix
     ../../../services/restic.nix
   ];

hosts/athame/nixos/virtualhosts.nix

@@ -1,4 +1,6 @@
-{ config, pkgs, witch, ... }:
+{ config, lib, pkgs, ... }:
+
+with lib;
 
 let
   common = {
@@ -10,7 +12,7 @@ in {
     "kittywit.ch" = { root = pkgs.kat-website; } // common;
     "athame.kittywit.ch" = { root = "/var/www/athame"; } // common;
     "files.kittywit.ch" = { root = "/var/www/files"; } // common;
-  } // witch.secrets.virtualHosts.athame;
+  };
 
   deploy.tf.dns.records.kittywitch_files = {
     tld = "kittywit.ch.";

hosts/ostara/nixos/default.nix

@@ -1,8 +1,7 @@
 { config, pkgs, profiles, ... }:
 
 {
-  imports =
-    [ ./hw.nix profiles.kat profiles.laptop ];
+  imports = [ ./hw.nix profiles.kat profiles.laptop ];
 
   deploy.target = "slow";
 

hosts/samhain/nixos/default.nix

@@ -1,4 +1,4 @@
-{ tf, config, pkgs, lib, profiles, sources, witch, ... }:
+{ tf, config, pkgs, lib, profiles, sources, ... }:
 
 with lib;
 
@@ -17,7 +17,6 @@ in {
     ../../../services/nginx.nix
     ./thermal
     ./vm
-    ./nfs.nix
     ./transmission.nix
     ./jellyfin.nix
     ./virtualhosts.nix

hosts/samhain/nixos/jellyfin.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, witch, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   katnet.public.tcp.ranges = [{

hosts/samhain/nixos/nfs.nix

@@ -1,12 +0,0 @@
-{ config, witch, lib, ... }:
-
-with lib;
-
-{
-  katnet.private.tcp.ports = [ 111 2049 ];
-  katnet.public.tcp.ports = [ 111 2049 ];
-
-  services.nfs.server.enable = true;
-  services.nfs.server.exports =
-    "/mnt/zraw/media 192.168.1.0/24(rw) 200::/7(rw) ${witch.secrets.unscoped.ipv6_prefix}(rw)";
-}

hosts/samhain/nixos/vm/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, sources, witch, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   /* # libvirtd is used for our virtual machine
@@ -113,8 +113,7 @@
       scream = {
         Unit = { Description = "Scream - Audio forwarding from the VM."; };
         Service = {
-          ExecStart =
-            "${pkgs.arc.pkgs.scream-arc}/bin/scream -i virbr0 -o pulse";
+          ExecStart = "${pkgs.scream-arc}/bin/scream -i virbr0 -o pulse";
           Restart = "always";
         };
         Install = { WantedBy = [ "default.target" ]; };