diff --git a/modules/capabilities/dev-tools.nix b/modules/capabilities/dev-tools.nix
index 7670168..a99c0eb 100644
--- a/modules/capabilities/dev-tools.nix
+++ b/modules/capabilities/dev-tools.nix
@@ -11,6 +11,7 @@
         posting
         resterm
         inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.default
+        kubectl
       ];
 
       programs.zsh.initContent = ''
diff --git a/modules/capabilities/shell.nix b/modules/capabilities/shell.nix
index d4dd906..23bff8c 100644
--- a/modules/capabilities/shell.nix
+++ b/modules/capabilities/shell.nix
@@ -62,6 +62,17 @@
         '';
 
         initContent = ''
+          source <(/home/kiri/.garden/gardenctl completion zsh)
+
+
+          [ -n "$GCTL_SESSION_ID" ] || [ -n "$TERM_SESSION_ID" ] || export GCTL_SESSION_ID=$(uuidgen)
+
+          if [ -z "$GCTL_SESSION_ID" ] && [ -z "$TERM_SESSION_ID" ]; then
+            export GCTL_SESSION_ID=$(uuidgen)
+          fi
+
+          eval $(/home/kiri/.garden/gardenctl kubectl-env zsh)
+
           bindkey -v
 
           export KEYTIMEOUT=1