diff --git a/home-manager/default.nix b/home-manager/default.nix
index f92a6d9..49aa561 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -66,7 +66,6 @@ in
       pavucontrol
       playerctl
       jq
-      yq
       psmisc
       zip
       nmap
@@ -77,7 +76,6 @@ in
       strace
       usbutils
       pciutils
-      navi
 
       brightnessctl
       wl-clipboard
@@ -121,10 +119,7 @@ in
       # kubernetes stuff
       kubectl
       krew
-      kubernetes-helm
-      k9s
-      stern
-      kubecrypt
+      kubectx
 
     ] ++ lib.optionals (config.my.isLaptop) [
       networkmanager
diff --git a/home-manager/dell.nix b/home-manager/dell.nix
index e36c084..750c380 100644
--- a/home-manager/dell.nix
+++ b/home-manager/dell.nix
@@ -27,27 +27,20 @@
     ripgrep
     devenv
     bat
-    jless
-    jq
-    yq
-    vault
-    google-cloud-sdk
-    navi
 
     # for zsh-fzf plugin
     fzf
 
     # denic tooling from overlay
     gohome
-    kubecrypt
 
     # kubernetes stuff
     kubectl
     krew
+    kubectx
     kubernetes-helm
     k9s
     stern
-
   ];
 
   home.username = "felix";
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index d94dcf5..0209d61 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -37,7 +37,7 @@
         sort = "version:refname";
       };
       "help" = {
-        autocorrect = "prompt";
+        autocorrect = "promt";
       };
       "core" = {
         pager = "less -F -X";
diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index 741a5d9..76667da 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -28,8 +28,10 @@
       # Colorscheme
       papercolor-theme
 
-      # Filebrowser
-      nvim-tree-lua
+      # Better support for netrw
+      vim-vinegar
+      netrw-nvim
+      nvim-web-devicons
 
       # Bar at the top for all open buffers
       bufferline-nvim
@@ -155,11 +157,6 @@
       let g:go_highlight_operators = 1
       let g:go_highlight_build_constraints = 1
 
-      " Bug with whitespaces. TODO: Remove this line after nvim 0.11
-      " https://github.com/vim-airline/vim-airline/issues/2704
-      let g:airline#extensions#whitespace#enabled = 0
-
-
       " Don't use gopls from vim-go
       let g:go_gopls_enabled = 0
 
@@ -183,12 +180,12 @@
         local hooks = require "ibl.hooks"
         hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
         hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level)
+        require'netrw'.setup{}
         require("auto-session").setup {
           auto_save_enabled = true;
           auto_restore_enabled = true;
         }
         require("bufferline").setup{}
-        require("nvim-tree").setup()
 
         require('lspconfig').gopls.setup{}
         require('lspconfig').pyright.setup{}
diff --git a/home-manager/modules/tmux.nix b/home-manager/modules/tmux.nix
index b453d96..0f018bd 100644
--- a/home-manager/modules/tmux.nix
+++ b/home-manager/modules/tmux.nix
@@ -2,7 +2,6 @@
   programs.tmux = {
     enable = true;
     keyMode = "vi";
-    mouse = true;
     escapeTime = 0;
     plugins = [
       pkgs.tmuxPlugins.gruvbox
@@ -15,6 +14,7 @@
       bind -n M-l select-pane -R
       bind -n M-k select-pane -U
       bind -n M-j select-pane -D
+
       '';
 
   };
diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index bb7d0be..ce1ce75 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -7,26 +7,20 @@
       theme = "kolo";
     };
     history = {
-      share = false; # every terminal has it's own history durring runtime
+      share = false; # every terminal has it's own history
       extended = true;
       size = 10000;
     };
     shellAliases = {
       "k" = "kubectl";
       "kx" = "kubectx";
-      "kn" = "kubechn";
-      "kc" = "kubechc";
       "dl" = "ls -lhtr --color=always ~/Downloads | tail -n 10"; # Show the 10 newest Downloads
       "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer";
       "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs
       "dig" = "dig +short";
       "cat" = "bat --theme=TwoDark --style=plain";
-      "watch" =  "watch "; # https://unix.stackexchange.com/a/25329
-      "kge" = "kubectl get events --sort-by='.lastTimestamp'";
     };
     initExtra = ''
-      setopt APPEND_HISTORY # Append history to global histfile on exit
-
       autoload -U colors && colors
 
       function is_ssh(){
@@ -34,19 +28,10 @@
           echo %{$fg[red]%}SSH-Session on $(hostname -s)%{$reset_color%}
         fi
       }
-      function get_k8s_info(){
-        kubectl config get-contexts| grep "*" | awk '{print $3"/"$5}'
-      }
-
-      RPS1='$(is_ssh) $(get_k8s_info)'
+      RPS1='$(is_ssh) $(kubectx_prompt_info)'
       export EDITOR="nvim";
       export PATH="$PATH:$HOME/.krew/bin:$HOME/bin:$HOME/go/bin";
       source <(kubectl completion zsh)
-      source ~/repos/kubech/kubech
-
-      export GOPRIVATE=gitlab.com
-      export GOAUTH=netrc
-
       eval "$(direnv hook zsh)"
     '';
   };
diff --git a/overlay b/overlay
index 62209bc..7fc5447 160000
--- a/overlay
+++ b/overlay
@@ -1 +1 @@
-Subproject commit 62209bcff29f6d2d1a643870b643d6c9d2577d5f
+Subproject commit 7fc544758f1004ca7e193acc4a8d0ee784e585a9
diff --git a/secrets b/secrets
index b5be703..0073a1e 160000
--- a/secrets
+++ b/secrets
@@ -1 +1 @@
-Subproject commit b5be7037c16f25899be906029de9dc9cb6f79ff8
+Subproject commit 0073a1ebe983e942b7a9513ef33ad29c6ac8d6ac