Configure OCaml

szaffarano · Nov 27, 2023 · 70a540a · 70a540a
1 parent 3f44746
commit 70a540a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 33 deletions.
diff --git a/modules/home-manager/neovim/plugins/lsp.nix b/modules/home-manager/neovim/plugins/lsp.nix
@@ -1,43 +1,47 @@
 {
   # TODO:
   # - grammarly
-  programs.nixvim.plugins = {
-    lsp = {
-      enable = true;
+  programs.nixvim = {
+    extraConfigLua = "require'lspconfig'.ocamllsp.setup{}";
 
-      keymaps = {
-        silent = true;
-        diagnostic = {
-          # Navigate in diagnostics
-          "<leader>k" = "goto_prev";
-          "<leader>j" = "goto_next";
-        };
+    plugins = {
+      lsp = {
+        enable = true;
+
+        keymaps = {
+          silent = true;
+          diagnostic = {
+            # Navigate in diagnostics
+            "<leader>k" = "goto_prev";
+            "<leader>j" = "goto_next";
+          };
 
-        lspBuf = {
-          gd = "definition";
-          gD = "references";
-          gt = "type_definition";
-          gi = "implementation";
-          K = "hover";
-          "<F2>" = "rename";
+          lspBuf = {
+            gd = "definition";
+            gD = "references";
+            gt = "type_definition";
+            gi = "implementation";
+            K = "hover";
+            "<F2>" = "rename";
+          };
         };
-      };
 
-      servers = {
-        bashls = {
-          enable = true;
-          filetypes = [ "sh" "zsh" "bash" ];
+        servers = {
+          bashls = {
+            enable = true;
+            filetypes = [ "sh" "zsh" "bash" ];
+          };
+          clangd.enable = true;
+          gopls.enable = true;
+          jsonls.enable = true;
+          lua-ls.enable = true;
+          nil_ls.enable = true;
+          pyright.enable = true;
+          rust-analyzer.enable = true;
+          texlab.enable = true;
+          tsserver.enable = true;
+          yamlls.enable = true;
         };
-        clangd.enable = true;
-        gopls.enable = true;
-        jsonls.enable = true;
-        lua-ls.enable = true;
-        nil_ls.enable = true;
-        pyright.enable = true;
-        rust-analyzer.enable = true;
-        texlab.enable = true;
-        tsserver.enable = true;
-        yamlls.enable = true;
       };
     };
   };

diff --git a/modules/home-manager/zsh/ocalm.zsh b/modules/home-manager/zsh/ocalm.zsh
@@ -1 +1 @@
-[[ ! -r $HOME/.opam/opam-init/init.zsh ]] || source $HOME/.opam/opam-init/init.zsh  > /dev/null 2> /dev/null
+command -v opam > /dev/null && eval $(opam env)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[[ ! -r $HOME/.opam/opam-init/init.zsh ]] \|\| source $HOME/.opam/opam-init/init.zsh > /dev/null 2> /dev/null
		command -v opam > /dev/null && eval $(opam env)