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

hosts/intuos/colmena/default.nix

@@ -1,10 +0,0 @@
-{ config, ... }:
-{
-  deployment = {
-    tags = [
-      "latptop"
-      "pc"
-    ];
-    targetHost = "40e:404:a427:da33:163e:97b3:a2a3:9ed4";
-  };
-}

hosts/intuos/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./boot
-    ./colmena
     ./disko
     ./filesystems
     ./hardware
@@ -11,7 +10,9 @@
   ];
 
   system = {
-    desktop.enable = true;
+    nixos.tags = [ "pc" ];
     stateVersion = "24.11";
   };
+
+  deployment.targetHost = "40e:404:a427:da33:163e:97b3:a2a3:9ed4";
 }

hosts/intuos/filesystems/default.nix

@@ -1,33 +1,9 @@
-{ config, nodes, ... }:
+{ ... }:
 {
-  fileSystems = with config.sysusers; with nodes; {
+  fileSystems = {
     # Network mounts
-    "/home/${main}/Network/Midas" = {
-      device = "[${midas.config.deployment.targetHost}]:/storage";
-      fsType = "nfs4";
-      options = [
-        "noauto"
-        "soft"
-        "x-systemd.automount"
-      ];
-    };
-    "/home/${main}/Network/Kitty" = {
-      device = "[${kitty.config.deployment.targetHost}]:/storage/bun";
-      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"
-      ];
-    };
+    "kitty".enable = true;
+    "midas".enable = true;
+    "prophet".enable = true;
   };
 }

hosts/intuos/hardware/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, modulesPath, ... }:
+{ modulesPath, ... }:
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -16,6 +16,7 @@
     kernelModules = [ "kvm-intel" ];
   };
 
-  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/intuos/user/default.nix

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