From c1ba633bff13fa68397707990064e5a1a7ae7f11 Mon Sep 17 00:00:00 2001
From: beatzaplenty <wayne.bennett@live.com>
Date: Mon, 13 Jul 2026 00:30:10 +1000
Subject: [PATCH] modularized docker service

---
 hosts/docker/configuration.nix | 21 ++++++---------------
 modules/nix/docker-service.nix | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 modules/nix/docker-service.nix

diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index a8e8698..9354e7a 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -18,19 +18,17 @@ in
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
       ../../modules/nix/docker-data.nix
+      ../../modules/nix/docker-service.nix
     ];
 
-# nixpkgs.config.permittedInsecurePackages = [
-#                "docker-28.5.2"
-#              ];
 
-  networking.hostName = "docker"; # Define your hostname.
+networking.hostName = "docker"; # Define your hostname.
 networking.hostId = "007f0200";
 boot.zfs.forceImportRoot = false;
 #  virtualisation.docker.enable = true;
-  virtualisation.docker = {
-  enable = true;
-  package = pkgs.docker;
+#  virtualisation.docker = {
+#  enable = true;
+#  package = pkgs.docker;
 #  listenOptions = [
 #  "unix:///var/run/docker.sock"
 #  "tcp://0.0.0.0:2375"
@@ -40,16 +38,9 @@ boot.zfs.forceImportRoot = false;
 #    metrics-addr = "0.0.0.0:9323";
 #    experimental = true;
 #  };
-};
-
-#services.beszel.agent.enable = true;
-#services.beszel.agent.environment = {
-#DOCKER_HOST = "tcp://docker-socket-proxy:2375";
-#HUB_URL = "http://beszel:8090";
-#KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2Snq66P/6GwTEafKuu3D/V1f7ofjKL9GD6ik+Kf/Gn";
-#TOKEN = "235b3-25a94f482-84576-40d34c48";
 #};
 
+
   services.tailscale.enable = true;
   # Enable docker-compose
   environment.systemPackages = with pkgs; [
diff --git a/modules/nix/docker-service.nix b/modules/nix/docker-service.nix
new file mode 100644
index 0000000..ecb5ba2
--- /dev/null
+++ b/modules/nix/docker-service.nix
@@ -0,0 +1,18 @@
+{ ... }:
+
+{
+    #  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+  enable = true;
+  package = pkgs.docker;
+#  listenOptions = [
+#  "unix:///var/run/docker.sock"
+#  "tcp://0.0.0.0:2375"
+#];
+
+#  daemon.settings = {
+#    metrics-addr = "0.0.0.0:9323";
+#    experimental = true;
+#  };
+};
+}
\ No newline at end of file