From dd18bd1e6d561b8e223c9f30a70a0f98f7f2bd72 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 17 Oct 2025 22:34:52 -0400
Subject: [PATCH] remove various references to ${username}

---
 home.nix                 | 1 -
 services/caddy.nix       | 5 -----
 services/gitea.nix       | 5 -----
 services/immich.nix      | 5 -----
 services/jellyfin.nix    | 5 -----
 services/minecraft.nix   | 1 -
 services/postgresql.nix  | 5 -----
 services/qbittorrent.nix | 1 -
 8 files changed, 28 deletions(-)

diff --git a/home.nix b/home.nix
index 050e42d..cb59b11 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  username,
   lib,
   ...
 }:
diff --git a/services/caddy.nix b/services/caddy.nix
index d0e5c9c..9fd0f32 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -1,7 +1,6 @@
 {
   config,
   service_configs,
-  username,
   pkgs,
   lib,
   inputs,
@@ -88,8 +87,4 @@ in
   networking.firewall.allowedUDPPorts = [
     service_configs.ports.https
   ];
-
-  users.users.${username}.extraGroups = [
-    config.services.caddy.group
-  ];
 }
diff --git a/services/gitea.nix b/services/gitea.nix
index 38cfc78..dd9f8d5 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -3,7 +3,6 @@
   lib,
   config,
   service_configs,
-  username,
   ...
 }:
 {
@@ -60,8 +59,4 @@
   };
 
   services.openssh.settings.AllowUsers = [ config.services.gitea.user ];
-
-  users.users.${username}.extraGroups = [
-    config.services.gitea.group
-  ];
 }
diff --git a/services/immich.nix b/services/immich.nix
index cd0c863..183b0d4 100644
--- a/services/immich.nix
+++ b/services/immich.nix
@@ -2,7 +2,6 @@
   service_configs,
   pkgs,
   config,
-  username,
   lib,
   ...
 }:
@@ -41,8 +40,4 @@
     "video"
     "render"
   ];
-
-  users.users.${username}.extraGroups = [
-    config.services.immich.group
-  ];
 }
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 4e715e9..e27e50b 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   service_configs,
-  username,
   lib,
   ...
 }:
@@ -41,8 +40,4 @@
     "render"
     service_configs.media_group
   ];
-
-  users.users.${username}.extraGroups = [
-    config.services.jellyfin.group
-  ];
 }
diff --git a/services/minecraft.nix b/services/minecraft.nix
index c66dc41..8485d40 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -2,7 +2,6 @@
   pkgs,
   service_configs,
   lib,
-  username,
   config,
   ...
 }:
diff --git a/services/postgresql.nix b/services/postgresql.nix
index bab8ef9..b773a60 100644
--- a/services/postgresql.nix
+++ b/services/postgresql.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  username,
   service_configs,
   lib,
   ...
@@ -22,8 +21,4 @@
     # postgresql requires 0700
     "Z ${config.services.postgresql.dataDir} 0700 postgresql postgresql"
   ];
-
-  users.users.${username}.extraGroups = [
-    "postgresql"
-  ];
 }
diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix
index e7d6ba3..10cf619 100644
--- a/services/qbittorrent.nix
+++ b/services/qbittorrent.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   service_configs,
-  username,
   lib,
   inputs,
   ...