From 59f6638457dc6393f42a9661dda8c34f61cdeb85 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Thu, 9 Jun 2016 01:50:50 -0700
Subject: [PATCH] Add ocaml_batteries and merlin

---
 dotfiles/zshrc              | 2 ++
 nix/development/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 1403431..e15ff71 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -99,3 +99,5 @@ RPROMPT="%{$fg[white]%}\${vcs_info_msg_0_}%{$reset_color%}"
 PROMPT="%{$fg[white]%}┌%{$reset_color%}[%{$fg[yellow]%}%n%{$reset_color%}@%{$fg[cyan]%}%m%{$reset_color%}]─[%{$fg[green]%}%d%{$reset_color%}]
 %{$fg[white]%}└─╼%{$reset_color%} "
 
+# Run opam init
+~/.opam/opam-init/init.sh  > /dev/null 2> /dev/null || true
diff --git a/nix/development/default.nix b/nix/development/default.nix
index bc240f3..8c9ddc3 100644
--- a/nix/development/default.nix
+++ b/nix/development/default.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 {
   environment = {
-    # LIBEV_LIBS is used to specify where libev is so opam can find it.
     variables = {
       EDITOR = "nvim";
     };
@@ -22,6 +21,8 @@
       m4                            # GNU Macro Processor
       neovim                        # Better vim
       ocaml                         # OCaml language
+      ocamlPackages.ocaml_batteries # OCaml batteries included
+      ocamlPackages.merlin          # OCaml editor enhancement
       ocamlPackages.findlib         # OCaml findlib
       ocamlPackages.ocaml_lwt       # OCaml LWT Library - Saves time otherwise spent fighting with opam
       ocamlPackages.ocaml_oasis     # OASIS Project Architecture Tool for OCaml