Browse Source

Add ocaml_batteries and merlin

master
Taylor Bockman 9 years ago
parent
commit
00752faf14
  1. 2
      dotfiles/zshrc
  2. 3
      nix/development/default.nix

2
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%}] PROMPT="%{$fg[white]%}┌%{$reset_color%}[%{$fg[yellow]%}%n%{$reset_color%}@%{$fg[cyan]%}%m%{$reset_color%}]─[%{$fg[green]%}%d%{$reset_color%}]
%{$fg[white]%}└─╼%{$reset_color%} " %{$fg[white]%}└─╼%{$reset_color%} "
# Run opam init
~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true

3
nix/development/default.nix

@ -1,7 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment = { environment = {
# LIBEV_LIBS is used to specify where libev is so opam can find it.
variables = { variables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
@ -22,6 +21,8 @@
m4 # GNU Macro Processor m4 # GNU Macro Processor
neovim # Better vim neovim # Better vim
ocaml # OCaml language ocaml # OCaml language
ocamlPackages.ocaml_batteries # OCaml batteries included
ocamlPackages.merlin # OCaml editor enhancement
ocamlPackages.findlib # OCaml findlib ocamlPackages.findlib # OCaml findlib
ocamlPackages.ocaml_lwt # OCaml LWT Library - Saves time otherwise spent fighting with opam ocamlPackages.ocaml_lwt # OCaml LWT Library - Saves time otherwise spent fighting with opam
ocamlPackages.ocaml_oasis # OASIS Project Architecture Tool for OCaml ocamlPackages.ocaml_oasis # OASIS Project Architecture Tool for OCaml

Loading…
Cancel
Save