Change in folders organisation

modules/system/options/apps/git.nix

@@ -13,10 +13,6 @@ in
       enable = true;
       config = {
         init.defaultBranch = "main";
-        user = {
-          name = "Laurent Gueret";
-          email = "gueretlob@icloud.com";
-        };
       };
     };
 

modules/system/options/apps/virtualisation/docker.nix

@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.shell.docker;
+  cfg = config.os.virtualisation.docker;
 in
 {
-  options.os.shell.docker = {
+  options.os.virtualisation.docker = {
     enable = mkEnableOption "System docker service";
   };
   config = mkIf cfg.enable {
@@ -13,5 +13,6 @@ in
       enable = true;
       daemon.settings.features.cdi = true;
     };
+
   };
 }

modules/system/options/apps/virtualisation/podman.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.os.virtualisation.podman;
+in
+{
+  options.os.virtualisation.podman = {
+    enable = mkEnableOption "System docker service";
+  };
+  config = mkIf cfg.enable {
+
+    virtualisation = {
+      containers.enable = true;
+      podman = {
+        enable = true;
+        dockerCompat = true;
+        dockerSocket.enable = true;
+        defaultNetwork.settings.dns_enabled = true; # Required for containers under podman-compose to be able to talk to each other.
+      };
+    };
+
+    environment = {
+      systemPackages = with pkgs; [
+        pods
+        podman-compose
+      ];
+    };
+
+  };
+}

modules/system/os.nix

@@ -24,8 +24,8 @@
   os.gnome.apps.enable = true;
 
   # Virtualisation Apps
-  os.shell.docker.enable = true;
   os.virtualisation.cuda.enable = true;
+  os.virtualisation.podman.enable = true;
 
   # System version
   system.stateVersion = "25.11";

modules/system/partials/users.nix

@@ -6,7 +6,7 @@
       isNormalUser = true;
       extraGroups = [
         "wheel"
-        "docker"
+        "podman"
       ];
     };
   };