From 617949093ecd242114efe1cfae5081c06c1f45ec Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Mon, 2 Nov 2026 14:00:05 +0100
Subject: treewide: Apply changes from server/system config alignment

---
 hosts/by-name/tiamat/configuration.nix  | 12 ++++++++--
 modules/by-name/co/constants/module.nix | 41 ++++++++++++++++++++++-----------
 modules/by-name/xd/xdg/module.nix       |  4 ++++
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/hosts/by-name/tiamat/configuration.nix b/hosts/by-name/tiamat/configuration.nix
index baa9215a..35378aa9 100644
--- a/hosts/by-name/tiamat/configuration.nix
+++ b/hosts/by-name/tiamat/configuration.nix
@@ -68,8 +68,16 @@
     };
     users = {
       enable = true;
-      enableDeprecatedPlugdev = true;
-      hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6";
+      users = [
+        {
+          name = "soispha";
+          groups = ["wheel" "audio"];
+          enableDeprecatedPlugdev = true;
+          uid = 1000;
+          sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz";
+          hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6";
+        }
+      ];
     };
   };
 
diff --git a/modules/by-name/co/constants/module.nix b/modules/by-name/co/constants/module.nix
index 9de2bce1..de094cdd 100644
--- a/modules/by-name/co/constants/module.nix
+++ b/modules/by-name/co/constants/module.nix
@@ -62,6 +62,12 @@
       node-exporter = 348;
       smartctl-exporter-access = 349;
       fail2ban = 350;
+      wpa_supplicant = 351;
+      mandb = 352;
+      rtkit = 353;
+      nm-iodine = 354;
+      fwupd-refresh = 355;
+      avahi = 356;
 
       # As per the NixOS file, the uids should not be greater or equal to 400;
     };
@@ -73,41 +79,50 @@
       inherit
         (uids)
         acme
+        adbusers
         anubis
+        avahi
         dhcpcd
         etebase-server
+        fail2ban
+        fluent-bit
+        fwupd-refresh
+        grafana
+        grocy
         knot-resolver
+        loki
+        lpadmin
+        mandb
         mastodon
         matrix-synapse
         mautrix-whatsapp
+        msr
         nextcloud
         nix-sync
+        node-exporter
         nscd
         opendkim
         peertube
+        polkituser
         postfix-tlspol
         redis-mastodon
         redis-nextcloud
         redis-peertube
         redis-rspamd
+        redis-sharkey
         redis-stalwart-mail
+        resolvconf # This group is not matched to an user?
+        rocie
         rspamd
+        rtkit
+        sharkey
+        smartctl-exporter-access
         sshd
         stalwart-mail
-        systemd-oom
-        sharkey
-        redis-sharkey
-        grocy
-        systemd-coredump # matches systemd-coredump user
-        resolvconf # This group is not matched to an user?
         stalwart-mail-certificates # This group is used to connect nginx and stalwart-mail
-        rocie
-        fluent-bit
-        loki
-        grafana
-        node-exporter
-        smartctl-exporter-access
-        fail2ban
+        systemd-coredump # matches systemd-coredump user
+        systemd-oom
+        wpa_supplicant
         ;
 
       # The gid should match the uid. Thus should not be >= 400;
diff --git a/modules/by-name/xd/xdg/module.nix b/modules/by-name/xd/xdg/module.nix
index 1478ebff..21f18874 100644
--- a/modules/by-name/xd/xdg/module.nix
+++ b/modules/by-name/xd/xdg/module.nix
@@ -58,6 +58,10 @@ in {
       "documents"
     ];
 
+    vhack.services.backup.exclude = [
+      "${homeDirectory}/.cache"
+    ];
+
     home-manager.users.soispha.xdg = {
       enable = true;
 
-- 
cgit v1.3.1