From 622806ddef42a9e8d96d611c7c3d3f4f9418feb4 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Wed, 26 Mar 2025 15:27:25 +0100
Subject: [PATCH] Changed: Virt Conf

---
 home/programs/docker.nix | 18 ------------------
 home/programs/podman.nix | 11 -----------
 modules/system.nix       | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 home/programs/docker.nix
 delete mode 100644 home/programs/podman.nix

diff --git a/home/programs/docker.nix b/home/programs/docker.nix
deleted file mode 100644
index 8fda11d..0000000
--- a/home/programs/docker.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }: {
-    
-    virtualisation.docker = {
-        enable = true;
-	rootless = {
-		enable = true;
-		setSocketVariable = true;
-	};
-    	daemon.settings = {
-		data-root = "/docker/containers";
-		userland-proxy = false;
-		experimental = true;
-		metrics-addr = "0.0.0.0:9323";
-		ipv6 = true;
-		fixed-cidr-v6 = "fd00::/80";
-	};
-    };
-}
diff --git a/home/programs/podman.nix b/home/programs/podman.nix
deleted file mode 100644
index 656d767..0000000
--- a/home/programs/podman.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-    virtualisation = {
-        containers.enable = true;
-
-        podman = {
-            enable = true;
-            dockerCompat = true;
-            defaultNetwork.settings.dns_enabled = true;
-        };
-    };
-}
diff --git a/modules/system.nix b/modules/system.nix
index 22b3e01..85ef948 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -114,7 +114,24 @@
             dockerCompat = true;
             defaultNetwork.settings.dns_enabled = true;
         };
-    }; 
+        
+        docker = {
+            enable = true;
+            rootless = {
+                enable = true;
+                setSocketVariable = true;
+            };
+            daemon.settings = {
+                data-root = "/docker/containers";
+                userland-proxy = false;
+                experimental = true;
+                metrics-addr = "0.0.0.0:9323";
+                ipv6 = true;
+                fixed-cidr-v6 = "fd00::/80";
+            };
+        };
+    };
+
 # networking.firewall.allowedTCPPorts = [ ... ];
 # networking.firewall.allowedUDPPorts = [ ... ];
 # Or disable the firewall altogether.