diff --git a/modules/home-manager/hyprland/envs.nix b/modules/home-manager/hyprland/envs.nix
index c5db6ab..4acb714 100644
--- a/modules/home-manager/hyprland/envs.nix
+++ b/modules/home-manager/hyprland/envs.nix
@@ -37,6 +37,8 @@
 
       # Use XCompose file
       "XCOMPOSEFILE,~/.XCompose"
+      "EDITOR,nvim"
+      "DOCKER_HOST,unix://$XDG_RUNTIME_DIR/podman/podman.sock"
     ];
 
     xwayland = {
diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix
index 3242459..cf00090 100644
--- a/modules/home-manager/zsh.nix
+++ b/modules/home-manager/zsh.nix
@@ -15,8 +15,5 @@
         }
       ];
     };
-    sessionVariables = {
-      EDITOR = "nvim";
-    };
   };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f6dd48b..602b247 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -9,6 +9,7 @@ in {
     (import ./hyprland.nix inputs)
     (import ./system.nix)
     (import ./1password.nix)
+    (import ./podman.nix)
   ];
 
   environment.systemPackages = packages.systemPackages;
diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix
new file mode 100644
index 0000000..858e496
--- /dev/null
+++ b/modules/nixos/podman.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      dockerSocket.enable = true;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+}
diff --git a/modules/packages.nix b/modules/packages.nix
index 304791d..1994150 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -57,7 +57,9 @@
     # Development tools
     github-desktop
     gh
-    podman-tui
+
+    # Containers
+    docker-compose
     podman-compose
   ];