From aded7ef9d85802f5bb26f90234e586a7d853b021 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Thu, 9 Jul 2020 16:10:45 -0700
Subject: [PATCH] More shell and git config

---
 git.nix   | 2 +-
 home.nix  | 1 +
 shell.nix | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/git.nix b/git.nix
index e97d0a6..52c95a7 100644
--- a/git.nix
+++ b/git.nix
@@ -36,7 +36,7 @@ in {
     };
     extraConfig = {
       core = {
-        editor = "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code --wait";
+        editor = "vim";
         pager = "delta --dark";
         whitespace = "trailing-space,space-before-tab";
       };
diff --git a/home.nix b/home.nix
index ff9419e..096754f 100644
--- a/home.nix
+++ b/home.nix
@@ -26,6 +26,7 @@ in {
     curl
     dhall
     direnv
+    doctl
     elixir
     erlang
     exa
diff --git a/shell.nix b/shell.nix
index 73e1895..1f338eb 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,6 +12,7 @@ let
     cat = "bat";
     dk = "docker";
     k = "kubectl";
+    dc = "docker-compose";
     szsh = "source $HOME/.zshrc";
     reload = "home-manager switch && szsh";
     garbage = "nix-collect-garbage";
@@ -40,13 +41,17 @@ in {
         export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
       fi # added by Nix installer
 
-      # Load environment variables; this approach allows me to not commit secrets
-      # like API keys and such
+      # Load environment variables from a file; this approach allows me to not
+      # commit secrets like API keys
       if [ -e ~/.env ]; then
         source ~/.env
       fi
 
+      # Start up Starship shell
       eval "$(starship init zsh)"
+
+      # kubectl autocomplete
+      source <(kubectl completion zsh)
     '';
 
     #oh-my-zsh = {