Update a lot of options, simplify variables, replace options with tags

hosts/kitty/colmena/default.nix

@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  deployment = {
-    tags = [ "server" ];
-    targetHost = "53f:dc2d:80c9:3ca2:4b15:ef4d:38a0:c868";
-  };
-}

hosts/kitty/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./boot
-    ./colmena
     ./disko
     ./filesystems
     ./hardware
@@ -10,13 +9,17 @@
     ../../modules/system
   ];
 
-  networking.hostId = "8745e22e";
-
   system = {
-    server.enable = true;
-    extraUsers.enable = true;
+    nixos.tags = [
+      "extra-users"
+      "server"
+    ];
     stateVersion = "24.11";
   };
 
+  deployment.targetHost = "53f:dc2d:80c9:3ca2:4b15:ef4d:38a0:c868";
+
+  networking.hostId = "8745e22e";
+
   services.nfs.server.enable = true;
 }

hosts/kitty/filesystems/default.nix

@@ -1,6 +1,6 @@
-{ config, nodes, ... }:
+{ ... }:
 {
-  fileSystems = with config.sysusers; with nodes; {
+  fileSystems = {
     "/persist/storage" = {
       device = "/dev/disk/by-uuid/edd3e293-1aff-4fc0-96fa-4e17d6cccfca";
       fsType = "btrfs";
@@ -11,23 +11,7 @@
     };
 
     # Network mounts
-    "/home/${main}/Network/Midas" = {
-      device = "[${midas.config.deployment.targetHost}]:/storage";
-      fsType = "nfs4";
-      options = [
-        "noauto"
-        "soft"
-        "x-systemd.automount"
-      ];
-    };
-    "/home/${main}/Network/Prophet" = {
-      device = "[${prophet.config.deployment.targetHost}]:/storage";
-      fsType = "nfs4";
-      options = [
-        "noauto"
-        "soft"
-        "x-systemd.automount"
-      ];
-    };
+    "midas".enable = true;
+    "prophet".enable = true;
   };
 }

hosts/kitty/hardware/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
 {
   boot.initrd = {
     availableKernelModules = [
@@ -9,6 +9,7 @@
     kernelModules = [ "dm-snapshot" ];
   };
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = true;
+
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

hosts/kitty/user/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  home-manager.users."${config.sysusers.main}".home = {
+  home-manager.users."${config.vars.mainUser}".home = {
     stateVersion = lib.mkForce config.system.stateVersion;
   };
 }