Variablize username more

hosts/envy/disko/default.nix

@@ -69,11 +69,11 @@
                 };
                 "/persist/.snapshots" = { };
 
-                "/jimbo" = {
-                  mountpoint = "/persist/home/jimbo";
+                "${config.sysusers.main}" = {
+                  mountpoint = "/persist/home/${config.sysusers.main}";
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
-                "/jimbo/.snapshots" = { };
+                "/${config.sysusers.main}/.snapshots" = { };
               };
             };
           };
@@ -92,6 +92,6 @@
   # Needed for impermanence
   fileSystems = {
     "/persist".neededForBoot = true;
-    "/persist/home/jimbo".neededForBoot = true;
+    "/persist/home/${config.sysusers.main}".neededForBoot = true;
   };
 }

hosts/envy/filesystems/default.nix

@@ -7,14 +7,14 @@
       fsType = "btrfs";
       options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
     };
-    "/persist/home/jimbo/.local/share/Steam" = {
+    "/persist/home/${config.sysusers.main}/.local/share/Steam" = {
       device = "/dev/disk/by-uuid/135281e2-72ec-4c00-91e8-9897a32c02ce";
       fsType = "btrfs";
       options = [ "subvol=Steam" "nosuid" "nodev" "nofail" "x-gvfs-show" ];
     };
 
     # Network mounts
-    "/home/jimbo/JimboNFS" = {
+    "/home/${config.sysusers.main}/JimboNFS" = {
       device = "10.100.0.1:/export/JimboNFS";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];

hosts/envy/users/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ config ... }:
 {
-  imports = [ ./jimbo ];
+  imports = [ ./main ];
 }

hosts/envy/users/jimbo/default.nix

@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  home-manager.users.jimbo = {
-    home.stateVersion = lib.mkForce "24.11";
-  };
-}

hosts/envy/users/main/default.nix

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

hosts/extern/disko/default.nix

@@ -69,11 +69,11 @@
                 };
                 "/persist/.snapshots" = { };
 
-                "/jimbo" = {
+                "/${config.sysusers.main}" = {
                   mountpoint = "/persist/home/jimbo";
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
-                "/jimbo/.snapshots" = { };
+                "/${config.sysusers.main}/.snapshots" = { };
               };
             };
           };
@@ -92,6 +92,6 @@
   # Needed for impermanence
   fileSystems = {
     "/persist".neededForBoot = true;
-    "/persist/home/jimbo".neededForBoot = true;
+    "/persist/home/${config.sysusers.main}".neededForBoot = true;
   };
 }

hosts/extern/filesystems/default.nix

@@ -2,7 +2,7 @@
 {
   fileSystems = {
     # Network mounts
-    "/home/jimbo/JimboNFS" = {
+    "/home/${config.sysusers.main}/JimboNFS" = {
       device = "10.100.0.1:/export/JimboNFS";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];

hosts/extern/users/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./jimbo ];
+  imports = [ ./main ];
 }

hosts/extern/users/jimbo/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  home-manager.users.jimbo = {
-    home.stateVersion = "24.11";
-  };
-}

hosts/extern/users/main/default.nix

@@ -0,0 +1,6 @@
+{ config, ... }:
+{
+  home-manager.users.${config.sysusers.main} = {
+    home.stateVersion = "24.11";
+  };
+}

hosts/kitty/users/main/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
 {
-  home-manager.users.jimbo = {
+  home-manager.users."${config.sysusers.main}" = {
     home = {
       desktop.enable = false;
       stateVersion = lib.mkForce "24.05";

hosts/prophet/users/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./jimbo ];
+  imports = [ ./main ];
 }

hosts/prophet/users/main/default.nix

@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ config, lib, ... }:
 {
-  home-manager.users.jimbo = {
+  home-manager.users."${config.sysusers.main}" = {
     home = {
       desktop.enable = false;
       stateVersion = lib.mkForce "24.05";

hosts/redmond/disko/default.nix

@@ -68,11 +68,11 @@
                 };
                 "/persist/.snapshots" = { };
 
-                "/jimbo" = {
-                  mountpoint = "/persist/home/jimbo";
+                "/${config.sysusers.main}" = {
+                  mountpoint = "/persist/home/${config.sysusers.main}";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 };
-                "/jimbo/.snapshots" = { };
+                "/${config.sysusers.main}/.snapshots" = { };
               };
             };
           };

hosts/redmond/filesystems/default.nix

@@ -1,11 +1,11 @@
-{ ... }:
+{ config, ... }:
 {
   fileSystems = {
     "/mnt/Windrive" = {
       device = "/dev/disk/by-uuid/582C6B802C6B57D0";
       options = [ "nosuid" "nodev" ];
     };
-    "/home/jimbo/JimboNFS" = {
+    "/home/${config.sysusers.main}/JimboNFS" = {
       device = "10.100.0.1:/export/JimboNFS";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];

hosts/tower/disko/default.nix

@@ -69,11 +69,11 @@
                 };
                 "/persist/.snapshots" = { };
 
-                "/jimbo" = {
-                  mountpoint = "/persist/home/jimbo";
+                "/${config.sysusers.main}" = {
+                  mountpoint = "/persist/home/${config.sysusers.main}";
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
-                "/jimbo/.snapshots" = { };
+                "/${config.sysusers.main}/.snapshots" = { };
               };
             };
           };
@@ -92,6 +92,6 @@
   # Needed for impermanence
   fileSystems = {
     "/persist".neededForBoot = true;
-    "/persist/home/jimbo".neededForBoot = true;
+    "/persist/home/${config.sysusers.main}".neededForBoot = true;
   };
 }

hosts/tower/filesystems/default.nix

@@ -32,14 +32,14 @@
       fsType = "btrfs";
       options = [ "subvol=libvirt" "nosuid" "nodev" "nofail" ];
     };
-    "/persist/home/jimbo/VMs" = {
+    "/persist/home/${config.sysusers.main}/VMs" = {
       device = "/dev/disk/by-uuid/abf78669-de2a-4afa-8e62-604f4e4cb355";
       fsType = "btrfs";
       options = [ "subvol=images" "nosuid" "nodev" "nofail" ];
     };
 
     # Network mounts
-    "/home/jimbo/JimboNFS" = {
+    "/home/${config.sysusers.main}/JimboNFS" = {
       device = "${config.ips.server}:/export/JimboNFS";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];

hosts/tower/users/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./jimbo ];
+  imports = [ ./main ];
 }

hosts/tower/users/jimbo/default.nix

@@ -1,6 +0,0 @@
-{ lib, ... }:
-{
-  home-manager.users.jimbo = {
-    home.stateVersion = lib.mkForce "24.05";
-  };
-}

hosts/tower/users/main/default.nix

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