From e64137c3abc76eb42078432f759d9cf2de168a14 Mon Sep 17 00:00:00 2001
From: jahanson <joe@veri.dev>
Date: Fri, 10 May 2024 20:39:43 -0500
Subject: [PATCH] Update groups

---
 nixos/modules/nixos/containers/calibre/default.nix      | 2 +-
 nixos/modules/nixos/containers/ecowitt2mqtt/default.nix | 2 +-
 nixos/modules/nixos/containers/factorio/default.nix     | 2 +-
 nixos/modules/nixos/containers/redlib/default.nix       | 2 +-
 nixos/modules/nixos/services/calibre-web/default.nix    | 2 +-
 nixos/modules/nixos/services/grafana/default.nix        | 2 +-
 nixos/modules/nixos/services/languagetool/default.nix   | 2 +-
 nixos/modules/nixos/services/miniflux/default.nix       | 2 +-
 nixos/modules/nixos/services/mosquitto/default.nix      | 2 +-
 nixos/modules/nixos/services/podman/default.nix         | 2 +-
 nixos/modules/nixos/services/prometheus/default.nix     | 2 +-
 nixos/modules/nixos/services/radicale/default.nix       | 2 +-
 nixos/modules/nixos/services/rss-bridge/default.nix     | 2 +-
 nixos/modules/nixos/services/traefik/default.nix        | 2 +-
 nixos/modules/nixos/services/zigbee2mqtt/default.nix    | 2 +-
 nixos/modules/nixos/system/pushover/default.nix         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/nixos/containers/calibre/default.nix b/nixos/modules/nixos/containers/calibre/default.nix
index f4c8dd4..f10fec6 100644
--- a/nixos/modules/nixos/containers/calibre/default.nix
+++ b/nixos/modules/nixos/containers/calibre/default.nix
@@ -68,7 +68,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
 
     # Folder perms - only for containers
diff --git a/nixos/modules/nixos/containers/ecowitt2mqtt/default.nix b/nixos/modules/nixos/containers/ecowitt2mqtt/default.nix
index b5ce156..754ca60 100644
--- a/nixos/modules/nixos/containers/ecowitt2mqtt/default.nix
+++ b/nixos/modules/nixos/containers/ecowitt2mqtt/default.nix
@@ -73,7 +73,7 @@ in
       restartUnits = [ "podman-${app}.service" ];
     };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
 
     # Folder perms - only for containers
diff --git a/nixos/modules/nixos/containers/factorio/default.nix b/nixos/modules/nixos/containers/factorio/default.nix
index 23473b1..0c913b9 100644
--- a/nixos/modules/nixos/containers/factorio/default.nix
+++ b/nixos/modules/nixos/containers/factorio/default.nix
@@ -45,7 +45,7 @@ in
       };
     };
     # add user to group to view files/storage
-    users.users.truxnell.extraGroups = [ "${app}" ];
+    users.users.jahanson.extraGroups = [ "${app}" ];
 
     sops.secrets."services/${app}/env" = {
       sopsFile = ./secrets.sops.yaml;
diff --git a/nixos/modules/nixos/containers/redlib/default.nix b/nixos/modules/nixos/containers/redlib/default.nix
index ae1d1d9..ed762d5 100644
--- a/nixos/modules/nixos/containers/redlib/default.nix
+++ b/nixos/modules/nixos/containers/redlib/default.nix
@@ -67,7 +67,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
 
     # Folder perms
diff --git a/nixos/modules/nixos/services/calibre-web/default.nix b/nixos/modules/nixos/services/calibre-web/default.nix
index e28ab38..eee4e19 100644
--- a/nixos/modules/nixos/services/calibre-web/default.nix
+++ b/nixos/modules/nixos/services/calibre-web/default.nix
@@ -66,7 +66,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
 
     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
diff --git a/nixos/modules/nixos/services/grafana/default.nix b/nixos/modules/nixos/services/grafana/default.nix
index 4a3f8b6..4e6fb5e 100644
--- a/nixos/modules/nixos/services/grafana/default.nix
+++ b/nixos/modules/nixos/services/grafana/default.nix
@@ -66,7 +66,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
     ## service
     services.grafana = {
diff --git a/nixos/modules/nixos/services/languagetool/default.nix b/nixos/modules/nixos/services/languagetool/default.nix
index 41f9a73..c966d12 100644
--- a/nixos/modules/nixos/services/languagetool/default.nix
+++ b/nixos/modules/nixos/services/languagetool/default.nix
@@ -68,7 +68,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
 
     # Folder perms - only for containers
diff --git a/nixos/modules/nixos/services/miniflux/default.nix b/nixos/modules/nixos/services/miniflux/default.nix
index 69d3bf6..8f82c3d 100644
--- a/nixos/modules/nixos/services/miniflux/default.nix
+++ b/nixos/modules/nixos/services/miniflux/default.nix
@@ -67,7 +67,7 @@ in
       restartUnits = [ "${app}.service" ];
     };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
     users.users.miniflux = {
       isSystemUser = true;
       group = "miniflux";
diff --git a/nixos/modules/nixos/services/mosquitto/default.nix b/nixos/modules/nixos/services/mosquitto/default.nix
index 4117305..6b8fc44 100644
--- a/nixos/modules/nixos/services/mosquitto/default.nix
+++ b/nixos/modules/nixos/services/mosquitto/default.nix
@@ -51,7 +51,7 @@ in
       directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
-    users.users.truxnell.extraGroups = [ "mosquitto" ];
+    users.users.jahanson.extraGroups = [ "mosquitto" ];
     networking.firewall.allowedTCPPorts = [ 1883 ];
 
   };
diff --git a/nixos/modules/nixos/services/podman/default.nix b/nixos/modules/nixos/services/podman/default.nix
index d9f1d88..ea61534 100644
--- a/nixos/modules/nixos/services/podman/default.nix
+++ b/nixos/modules/nixos/services/podman/default.nix
@@ -44,7 +44,7 @@ in
         group = "kah";
       };
       users.groups.kah = { };
-      users.users.truxnell.extraGroups = [ "kah" ];
+      users.users.jahanson.extraGroups = [ "kah" ];
     };
 
 }
diff --git a/nixos/modules/nixos/services/prometheus/default.nix b/nixos/modules/nixos/services/prometheus/default.nix
index 59d3d5f..84e5a48 100644
--- a/nixos/modules/nixos/services/prometheus/default.nix
+++ b/nixos/modules/nixos/services/prometheus/default.nix
@@ -60,7 +60,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
     ## service
     # ref: https://github.com/nmasur/dotfiles/blob/aea33592361215356c0fbe5e9d533906f0a023cc/modules/nixos/services/prometheus.nix#L19
diff --git a/nixos/modules/nixos/services/radicale/default.nix b/nixos/modules/nixos/services/radicale/default.nix
index edbef2a..843faa9 100644
--- a/nixos/modules/nixos/services/radicale/default.nix
+++ b/nixos/modules/nixos/services/radicale/default.nix
@@ -67,7 +67,7 @@ in
       restartUnits = [ "${app}.service" ];
     };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
     environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
       hideMounts = true;
diff --git a/nixos/modules/nixos/services/rss-bridge/default.nix b/nixos/modules/nixos/services/rss-bridge/default.nix
index bf979e6..143f215 100644
--- a/nixos/modules/nixos/services/rss-bridge/default.nix
+++ b/nixos/modules/nixos/services/rss-bridge/default.nix
@@ -68,7 +68,7 @@ in
     #   restartUnits = [ "${app}.service" ];
     # };
 
-    users.users.truxnell.extraGroups = [ group ];
+    users.users.jahanson.extraGroups = [ group ];
 
     ## service
     services.rss-bridge = {
diff --git a/nixos/modules/nixos/services/traefik/default.nix b/nixos/modules/nixos/services/traefik/default.nix
index c1bd97f..d69c3ac 100644
--- a/nixos/modules/nixos/services/traefik/default.nix
+++ b/nixos/modules/nixos/services/traefik/default.nix
@@ -131,7 +131,7 @@ in
       };
 
       # add user to group to view files/storage
-      users.users.truxnell.extraGroups = [ "traefik" ];
+      users.users.jahanson.extraGroups = [ "traefik" ];
 
       services.traefik = {
         # TODO refactor into subfiles
diff --git a/nixos/modules/nixos/services/zigbee2mqtt/default.nix b/nixos/modules/nixos/services/zigbee2mqtt/default.nix
index d49c6b1..abdf5ce 100644
--- a/nixos/modules/nixos/services/zigbee2mqtt/default.nix
+++ b/nixos/modules/nixos/services/zigbee2mqtt/default.nix
@@ -72,7 +72,7 @@ in
       directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
     };
 
-    users.users.truxnell.extraGroups = [ app ];
+    users.users.jahanson.extraGroups = [ app ];
 
     services.nginx.virtualHosts."${app}.${config.networking.domain}" = {
       useACMEHost = config.networking.domain;
diff --git a/nixos/modules/nixos/system/pushover/default.nix b/nixos/modules/nixos/system/pushover/default.nix
index 24b593a..1d105da 100644
--- a/nixos/modules/nixos/system/pushover/default.nix
+++ b/nixos/modules/nixos/system/pushover/default.nix
@@ -29,7 +29,7 @@ in
       description = "Notify on failed unit %i";
       serviceConfig = {
         Type = "oneshot";
-        # User = config.users.users.truxnell.name;
+        # User = config.users.users.jahanson.name;
         EnvironmentFile = config.sops.secrets."services/pushover/env".path;
       };