refactor: further progress

modules/hosts/zenith/default.nix

@@ -6,87 +6,71 @@
 let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
-  metaLib = config.meta.lib;
-  workstationHomeImports = [ homeModules.workstation ];
-  portableNoctalia = homeModules.noctalia-portable;
-  kiriHomeImports = workstationHomeImports ++ [
-    homeModules.syncthing
-    homeModules.qbittorrent-client
-    portableNoctalia
-  ];
-  ergonHomeImports = workstationHomeImports ++ [
-    portableNoctalia
-    (
-      { pkgs, ... }:
-      {
-        home.packages = [
-          pkgs.usql
-        ];
-
-        programs.git.ignores = [
-          # Devenv stuff
-          "devenv.*"
-          ".devenv*"
-          ".direnv"
-          "pre-commit-config.yaml"
-          ".envrc"
-        ];
-      }
-    )
-  ];
+  accounts = config.repo.accounts;
 in
 {
-  flake.modules.nixos.zenith = metaLib.mkHost {
-    name = "zenith";
+  repo.machines.zenith = {
+    buildFunction = config.repo.helpers.mkWorkstationHost;
+    module = nixosModules.zenith;
 
-    displays = {
-      "California Institute of Technology 0x1410 Unknown" = {
-        primary = true;
-        x = 0;
-        y = 0;
-        scale = 1.5;
-        mode = {
-          width = 3072;
-          height = 1920;
-          refresh = 120.002;
+    users = {
+      kiri.account = accounts.kiri;
+      ergon = {
+        account = accounts.ergon;
+        sourceControl = {
+          personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdR3KP2U84i7f7MlRqcML/3YyMw8JL3hdm637SkMUwO ergon@zenith#personal";
+          work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHJz5uHKm0/TiMNh/cmzrODHNZ8NgEEZe+47XnJwQGk ergon@zenith#work";
         };
       };
     };
 
-    input = {
-      mouse.accelSpeed = 0.4;
-    };
-
-    sourceControl.users = {
-      ergon = {
-        personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdR3KP2U84i7f7MlRqcML/3YyMw8JL3hdm637SkMUwO ergon@zenith#personal";
-        work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHJz5uHKm0/TiMNh/cmzrODHNZ8NgEEZe+47XnJwQGk ergon@zenith#work";
+    displays = {
+      "California Institute of Technology 0x1410 Unknown" = {
+        primary = true;
+        scale = 1.5;
+        width = 3072;
+        height = 1920;
+        refresh = 120.002;
       };
     };
 
-    users = {
-      kiri = {
-        account = metaLib.accounts.kiri;
-        needsPassword = true;
-        homeImports = kiriHomeImports;
-      };
-
-      ergon = {
-        account = metaLib.accounts.ergon;
-        needsPassword = true;
-        homeImports = ergonHomeImports;
-      };
-    };
-
-    imports = [
-      nixosModules.workstation
-      nixosModules.laptop-power
-      {
-        hardware.enableRedistributableFirmware = true;
-        services.fwupd.enable = true;
-      }
-      ./_hardware.nix
-      inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
-    ];
+    stateVersion = "24.05";
+    hmStateVersion = "24.05";
   };
+
+  flake.modules.nixos.zenith =
+    { ... }:
+    {
+      imports = [
+        nixosModules.qbittorrent-client
+        nixosModules.laptop-power
+        {
+          hardware.enableRedistributableFirmware = true;
+          services.fwupd.enable = true;
+        }
+        ./_hardware.nix
+        inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
+      ];
+
+      home-manager.users = {
+        kiri.imports = [ homeModules.noctalia-portable ];
+        ergon.imports = [
+          homeModules.noctalia-portable
+          (
+            { pkgs, ... }:
+            {
+              home.packages = [ pkgs.usql ];
+
+              programs.git.ignores = [
+                "devenv.*"
+                ".devenv*"
+                ".direnv"
+                "pre-commit-config.yaml"
+                ".envrc"
+              ];
+            }
+          )
+        ];
+      };
+    };
 }