diff --git a/git.nix b/git.nix
index fdd505c..e97d0a6 100644
--- a/git.nix
+++ b/git.nix
@@ -46,4 +46,4 @@ in {
       pull.rebase = "false";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/home.nix b/home.nix
index 95fee45..368a684 100644
--- a/home.nix
+++ b/home.nix
@@ -19,6 +19,8 @@ in {
 
   home.packages = with pkgs; [
     adoptopenjdk-bin
+    bash
+    bat
     bazel
     crystal
     curl
@@ -26,23 +28,31 @@ in {
     direnv
     elixir
     erlang
+    exa
     fd
     fzf
+    gitAndTools.delta
     gitAndTools.gh
     go
     htop
     httpie
     hugo
     jq
+    kubectl
+    kubectx
+    linkerd
     minikube
     nodejs
     packer
     python3
+    python38Packages.pip
     ripgrep
     ruby
     rustup
     shards
+    skaffold
     terraform
+    tilt
     tokei
     tree
     xsv
diff --git a/shell.nix b/shell.nix
index a731b08..46a1976 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,14 +9,10 @@ let
     dk = "docker";
     k = "kubectl";
     szsh = "source $HOME/.zshrc";
-    reload = "home-manager switch";
+    reload = "home-manager switch && szsh";
+    garbage = "nix-collect-garbage";
   };
 in {
-  home.packages = with pkgs; [
-    bat
-    exa
-  ];
-
   programs.broot = {
     enable = true;
     enableFishIntegration = true;
@@ -31,16 +27,20 @@ in {
     inherit shellAliases;
     enable = true;
     enableAutosuggestions = true;
+    enableCompletion = true;
     history.extended = true;
 
     initExtra = ''
       if [ -e ~/.nix-profile/etc/profile.d/nix.sh ]; then
-      . ~/.nix-profile/etc/profile.d/nix.sh;
-      export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
+        . ~/.nix-profile/etc/profile.d/nix.sh;
+        export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
       fi # added by Nix installer
 
-      # Load environment variables
-      source ~/.env
+      # Load environment variables; this approach allows me to not commit secrets
+      # like API keys and such
+      if [ -e ~/.env ]; then
+        source ~/.env
+      fi
     '';
 
     oh-my-zsh = {