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

hosts/prophet/colmena/default.nix

@@ -1,8 +0,0 @@
-{ config, ... }:
-{
-  deployment = {
-    buildOnTarget = true;
-    tags = [ "server" ];
-    targetHost = "42f:2737:2aed:4dee:cbe4:3c73:1918:ad9b";
-  };
-}

hosts/prophet/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./boot
-    ./colmena
     ./disko
     ./filesystems
     ./hardware
@@ -12,10 +11,15 @@
     (modulesPath + "/profiles/headless.nix")
   ];
 
-  networking.hostId = "97a21a38";
-
   system = {
-    server.enable = true;
+    nixos.tags = [ "server" ];
     stateVersion = "24.05";
   };
+
+  deployment = {
+    buildOnTarget = true;
+    targetHost = "42f:2737:2aed:4dee:cbe4:3c73:1918:ad9b";
+  };
+
+  networking.hostId = "97a21a38";
 }

hosts/prophet/filesystems/default.nix

@@ -1,11 +1,17 @@
 { ... }:
 {
-  fileSystems."/persist/storage" = {
-    device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
-    fsType = "btrfs";
-    options = [
-      "nofail"
-      "nosuid"
-    ];
+  fileSystems = {
+    "/persist/storage" = {
+      device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
+      fsType = "btrfs";
+      options = [
+        "nofail"
+        "nosuid"
+      ];
+    };
+
+    # Network mounts
+    "kitty".enable = true;
+    "midas".enable = true;
   };
 }

hosts/prophet/hardware/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   boot.initrd = {
     availableKernelModules = [
@@ -8,5 +8,5 @@
     kernelModules = [ "dm-snapshot" ];
   };
 
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+  nixpkgs.hostPlatform = "aarch64-linux";
 }

hosts/prophet/services/default.nix

@@ -2,9 +2,10 @@
 {
   services = {
     cloudflare-dyndns.enable = true;
-    mailserver.enable = true;
     mysql.enable = true;
     nfs.server.enable = true;
     nginx.enable = true;
   };
+
+  mailserver.enable = true;
 }

hosts/prophet/user/@!

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

hosts/prophet/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;
   };
 }