diff options
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/configs.lua | 1 | ||||
| -rw-r--r-- | sh/.config/profile.d/50-opam.sh | 6 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc.d/50-opam.zsh | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua index d2986e1..73b7313 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua @@ -166,6 +166,7 @@ local M = { }, }, }, + zls = {}, } return M diff --git a/sh/.config/profile.d/50-opam.sh b/sh/.config/profile.d/50-opam.sh index 5022a7c..1caea3b 100644 --- a/sh/.config/profile.d/50-opam.sh +++ b/sh/.config/profile.d/50-opam.sh @@ -1,3 +1,9 @@ #!/bin/sh export OPAMROOT="$XDG_DATA_HOME/opam" +export OPAM_SWITCH_PREFIX="$OPAMROOT/default" +export CAML_LD_LIBRARY_PATH="$OPAM_SWITCH_PREFIX/lib/stublibs:/usr/lib/ocaml/stublibs:/usr/lib/ocaml" +export OCAML_TOPLEVEL_PATH="$OPAM_SWITCH_PREFIX/lib/toplevel" +export MANPATH="$MANPATH:$OPAM_SWITCH_PREFIX/man" + +append_path "$OPAM_SWITCH_PREFIX/bin" diff --git a/zsh/.config/zsh/.zshrc.d/50-opam.zsh b/zsh/.config/zsh/.zshrc.d/50-opam.zsh index e19cc8c..53c479e 100644 --- a/zsh/.config/zsh/.zshrc.d/50-opam.zsh +++ b/zsh/.config/zsh/.zshrc.d/50-opam.zsh @@ -1,5 +1,5 @@ #!/bin/zsh -if [ -r $XDG_DATA_HOME/opam/opam-init/init.zsh ]; then - source $XDG_DATA_HOME/opam/opam-init/init.zsh +if [ -r $OPAMROOT/opam-init/complete.zsh ]; then + source $OPAMROOT/opam-init/complete.zsh >/dev/null 2>/dev/null fi |