Merge pull request #55 from redyf/dev

Better lsp for nix + formatting for null-ls

config/lsp/lsp.nix

@@ -1,7 +1,7 @@
 {
   plugins = {
     lsp-format = {
-      enable = true;
+      enable = false; # Enable it if you want lsp-format integration for none-ls
     };
     lsp = {
       enable = true;
@@ -22,7 +22,7 @@
             };
           };
         };
-        nixd = { enable = true; };
+        nil_ls = { enable = true; };
         tsserver = {
           enable = false;
           filetypes = [ "javascript" "javascriptreact" "typescript" "typescriptreact" ];

config/none-ls/none-ls.nix

@@ -1,8 +1,22 @@
 {
   plugins.none-ls = {
     enable = false;
-    enableLspFormat = true;
+    enableLspFormat = false;
     updateInInsert = false;
+    onAttach = ''
+      function(client, bufnr)
+          if client.supports_method "textDocument/formatting" then
+            vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr }
+            vim.api.nvim_create_autocmd("BufWritePre", {
+              group = augroup,
+              buffer = bufnr,
+              callback = function()
+                vim.lsp.buf.format { bufnr = bufnr }
+              end,
+            })
+          end
+        end
+    '';
     sources = {
       code_actions = {
         eslint_d.enable = true;