From 1cf44c97ccfa9119c7f58fe6d1c08f7908a553e1 Mon Sep 17 00:00:00 2001
From: Weckyy702 <konstantin@veltko.de>
Date: Thu, 18 Jun 2026 16:20:07 +0200
Subject: [PATCH] Docker: Simplify docker module by making usernames adjustable

---
 modules/hosts/tux/devtools.nix               | 4 ++--
 modules/hosts/tux/users/weckyy702/docker.nix | 5 -----
 modules/programs/docker.nix                  | 8 +++++++-
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 modules/hosts/tux/users/weckyy702/docker.nix

diff --git a/modules/hosts/tux/devtools.nix b/modules/hosts/tux/devtools.nix
index b0c1974..590f07f 100644
--- a/modules/hosts/tux/devtools.nix
+++ b/modules/hosts/tux/devtools.nix
@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  flake.modules.nixos.tux = {
+  flake.modules.nixos.tux-devtools = {
     imports = with inputs.self.modules.nixos;
       with inputs.self.factory; [
         development-tools
@@ -9,7 +9,7 @@
         udev-pio
         udev-lauterbach
 
-        docker
+        (docker [ "weckyy702" ])
       ];
   };
 }
diff --git a/modules/hosts/tux/users/weckyy702/docker.nix b/modules/hosts/tux/users/weckyy702/docker.nix
deleted file mode 100644
index 310b829..0000000
--- a/modules/hosts/tux/users/weckyy702/docker.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  flake.modules.nixos.tux = {
-    users.users.weckyy702.extraGroups = [ "docker" ];
-  };
-}
diff --git a/modules/programs/docker.nix b/modules/programs/docker.nix
index 5019907..8eb8b85 100644
--- a/modules/programs/docker.nix
+++ b/modules/programs/docker.nix
@@ -1,8 +1,14 @@
 {
-  flake.modules.nixos.docker = {
+  config.flake.factory.docker = users: { lib, ... }: {
     virtualisation.docker = {
       enable = true;
       autoPrune.enable = true;
     };
+    users.users =
+      lib.genAttrs
+        users
+        (_: {
+          extraGroups = [ "docker" ];
+        });
   };
 }