From 1e3ef8bbafd3a7f538aad5e9dd19a5d09716565f Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Fri, 21 Jun 2024 23:50:43 -0400
Subject: [PATCH] moved docker-service to docker.nix

---
 modules/docker.nix                | 12 ++++++++++++
 systems/jeeves/docker/default.nix | 12 ------------
 systems/palatine-hill/docker.nix  | 10 ----------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/modules/docker.nix b/modules/docker.nix
index f04b3b0..86a33d2 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -1,5 +1,17 @@
 { lib, ... }:
 {
+  users = {
+    users.docker-service = {
+      isSystemUser = true;
+      group = "docker-service";
+      extraGroups = [ "docker" ];
+      uid = 600;
+    };
+    groups.docker-service = {
+      gid = 600;
+    };
+  };
+
   virtualisation.docker = {
     enable = lib.mkDefault true;
     logDriver = "local";
diff --git a/systems/jeeves/docker/default.nix b/systems/jeeves/docker/default.nix
index 41d7fa6..514c522 100644
--- a/systems/jeeves/docker/default.nix
+++ b/systems/jeeves/docker/default.nix
@@ -6,17 +6,5 @@
     ./postgresql.nix
   ];
 
-  users = {
-    users.docker-service = {
-      isSystemUser = true;
-      group = "docker-service";
-      extraGroups = [ "docker" ];
-      uid = 600;
-    };
-    groups.docker-service = {
-      gid = 600;
-    };
-  };
-
   virtualisation.oci-containers.backend = "docker";
 }
diff --git a/systems/palatine-hill/docker.nix b/systems/palatine-hill/docker.nix
index 4b7eed2..b79eb6f 100644
--- a/systems/palatine-hill/docker.nix
+++ b/systems/palatine-hill/docker.nix
@@ -2,14 +2,4 @@
 
 {
   virtualisation.docker.daemon.settings.data-root = "/var/lib/docker2";
-
-  users = {
-    users.docker-service = {
-      isSystemUser = true;
-      group = "docker-service";
-      extraGroups = [ "docker" ];
-      uid = 600;
-    };
-    groups.docker-service = { };
-  };
 }