From 3234f04ffd1b593b1b1515393c3f6003222c5c20 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Wed, 8 Jul 2020 19:03:49 -0700
Subject: [PATCH] More packages ported from Homebrew

---
 home.nix  | 14 ++++++++++++++
 shell.nix | 15 +++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/home.nix b/home.nix
index c03dd07..95fee45 100644
--- a/home.nix
+++ b/home.nix
@@ -18,21 +18,35 @@ in {
   imports = baseImports;
 
   home.packages = with pkgs; [
+    adoptopenjdk-bin
+    bazel
+    crystal
     curl
     dhall
     direnv
     elixir
+    erlang
     fd
     fzf
     gitAndTools.gh
     go
     htop
     httpie
+    hugo
     jq
+    minikube
+    nodejs
+    packer
+    python3
     ripgrep
+    ruby
+    rustup
+    shards
+    terraform
     tokei
     tree
     xsv
+    yarn
     youtube-dl
   ];
 }
diff --git a/shell.nix b/shell.nix
index b2cc22f..a731b08 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,6 +9,7 @@ let
     dk = "docker";
     k = "kubectl";
     szsh = "source $HOME/.zshrc";
+    reload = "home-manager switch";
   };
 in {
   home.packages = with pkgs; [
@@ -18,26 +19,28 @@ in {
 
   programs.broot = {
     enable = true;
+    enableFishIntegration = true;
     enableZshIntegration = true;
   };
 
+  programs.fish = {
+    enable = true;
+  };
+
   programs.zsh = {
     inherit shellAliases;
     enable = true;
     enableAutosuggestions = true;
     history.extended = true;
 
-    sessionVariables = {
-      PATH = "/Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin:$HOME/.nix-profile/bin:$PATH";
-      EDITOR = "nvim";
-      GOPATH = "$HOME/go";
-    };
-
     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
       fi # added by Nix installer
+
+      # Load environment variables
+      source ~/.env
     '';
 
     oh-my-zsh = {