diff --git a/home/gunalx.nix b/home/gunalx.nix
index 8003d23..a8bf0f0 100644
--- a/home/gunalx.nix
+++ b/home/gunalx.nix
@@ -23,6 +23,7 @@
     #applications
     ./mako.nix
     ./foot.nix
+    ./zed.nix
     #./fcitx5.nix
 
     #secrets
diff --git a/home/zed.nix b/home/zed.nix
new file mode 100644
index 0000000..39cf2bf
--- /dev/null
+++ b/home/zed.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  programs.zed-editor = {
+    enable = true;
+  };
+}
diff --git a/hosts/legolas/configuration.nix b/hosts/legolas/configuration.nix
index 522290d..3e32459 100644
--- a/hosts/legolas/configuration.nix
+++ b/hosts/legolas/configuration.nix
@@ -23,6 +23,7 @@
     ../../modules/gunalx.nix
     ../../modules/pam.nix
     ../../modules/tailscale.nix
+    ../../modules/podman.nix
   ];
 
   networking.hostName = "legolas";
@@ -47,6 +48,7 @@
   # You can use https://search.nixos.org/ to find more packages (and options).
   environment.systemPackages = with pkgs; [
     vim
+    git
     alacritty
     foot
     firefox
@@ -55,6 +57,15 @@
 
     nixfmt-rfc-style
     nixfmt-tree
+
+    distrobox
+    distrobox-tui
+    boxbuddy
+
+    gcc
+    cargo
+    rustup
+    cmake
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/modules/gunalx.nix b/modules/gunalx.nix
index d4e72d7..5d0a9d7 100644
--- a/modules/gunalx.nix
+++ b/modules/gunalx.nix
@@ -13,6 +13,7 @@
       "wheel"
       "tss"
       "networking"
+      "podman"
     ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
     ];
diff --git a/modules/podman.nix b/modules/podman.nix
new file mode 100644
index 0000000..2cbe243
--- /dev/null
+++ b/modules/podman.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+
+  virtualisation = {
+    containers.enable = true;
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true; # Required for containers under podman-compose to be able to talk to each other.
+    };
+  };
+
+  virtualisation.oci-containers.backend = lib.mkDefault "podman";
+
+  # Useful other development tools
+  environment.systemPackages = with pkgs; [
+    dive # look into docker image layers
+    podman-tui # status of containers in the terminal
+    podman-compose # start group of containers for dev
+  ];
+
+}