Merge remote-tracking branch 'origin/main'

10 files changed, 6 insertions, 19 deletions

diff --git a/.config/nvim/after/ftplugin/c.vim b/.config/nvim/after/ftplugin/c.vim
index 49b3953..73fdd4b 100644
--- a/.config/nvim/after/ftplugin/c.vim
+++ b/.config/nvim/after/ftplugin/c.vim
@@ -1,4 +1,3 @@
 setlocal shiftwidth=8
 setlocal tabstop=8
 setlocal expandtab
-let b:ale_fixers = ['clang-format']
diff --git a/.config/nvim/after/ftplugin/java.vim b/.config/nvim/after/ftplugin/java.vim
index 243baeb..5441d82 100644
--- a/.config/nvim/after/ftplugin/java.vim
+++ b/.config/nvim/after/ftplugin/java.vim
@@ -1,2 +1 @@
-let b:ale_linters = ['javac']
 let b:dispatch = 'javac %'
diff --git a/.config/nvim/after/ftplugin/lua.vim b/.config/nvim/after/ftplugin/lua.vim
deleted file mode 100644
index 5611ba5..0000000
--- a/.config/nvim/after/ftplugin/lua.vim
+++ /dev/null
@@ -1 +0,0 @@
-let b:ale_fixers = ['lua-format']
diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim
deleted file mode 100644
index 656bff4..0000000
--- a/.config/nvim/after/ftplugin/markdown.vim
+++ /dev/null
@@ -1 +0,0 @@
-let b:ale_linters = ['languagetool', 'proselint']
diff --git a/.config/nvim/after/ftplugin/python.vim b/.config/nvim/after/ftplugin/python.vim
deleted file mode 100644
index 6bdca5e..0000000
--- a/.config/nvim/after/ftplugin/python.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-let b:ale_fixers = ['black', 'isort']
-let b:ale_linters = ['flake8', 'bandit']
-let g:ale_python_flake8_options = '--max-line-length=88'
-
diff --git a/.config/nvim/after/ftplugin/rust.vim b/.config/nvim/after/ftplugin/rust.vim
index 40d2549..fb601d1 100644
--- a/.config/nvim/after/ftplugin/rust.vim
+++ b/.config/nvim/after/ftplugin/rust.vim
@@ -1,6 +1,3 @@
-let b:ale_fixers = ['rustfmt']
-let b:ale_linters = ['rls']
-
 setlocal tags=./rusty-tags.vi;/
 
 autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw!
diff --git a/.config/nvim/after/ftplugin/sh.vim b/.config/nvim/after/ftplugin/sh.vim
deleted file mode 100644
index 70f6252..0000000
--- a/.config/nvim/after/ftplugin/sh.vim
+++ /dev/null
@@ -1 +0,0 @@
-let b:ale_fixers = ['shfmt']
diff --git a/.config/nvim/after/ftplugin/tex.vim b/.config/nvim/after/ftplugin/tex.vim
index 04307e4..27b002a 100644
--- a/.config/nvim/after/ftplugin/tex.vim
+++ b/.config/nvim/after/ftplugin/tex.vim
@@ -17,6 +17,3 @@ call sandwich#util#addlocal([{
     \ 'buns': ['\enquote{', '}'],
     \ 'input': ['"'],
 \ }])
-
-let b:ale_linters = ['chktex', 'texlab', 'proselint']
-let b:ale_fixers = ['latexindent']
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4644f60..cd20fc3 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -11,10 +11,6 @@
 --     │ ▘▝▀▘▝▀▘│
 --     └────────┘
 
--- do not source the default filetype.vim
--- needed for filetype.nvim
-vim.g.did_load_filetypes = 1
-
 require('plugins')
 require('settings')
 require('plugin_settings')
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua
index ddc7371..277e196 100644
--- a/.config/nvim/lua/plugin_settings.lua
+++ b/.config/nvim/lua/plugin_settings.lua
@@ -353,6 +353,12 @@ for _, lsp in ipairs(servers) do
     }
 end
 
+nvim_lsp['efm'].setup{
+    on_attach = on_attach,
+    filetypes = { 'sh' },
+    capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+}
+
 -- }}} nvim-lsp --
 
 -- vista {{{ --