refactor: simplify module composition

2026-04-22 02:35:26 +02:00
parent 3b6c42ebe3
commit 5eec5689f4
25 changed files with 615 additions and 448 deletions
@@ -40,31 +40,30 @@ in
    };

    users = {
-      inherit (metaLib.users)
-        ergon
-        kiri
-        ;
+      kiri = {
+        account = metaLib.users.kiri;
+        needsPassword = true;
+        homeImports = [
+          homeModules.workstation-base
+          homeModules.syncthing
+          homeModules.qbittorrent-client
+          homeModules.noctalia-portable
+        ];
+      };
+
+      ergon = {
+        account = metaLib.users.ergon;
+        needsPassword = true;
+        homeImports = [
+          homeModules.workstation-base
+          homeModules.noctalia-portable
+        ];
+      };
    };

    imports = [
      nixosModules.workstation-base
      nixosModules.laptop-power
-      (metaLib.mkHostUser {
-        account = metaLib.users.kiri;
-        needsPassword = true;
-        homeImports = [
-          homeModules.kiri-workstation
-          homeModules.noctalia-portable
-        ];
-      })
-      (metaLib.mkHostUser {
-        account = metaLib.users.ergon;
-        needsPassword = true;
-        homeImports = [
-          homeModules.ergon-workstation
-          homeModules.noctalia-portable
-        ];
-      })
      {
        hardware.enableRedistributableFirmware = true;
        services.fwupd.enable = true;