refactor: further progress

modules/hosts/polaris/default.nix

@@ -6,18 +6,24 @@
 let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
-  metaLib = config.meta.lib;
-  workstationHomeImports = [ homeModules.workstation ];
-  kiriHomeImports = workstationHomeImports ++ [
-    homeModules.syncthing
-    homeModules.qbittorrent-client
-    homeModules.noctalia
-  ];
-  ergonHomeImports = workstationHomeImports ++ [ homeModules.noctalia ];
+  accounts = config.repo.accounts;
 in
 {
-  flake.modules.nixos.polaris = metaLib.mkHost {
-    name = "polaris";
+  repo.machines.polaris = {
+    buildFunction = config.repo.helpers.mkWorkstationHost;
+    module = nixosModules.polaris;
+
+    users = {
+      kiri = {
+        account = accounts.kiri;
+        syncthingId = "6HBAKXB-DB3B4H2-BODCAXF-KD23H5W-6X5LGLC-ZJHZHLG-7U7YMGO-BB6IXQ3";
+      };
+
+      ergon.account = accounts.ergon;
+    };
+
+    stateVersion = "24.05";
+    hmStateVersion = "24.05";
 
     displays = {
       "LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
@@ -31,35 +37,26 @@ in
         y = 0;
       };
     };
-
-    input = {
-      mouse.accelSpeed = 0.4;
-    };
-
-    users = {
-      kiri = {
-        account = metaLib.accounts.kiri;
-        needsPassword = true;
-        homeImports = kiriHomeImports;
-      };
-
-      ergon = {
-        account = metaLib.accounts.ergon;
-        needsPassword = true;
-        homeImports = ergonHomeImports;
-      };
-    };
-
-    imports = [
-      nixosModules.workstation
-      nixosModules.steam
-      ./_hardware.nix
-    ]
-    ++ (with inputs.nixos-hardware.nixosModules; [
-      common-pc
-      common-pc-ssd
-      common-cpu-amd
-      common-gpu-amd
-    ]);
   };
+
+  flake.modules.nixos.polaris =
+    { ... }:
+    {
+      imports = [
+        nixosModules.qbittorrent-client
+        nixosModules.steam
+        ./_hardware.nix
+      ]
+      ++ (with inputs.nixos-hardware.nixosModules; [
+        common-pc
+        common-pc-ssd
+        common-cpu-amd
+        common-gpu-amd
+      ]);
+
+      home-manager.users = {
+        kiri.imports = [ homeModules.noctalia ];
+        ergon.imports = [ homeModules.noctalia ];
+      };
+    };
 }