Variablize username more

hosts/envy/disko/default.nix

@@ -69,11 +69,11 @@
                 };
                 "/persist/.snapshots" = { };
 
-                "/jimbo" = {
+                "${config.sysusers.main}" = {
-                  mountpoint = "/persist/home/jimbo";
+                  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" = {
+                "/${config.sysusers.main}" = {
-                  mountpoint = "/persist/home/jimbo";
+                  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" = {
+                "/${config.sysusers.main}" = {
-                  mountpoint = "/persist/home/jimbo";
+                  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";
+  };
+}

modules/extras/variables/default.nix

@@ -5,6 +5,7 @@
     ./domains
     ./ips
     ./look
+    ./users
     ./workspaces
   ];
 }

modules/extras/variables/users/default.nix

@@ -0,0 +1,11 @@
+{ lib, config, ... }:
+{
+  options.sysusers = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.sysusers = {
+    main = "jimbo";
+  };
+}

modules/home/programs/gui/librewolf/default.nix

@@ -5,7 +5,7 @@ let
     --tab-font: '${config.look.fonts.main}';
     --urlbar-font: '${config.look.fonts.main}';
   '';
-  themeJim = ''
+  themeMain = ''
     :root {
       --tab-active-bg-color: #${config.look.colors.prime};
       --tab-hover-bg-color: #${config.look.colors.accent};
@@ -114,8 +114,8 @@ in {
     };
     commonBookmarks = [
       {
-        name = "Jimbo";
+        name = "NixFox";
-        url = "https://jimbosfiles.com";
+        url = "https://nixfox.ca";
       }
       {
         name = "Corn";
@@ -252,7 +252,7 @@ in {
 	bookmarks = commonBookmarks;
         settings = commonSettings;
         userChrome = ''
-          ${themeJim}
+          ${themeMain}
           ${themeFont}
           ${builtins.readFile ./quteFox.css}
         '';

modules/home/programs/terminal/ranger/default.nix

@@ -98,20 +98,20 @@
     file = {
       ".local/share/ranger/bookmarks".text = ''
         # Local files
-        h:/home/${config.home.username}/
+        h:/home/${config.sysusers.main}/
-        k:/home/${config.home.username}/Keepers
+        k:/home/${config.sysusers.main}/Keepers
-        j:/home/${config.home.username}/Downloads
+        j:/home/${config.sysusers.main}/Downloads
-        v:/home/${config.home.username}/Videos
+        v:/home/${config.sysusers.main}/Videos
-        c:/home/${config.home.username}/.config
+        c:/home/${config.sysusers.main}/.config
-        l:/home/${config.home.username}/.local
+        l:/home/${config.sysusers.main}/.local
         d:/mnt
         n:/etc/nixos
 
         # Remote files
-        J:/home/${config.home.username}/JimboNFS
+        J:/home/${config.sysusers.main}/JimboNFS
-        K:/home/${config.home.username}/JimboNFS/Files
+        K:/home/${config.sysusers.main}/JimboNFS/Files
-        V:/home/${config.home.username}/JimboNFS/Media
+        V:/home/${config.sysusers.main}/JimboNFS/Media
-        M:/home/${config.home.username}/JimboNFS/Music
+        M:/home/${config.sysusers.main}/JimboNFS/Music
       '';
     };
     packages = with pkgs; [

modules/home/services/mpd/default.nix

@@ -3,8 +3,8 @@
   services.mpd = {
     enable = config.home.desktop.enable;
     network.startWhenNeeded = true;
-    musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops";
+    musicDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops";
-    playlistDirectory = "/home/jimbo/JimboNFS/Music/JimBops/Playlists";
+    playlistDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops/Playlists";
     extraConfig = ''
       audio_output {
         type "pipewire"

modules/home/user/default.nix

@@ -1,8 +1,8 @@
-{ ... }:
+{ config, ... }:
 {
   home = {
-    username = "jimbo";
+    username = "${config.sysusers.main}";
-    homeDirectory = "/home/jimbo";
+    homeDirectory = "/home/${config.sysusers.main}";
     sessionVariables = {
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";

modules/system/accounts/users/custom/default.nix

@@ -1,7 +1,7 @@
 { home-manager, ... }:
 {
   imports = [
-    ./jimbo
+    ./main
     home-manager.nixosModules.home-manager
   ];
 }

modules/system/accounts/users/custom/main/default.nix

@@ -1,8 +1,7 @@
 { pkgs, config, ... }:
 {
-  users.users.jimbo = {
+  users.users."${config.sysusers.main}" = {
-    description = "Jimbo";
+    hashedPassword = config.secrets.mainAccPass;
-    hashedPassword = config.secrets.jimboAccPass;
     isNormalUser = true;
     openssh.authorizedKeys.keys = [
       (builtins.readFile ../../../../../../hosts/tower/id_ed25519.pub)
@@ -34,5 +33,5 @@
     shell = pkgs.zsh;
   };
 
-  home-manager.users.jimbo = import ../../../../../home;
+  home-manager.users."${config.sysusers.main}" = import ../../../../../home;
 }

modules/system/devices/bluetooth/default.nix

@@ -9,7 +9,7 @@
       };
     };
 
-    systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/jimbo" ];
+    systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/${config.sysusers.main}" ];
 
     environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
   };

modules/system/devices/disks/impermanence/default.nix

@@ -1,8 +1,8 @@
 { impermanence, ... }:
 {
   imports = [
+    ./main
     ./root
-    ./jimbo
     impermanence.nixosModules.impermanence
   ];
 }

modules/system/devices/disks/impermanence/main/default.nix

@@ -1,8 +1,8 @@
-{ ... }:
+{ config, ... }:
 {
   environment.persistence."/persist" = {
     hideMounts = true;
-    users.jimbo = {
+    users.${config.sysusers.main} = {
       directories = [
         "Keepers"
         "Documents"

modules/system/devices/disks/snapper/default.nix

@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
+    ./main
     ./root
-    ./jimbo
   ];
 
   services.snapper = {

modules/system/devices/disks/snapper/main/default.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
-  services.snapper.configs.jimbo = lib.mkIf config.environment.persistence."/persist".enable {
+  services.snapper.configs.${config.sysusers.main} = lib.mkIf config.environment.persistence."/persist".enable {
-    SUBVOLUME = "/persist/home/jimbo";
+    SUBVOLUME = "/persist/home/${config.sysusers.main}";
     TIMELINE_CREATE = true;
     TIMELINE_CLEANUP = true;
     TIMELINE_LIMIT_DAILY = 1;

modules/system/services/general/libvirtd/default.nix

@@ -52,6 +52,6 @@
       "virbr1"
     ];
 
-    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 jimbo libvirtd -" ];
+    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${config.sysusers.main} libvirtd -" ];
   };
 }

modules/system/services/server/acme/default.nix

@@ -2,6 +2,6 @@
 {
   security.acme = { 
     acceptTerms = true;
-    defaults.email = "jimbo@${config.domains.p2}";
+    defaults.email = "contact@${config.domains.p2}";
   };
 }

modules/system/services/server/fileserver/default.nix

@@ -1,9 +1,7 @@
 { ... }:
 {
   imports = [
-    #./nextcloud
     ./nfs
     ./samba
-    ./seafile
   ];
 }

modules/system/services/server/fileserver/nextcloud/nginx/default.nix

@@ -1,18 +0,0 @@
-{ lib, config, ... }:
-{
-  services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.nextcloud.enable {
-    enableACME = true;
-    addSSL = true;
-    locations."/" = {
-      proxyWebsockets = true;
-      extraConfig = ''
-        location /.well-known/carddav {
-          return 301 $scheme://$host/remote.php/dav;
-        }
-        location /.well-known/caldav {
-          return 301 $scheme://$host/remote.php/dav;
-        }
-     '';
-    };
-  };
-}

modules/system/services/server/icecast/default.nix

@@ -10,7 +10,7 @@
     listen.port = 265;
     hostname = "radio.${config.domains.p2}";
     admin = {
-      user = "jimbo";
+      user = "${config.sysusers.main}";
       password = "${config.secrets.castAdminPass}";
     };
     extraConf = ''