Variablize username more

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 {
-    SUBVOLUME = "/persist/home/jimbo";
+  services.snapper.configs.${config.sysusers.main} = lib.mkIf config.environment.persistence."/persist".enable {
+    SUBVOLUME = "/persist/home/${config.sysusers.main}";
     TIMELINE_CREATE = true;
     TIMELINE_CLEANUP = true;
     TIMELINE_LIMIT_DAILY = 1;