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

hosts/tower/boot/default.nix

@@ -1,17 +1,11 @@
 { config, lib, pkgs, ... }:
 let
   commonKernelParams = [
-    # VM/GPU passthrough
     "amd_iommu=on"
     "iommu=pt"
-
-    # Isolate devices into IOMMU groups
-    "pcie_acs_override=downstream,multifunction"
-    "pci=routeirq"
   ];
 in {
   boot = {
-    # Latest kernel and IOMMU isolation
     kernelPackages = pkgs.linuxPackages_6_14;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
@@ -30,8 +24,5 @@ in {
   };
 
   # Use second GPU on boot
-  specialisation.gputwo.configuration = {
-    boot.kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:2504,10de:228e" ];
-    environment.sessionVariables.WLR_RENDERER = lib.mkForce "gles2";
-  };
+  specialisation.gputwo.configuration.boot.kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:2504,10de:228e" ];
 }

hosts/tower/colmena/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 {
   deployment = {
     tags = [

hosts/tower/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./boot
-    ./colmena
     ./disko
     ./filesystems
     ./hardware
@@ -11,10 +10,13 @@
   ];
 
   system = {
-    desktop.enable = true;
-    nvidia.enable = true;
+    nixos.tags = [ "pc" ];
     stateVersion = "24.05";
   };
 
+  deployment.targetHost = "4e4:535:9d47:f367:becd:6557:458d:5b1b";
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+
   virtualisation.libvirtd.enable = true;
 }

hosts/tower/filesystems/default.nix

@@ -1,6 +1,6 @@
-{ config, nodes, ... }:
+{ ... }:
 {
-  fileSystems = with config.sysusers; with nodes; {
+  fileSystems = {
     # Games and such
     "/mnt/Linux1" = {
       device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
@@ -39,32 +39,8 @@
     };
 
     # 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/${main}";
-      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/tower/hardware/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, modulesPath, ... }:
+{ modulesPath, ... }:
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -16,6 +16,7 @@
     kernelModules = [ "kvm-amd" ];
   };
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = true;
+
+  nixpkgs.hostPlatform = "x86_64-linux";
 }

hosts/tower/user/default.nix

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