diff --git a/nixos/modules/nixos/containers/arr/lidarr/default.nix b/nixos/modules/nixos/containers/arr/lidarr/default.nix
index d0997e5..179c710 100644
--- a/nixos/modules/nixos/containers/arr/lidarr/default.nix
+++ b/nixos/modules/nixos/containers/arr/lidarr/default.nix
@@ -66,8 +66,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/containers/arr/prowlarr/default.nix b/nixos/modules/nixos/containers/arr/prowlarr/default.nix
index 12173b1..15229c8 100644
--- a/nixos/modules/nixos/containers/arr/prowlarr/default.nix
+++ b/nixos/modules/nixos/containers/arr/prowlarr/default.nix
@@ -63,8 +63,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/containers/arr/radarr/default.nix b/nixos/modules/nixos/containers/arr/radarr/default.nix
index c28703e..a50e241 100644
--- a/nixos/modules/nixos/containers/arr/radarr/default.nix
+++ b/nixos/modules/nixos/containers/arr/radarr/default.nix
@@ -66,8 +66,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
 
diff --git a/nixos/modules/nixos/containers/arr/readarr/default.nix b/nixos/modules/nixos/containers/arr/readarr/default.nix
index a95f104..7ebd225 100644
--- a/nixos/modules/nixos/containers/arr/readarr/default.nix
+++ b/nixos/modules/nixos/containers/arr/readarr/default.nix
@@ -64,8 +64,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/containers/arr/sonarr/default.nix b/nixos/modules/nixos/containers/arr/sonarr/default.nix
index 1c2f060..6d397ec 100644
--- a/nixos/modules/nixos/containers/arr/sonarr/default.nix
+++ b/nixos/modules/nixos/containers/arr/sonarr/default.nix
@@ -67,8 +67,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/containers/factorio/default.nix b/nixos/modules/nixos/containers/factorio/default.nix
index 4a6e4a5..576e62c 100644
--- a/nixos/modules/nixos/containers/factorio/default.nix
+++ b/nixos/modules/nixos/containers/factorio/default.nix
@@ -76,8 +76,8 @@ in
       allowedTCPPorts = [ port ]; # I dont use rcon so not opening that too.
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
 
diff --git a/nixos/modules/nixos/containers/gatus/default.nix b/nixos/modules/nixos/containers/gatus/default.nix
index a43e192..6df87b0 100644
--- a/nixos/modules/nixos/containers/gatus/default.nix
+++ b/nixos/modules/nixos/containers/gatus/default.nix
@@ -14,7 +14,7 @@ let
   cfg = config.mySystem.services.${app};
   appFolder = "/var/lib/${app}";
 
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   containerPersistentFolder = "/config";
   extraEndpoints = [
     # TODO refactor these out into their own file or fake host?
diff --git a/nixos/modules/nixos/containers/homepage/default.nix b/nixos/modules/nixos/containers/homepage/default.nix
index e3dbf80..6fc23fe 100644
--- a/nixos/modules/nixos/containers/homepage/default.nix
+++ b/nixos/modules/nixos/containers/homepage/default.nix
@@ -13,7 +13,7 @@ let
   port = 3000; #int
   cfg = config.mySystem.services.${app};
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
 
   # TODO refactor out this sht
   settings =
diff --git a/nixos/modules/nixos/containers/plex/default.nix b/nixos/modules/nixos/containers/plex/default.nix
index dedd690..6da154e 100644
--- a/nixos/modules/nixos/containers/plex/default.nix
+++ b/nixos/modules/nixos/containers/plex/default.nix
@@ -27,8 +27,8 @@ in
 
   config = mkIf cfg.enable {
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     virtualisation.oci-containers.containers.${app} = {
diff --git a/nixos/modules/nixos/containers/qbittorrent/default.nix b/nixos/modules/nixos/containers/qbittorrent/default.nix
index 07bd30f..38db001 100644
--- a/nixos/modules/nixos/containers/qbittorrent/default.nix
+++ b/nixos/modules/nixos/containers/qbittorrent/default.nix
@@ -46,8 +46,8 @@ in
       ];
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     services.nginx.virtualHosts."${app}.${config.networking.domain}" = {
diff --git a/nixos/modules/nixos/containers/redlib/default.nix b/nixos/modules/nixos/containers/redlib/default.nix
index 714104f..9724d4f 100644
--- a/nixos/modules/nixos/containers/redlib/default.nix
+++ b/nixos/modules/nixos/containers/redlib/default.nix
@@ -96,7 +96,7 @@ in
         ${app} = {
           icon = "${app}.svg";
           href = "https://${url}";
-          description = description;
+          inherit description;
         };
       }
     ];
diff --git a/nixos/modules/nixos/containers/sabnzbd/default.nix b/nixos/modules/nixos/containers/sabnzbd/default.nix
index e7c35be..d2d24b8 100644
--- a/nixos/modules/nixos/containers/sabnzbd/default.nix
+++ b/nixos/modules/nixos/containers/sabnzbd/default.nix
@@ -67,8 +67,8 @@ in
       }
     ];
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.gatus.monitors = [{
diff --git a/nixos/modules/nixos/containers/tautulli/default.nix b/nixos/modules/nixos/containers/tautulli/default.nix
index 5b4dc76..87f5260 100644
--- a/nixos/modules/nixos/containers/tautulli/default.nix
+++ b/nixos/modules/nixos/containers/tautulli/default.nix
@@ -48,8 +48,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/containers/whoogle/default.nix b/nixos/modules/nixos/containers/whoogle/default.nix
index 68edc99..247e6f6 100644
--- a/nixos/modules/nixos/containers/whoogle/default.nix
+++ b/nixos/modules/nixos/containers/whoogle/default.nix
@@ -12,7 +12,7 @@ let
   port = 5000; #int
   cfg = config.mySystem.services.${app};
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
 in
 {
   options.mySystem.services.${app} =
diff --git a/nixos/modules/nixos/security/acme/default.nix b/nixos/modules/nixos/security/acme/default.nix
index 2cd60fa..dd200b3 100644
--- a/nixos/modules/nixos/security/acme/default.nix
+++ b/nixos/modules/nixos/security/acme/default.nix
@@ -8,7 +8,7 @@ let
   cfg = config.mySystem.security.acme;
   app = "acme";
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   user = app;
   group = app;
 
@@ -22,7 +22,7 @@ in
       "security/acme/env".restartUnits = [ "${app}.service" ];
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
       directories = [ "/var/lib/acme" ];
     };
 
diff --git a/nixos/modules/nixos/services/grafana/default.nix b/nixos/modules/nixos/services/grafana/default.nix
index 9e638ea..0251d3b 100644
--- a/nixos/modules/nixos/services/grafana/default.nix
+++ b/nixos/modules/nixos/services/grafana/default.nix
@@ -13,7 +13,7 @@ let
   group = app; #string
   port = 2342; #int
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   host = "${app}" + (if cfg.development then "-dev" else "");
   url = "${host}.${config.networking.domain}";
 in
@@ -82,7 +82,7 @@ in
         ${app} = {
           icon = "${app}.svg";
           href = "https://${url}";
-          description = description;
+          inherit description;
         };
       }
     ];
diff --git a/nixos/modules/nixos/services/languagetool/default.nix b/nixos/modules/nixos/services/languagetool/default.nix
index 952d115..ddd05f0 100644
--- a/nixos/modules/nixos/services/languagetool/default.nix
+++ b/nixos/modules/nixos/services/languagetool/default.nix
@@ -14,7 +14,7 @@ let
   group = "%{group kah}"; #string
   port = %{ port }; #int
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   host="${app}" ++ mkIf cfg.development "-dev";
   url = "${host}.${config.networking.domain}";
   in
diff --git a/nixos/modules/nixos/services/mosquitto/default.nix b/nixos/modules/nixos/services/mosquitto/default.nix
index 52b364b..4117305 100644
--- a/nixos/modules/nixos/services/mosquitto/default.nix
+++ b/nixos/modules/nixos/services/mosquitto/default.nix
@@ -47,8 +47,8 @@ in
       ];
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     users.users.truxnell.extraGroups = [ "mosquitto" ];
diff --git a/nixos/modules/nixos/services/node-red/default.nix b/nixos/modules/nixos/services/node-red/default.nix
index d7e3dfd..1677d70 100644
--- a/nixos/modules/nixos/services/node-red/default.nix
+++ b/nixos/modules/nixos/services/node-red/default.nix
@@ -35,8 +35,8 @@ in
       };
     };
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     mySystem.services.homepage.media = mkIf cfg.addToHomepage [
diff --git a/nixos/modules/nixos/services/prometheus/default.nix b/nixos/modules/nixos/services/prometheus/default.nix
index ba2310f..f092b9a 100644
--- a/nixos/modules/nixos/services/prometheus/default.nix
+++ b/nixos/modules/nixos/services/prometheus/default.nix
@@ -13,7 +13,7 @@ let
   group = app; #string
   port = 9001; #int
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   host = "${app}" + (if cfg.development then "-dev" else "");
   url = "${host}.${config.networking.domain}";
 in
@@ -77,7 +77,7 @@ in
         ${app} = {
           icon = "${app}.svg";
           href = "https://${url}";
-          description = description;
+          inherit description;
         };
       }
     ];
diff --git a/nixos/modules/nixos/services/radicale/default.nix b/nixos/modules/nixos/services/radicale/default.nix
index 2b911a5..59ba9ff 100644
--- a/nixos/modules/nixos/services/radicale/default.nix
+++ b/nixos/modules/nixos/services/radicale/default.nix
@@ -14,7 +14,7 @@ let
   group = app; #string
   port = 5232; #int
   appFolder = "/var/lib/${app}";
- # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
+  # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
   host = "${app}" + (if cfg.development then "-dev" else "");
   url = "${host}.${config.networking.domain}";
 in
@@ -63,13 +63,13 @@ in
     sops.secrets."${category}/${app}/htpasswd" = {
       sopsFile = ./secrets.sops.yaml;
       owner = user;
-      group = group;
+      inherit group;
       restartUnits = [ "${app}.service" ];
     };
 
     users.users.truxnell.extraGroups = [ group ];
 
-     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
+    environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
       hideMounts = true;
       directories = [ "/var/lib/radicale/" ];
     };
@@ -96,7 +96,7 @@ in
         ${app} = {
           icon = "${app}.svg";
           href = "https://${ url }";
-          description = description;
+          inherit description;
         };
       }
     ];
diff --git a/nixos/modules/nixos/services/zigbee2mqtt/default.nix b/nixos/modules/nixos/services/zigbee2mqtt/default.nix
index 43f7797..d49c6b1 100644
--- a/nixos/modules/nixos/services/zigbee2mqtt/default.nix
+++ b/nixos/modules/nixos/services/zigbee2mqtt/default.nix
@@ -37,7 +37,7 @@ in
         include_device_information = true;
         frontend =
           {
-            port = port;
+            inherit port;
             url = "https://${app}.${config.networking.domain}";
           };
         client_id = "z2m";
@@ -69,7 +69,7 @@ in
     };
 
     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
-      directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }];
+      directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
     users.users.truxnell.extraGroups = [ app ];