feat(nvim): Add missing formatters/linters to efm

Once I get them all working I'll contribute them upstream

fish/functions/emptytrash.fish

@@ -7,4 +7,4 @@ function emptytrash
     sudo rm -rfv ~/.Trash
     sudo rm -rfv /private/var/log/asl/*.asl
     sqlite3 ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV* 'delete from LSQuarantineEvent'
-end
+    # end

home-manager/modules/nvim.nix

@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (pkgs) stdenv;
-  inherit (stdenv) isLinux;
+  # inherit (pkgs) stdenv;
+  # inherit (stdenv) isLinux;
+  isLinux = pkgs.stdenv.isLinux;
 in {
   home.sessionVariables = {
     MANPAGER = "nvim -c 'Man!' -o -";
@@ -58,7 +59,7 @@ in {
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    withNodeJs = true;
+    withNodeJs = false;
     withRuby = false;
     withPython3 = false;
     defaultEditor = true;
@@ -82,6 +83,7 @@ in {
       nodePackages_latest.markdownlint-cli
 
       # LSP servers
+      efm-langserver
       rnix-lsp
       rust-analyzer
       taplo

nvim/lua/efmls-configs/formatters/cbfmt.lua

@@ -0,0 +1,9 @@
+-- TODO this one isn't working
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('cbfmt')
+local command = string.format('%s --stdin-filepath ${INPUT} --best-effort', formatter)
+
+return {
+  formatCommand = command,
+  formatStdin = true,
+}

nvim/lua/efmls-configs/formatters/fish_indent.lua

@@ -0,0 +1,6 @@
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('fish_indent')
+return {
+  formatCommand = formatter,
+  formatStdin = true,
+}

nvim/lua/efmls-configs/formatters/gofmt.lua

@@ -0,0 +1,6 @@
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('gofmt')
+return {
+  formatCommand = formatter,
+  formatStdin = true,
+}

nvim/lua/efmls-configs/formatters/markdownlint.lua

@@ -0,0 +1,8 @@
+-- TODO file isn't reloaded after formatting
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('markdownlint')
+local command = string.format('%s --fix ${INPUT}', formatter)
+return {
+  formatCommand = command,
+  formatStdin = false,
+}

nvim/lua/efmls-configs/formatters/nixfmt.lua

@@ -0,0 +1,11 @@
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('nixfmt')
+return {
+  formatCommand = formatter,
+  formatStdin = true,
+  rootMarkers = {
+    'flake.nix',
+    'shell.nix',
+    'default.nix',
+  },
+}

nvim/lua/efmls-configs/formatters/rustfmt.lua

@@ -0,0 +1,7 @@
+local fs = require('efmls-configs.fs')
+local formatter = fs.executable('rustfmt')
+local command = string.format('%s --emit=stdout', formatter)
+return {
+  formatCommand = command,
+  formatStdin = true,
+}

nvim/lua/efmls-configs/linters/fish.lua

@@ -0,0 +1,9 @@
+-- TODO this isn't working
+local fs = require('efmls-configs.fs')
+local linter = fs.executable('fish')
+local command = string.format('%s --no-execute ${INPUT}', linter)
+
+return {
+  lintCommand = command,
+  lintFormats = { '%f (line %l): %m' },
+}

nvim/lua/efmls-configs/linters/statix.lua

@@ -0,0 +1,15 @@
+-- TODO this one doesn't work
+local fs = require('efmls-configs.fs')
+local linter = fs.executable('statix')
+local command = string.format('%s check --stdin --format=errfmt', linter)
+return {
+  lintCommand = command,
+  lintStdin = true,
+  -- lintIgnoreExitCode = true,
+  lintFormats = { '<text>%l:%c:%t:<text>:%m' },
+  rootMarkers = {
+    'flake.nix',
+    'shell.nix',
+    'default.nix',
+  },
+}

nvim/lua/my/configure/lspconfig.lua

@@ -4,6 +4,8 @@ return {
     'hrsh7th/cmp-nvim-lsp',
     {
       'creativenull/efmls-configs-nvim',
+      -- neoconf must be loaded before any LSP
+      dependencies = { 'folke/neoconf.nvim' },
       enabled = false,
       event = 'BufReadPre',
       config = function()
@@ -12,6 +14,7 @@ return {
     },
     {
       'jose-elias-alvarez/null-ls.nvim',
+      enabled = true,
       event = 'BufReadPre',
       opts = function()
         return require('my.lsp.null-ls')

nvim/lua/my/legendary/autocmds.lua

@@ -72,7 +72,7 @@ function M.lsp_autocmds(bufnr, server_name)
   end
 
   if
-    server_name == 'null-ls'
+    (server_name == 'null-ls' or server_name == 'efm')
     and #vim.tbl_filter(function(autocmd)
         return autocmd.buflocal == true and autocmd.buffer == bufnr and autocmd.event == 'BufWritePost'
       end, autocmds)

nvim/lua/my/legendary/commands.lua

@@ -90,7 +90,7 @@ function M.lsp_commands(bufnr, server_name)
     },
   }
 
-  if server_name == 'null-ls' and not (vim.api.nvim_buf_get_commands(0, {}) or {}).Format then
+  if (server_name == 'null-ls' or server_name == 'efm') and not (vim.api.nvim_buf_get_commands(0, {}) or {}).Format then
     commands = TblUtils.join_lists(commands, {
       {
         ':Format',

nvim/lua/my/lsp/efm.lua

@@ -1,5 +1,9 @@
 local efmls = require('efmls-configs')
 
+local cbfmt = require('efmls-configs.formatters.cbfmt')
+cbfmt.formatCommand =
+  string.format('%s --config %s', cbfmt.formatCommand, string.format('%s/.config/cbfmt.toml', vim.env.HOME))
+
 local node_config = {
   linter = require('efmls-configs.linters.eslint_d'),
   -- switch to prettier_d once I can figure out how to install it with Nix
@@ -30,4 +34,24 @@ efmls.setup({
     linter = require('efmls-configs.linters.luacheck'),
     formatter = require('efmls-configs.formatters.stylua'),
   },
+  nix = {
+    linter = require('efmls-configs.linters.statix'),
+    formatter = require('efmls-configs.formatters.nixfmt'),
+  },
+  markdown = {
+    formatter = {
+      require('efmls-configs.formatters.markdownlint'),
+      cbfmt,
+    },
+  },
+  fish = {
+    formatter = require('efmls-configs.formatters.fish_indent'),
+    linter = require('efmls-configs.linters.fish'),
+  },
+  go = {
+    formatter = require('efmls-configs.formatters.gofmt'),
+  },
+  rust = {
+    formatter = require('efmls-configs.formatters.rustfmt'),
+  },
 })

nvim/lua/my/lsp/utils/init.lua

@@ -17,7 +17,7 @@ function M.on_attach(client)
   end
 
   -- Disable formatting with other LSPs because we're handling formatting via null-ls
-  if client.name ~= 'null-ls' then
+  if client.name ~= 'null-ls' and client.name ~= 'efm' then
     client.server_capabilities.documentFormattingProvider = false
   end
 end
@@ -26,6 +26,14 @@ function M.setup_async_formatting()
   -- format on save asynchronously, see M.format_document
   vim.lsp.handlers['textDocument/formatting'] = function(err, result, ctx)
     if err ~= nil then
+      -- efm uses table messages
+      if type(err) == 'table' then
+        if err.message then
+          err = err.message
+        else
+          err = vim.inspect(err)
+        end
+      end
       vim.api.nvim_err_write(err)
       return
     end