diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 5d1030c..03b2f0d 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -1,7 +1,6 @@
 { lib, pkgs, ... }:
 {
   imports = [
-    ./kubernetes.nix
     ./powerline.nix
   ];
 
diff --git a/modules/cli/kubernetes.nix b/modules/cli/kubernetes.nix
index c949dac..f95da55 100644
--- a/modules/cli/kubernetes.nix
+++ b/modules/cli/kubernetes.nix
@@ -1,18 +1,6 @@
 { pkgs, ... }:
 {
-  programs.bash.interactiveShellInit = ''
-    source <(kubectl completion bash)
-    complete -F __start_kubectl k
-  '';
   environment.systemPackages = with pkgs; [
-    kubectl
-    kubernetes-helm
-    stern
-
-    (google-cloud-sdk.withExtraComponents
-      [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
-
     # dedicated script, because bash aliases dont work with `watch`
-    (writeShellScriptBin "k" "exec kubectl \"$@\"")
   ];
 }
diff --git a/modules/devtools.nix b/modules/devtools.nix
index b53434e..e085f44 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -14,6 +14,8 @@ in
         errcheck
         go
         gopls
+        kubectl
+        kubernetes-helm
         lua-language-server
         nil
         nodePackages.prettier
@@ -23,8 +25,19 @@ in
         rustc
         rustc.llvmPackages.lld
         rustfmt
+        stern
         vscode-langservers-extracted
         yaml-language-server
+
+        # dedicated script, because bash aliases dont work with `watch`
+        (writeShellScriptBin "k" "exec kubectl \"$@\"")
+
+        (google-cloud-sdk.withExtraComponents
+          [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
       ];
+    programs.bash.interactiveShellInit = ''
+      source <(kubectl completion bash)
+      complete -F __start_kubectl k
+    '';
   };
 }