From 038cf5f66d030c8119111b1707e54f296680da82 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Thu, 9 Jun 2016 00:00:56 -0700
Subject: [PATCH] Add a bunch of stuff for Ocaml

---
 dotfiles/config/nvim/init.vim          |  5 +++++
 nix/development/default.nix            | 10 ++++++++++
 nix/development/env/python/default.nix |  9 +++++----
 nix/software/default.nix               |  3 +++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 30db682..443e6d3 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -50,6 +50,7 @@ Plug 'mxw/vim-jsx'
 Plug 'digitaltoad/vim-jade'
 Plug 'wavded/vim-stylus'
 Plug 'raichoo/haskell-vim'
+Plug 'OCamlPro/ocp-indent'
 
 " Org Mode
 Plug 'jceb/vim-orgmode'
@@ -164,6 +165,10 @@ endif
 " Color customizations
 " let g:indentLine_color_term=###
 
+" Merlin for OCaml
+let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
+execute "set rtp+=" . g:opamshare . "/merlin/vim"
+
 " Fugitive bindings
 nnoremap <Leader>gs :Gstatus<CR>
 nnoremap <Leader>gd :Gdiff<CR>
diff --git a/nix/development/default.nix b/nix/development/default.nix
index 4dbbe44..75e31c4 100644
--- a/nix/development/default.nix
+++ b/nix/development/default.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 {
   environment = {
+    # LIBEV_LIBS is used to specify where libev is so opam can find it.
     variables = {
       EDITOR = "nvim";
     };
@@ -8,13 +9,22 @@
     systemPackages = with pkgs; [
       bar-xft                     # Lightweight xcb based bar
       cabal-install               # Haskell package installer
+      coreutils                   # GNU coreutils
+      cmake                       # CMake tool
       curl                        # Tool for general HTTP, FTP, etc work
       freetype                    # Library to render fonts required by some packages
       gcc                         # GNU Compiler Collection
       ghc                         # Haskell compiler
+      gnumake                     # GNU Make
       git                         # Source control
+      libev                       # Event loop library
       libpng                      # PNG library
+      m4                          # GNU Macro Processor
       neovim                      # Better vim
+      ocaml                       # OCaml language
+      ocamlPackages.ocaml_lwt     # OCaml LWT Library - Saves time otherwise spent fighting with opam
+      ocamlPackages.utop          # Much better top-level for OCaml
+      opam                        # OCaml package manager
       python3                     # Python 3
       python34Packages.setuptools # Python setuptools
       silver-searcher             # Better than grep
diff --git a/nix/development/env/python/default.nix b/nix/development/env/python/default.nix
index 734264a..d36a700 100644
--- a/nix/development/env/python/default.nix
+++ b/nix/development/env/python/default.nix
@@ -8,7 +8,6 @@ with pkgs.python3Packages;
 buildPythonPackage {
   name = "pythonEnv";
   buildInputs = [
-      cython                        # Cython
       freetype
       gcc                           # GNU Compiler Collection
       gfortran
@@ -28,13 +27,15 @@ buildPythonPackage {
       python3Packages.setuptools
       stdenv
       which
-      zlib ];
+      zlib
+      zsh                           # ZSH because I develop in ZSH
+    ];
   src = null;
 
   # Environment variables for scipy builds
   ATLAS = atlas;
-  BLAS = blas;
-  LAPACK = liblapack;
+  # BLAS = openblas;
+  # LAPACK = liblapack;
 
   # When used as `nix-shell --pure`
   shellHook = ''
diff --git a/nix/software/default.nix b/nix/software/default.nix
index 0e920a7..b00080c 100644
--- a/nix/software/default.nix
+++ b/nix/software/default.nix
@@ -2,11 +2,14 @@
 {
   environment.systemPackages = with pkgs; [
     byzanz                      # Screen recording software
+    calibre                     # Ebook reader
     chromium                    # Browser
     gtk                         # For GTK+ themes
     htop                        # System monitor
     libreoffice                 # Libreoffice
     mplayer                     # Video player
+    nox                         # Better nix package search
+    unzip                       # Unzipper
     xdotool                     # Diagnostic tool for mouse and keyboard
   ];