diff --git a/nvim/lua/lsp-config.lua b/nvim/lua/lsp-config.lua index e10dcd3..cddaa2a 100644 --- a/nvim/lua/lsp-config.lua +++ b/nvim/lua/lsp-config.lua @@ -1,5 +1,5 @@ require("mason").setup() -local servers = { "solargraph", "gopls", "lua_ls" } +local servers = { "gopls", "lua_ls" } require("mason-lspconfig").setup({ ensure_installed = servers diff --git a/nvim/lua/plug-config/formatter.lua b/nvim/lua/plug-config/formatter.lua new file mode 100644 index 0000000..e134847 --- /dev/null +++ b/nvim/lua/plug-config/formatter.lua @@ -0,0 +1,12 @@ +require("conform").setup({ + formatters_by_ft = { + ruby = { "standardrb" } + }, +}) + +vim.api.nvim_create_autocmd("BufWritePre", { + pattern = "*", + callback = function(args) + require("conform").format({ bufnr = args.buf }) + end, +}) diff --git a/nvim/lua/plug-config/init.lua b/nvim/lua/plug-config/init.lua index 49baec5..a9afebe 100644 --- a/nvim/lua/plug-config/init.lua +++ b/nvim/lua/plug-config/init.lua @@ -4,3 +4,5 @@ require "plug-config/which-key-mappings" require "plug-config/winshift" require "plug-config/copilot" require "plug-config/coq_thirdparty" +require "plug-config/lint" +require "plug-config/formatter" diff --git a/nvim/lua/plug-config/lint.lua b/nvim/lua/plug-config/lint.lua new file mode 100644 index 0000000..1d694d9 --- /dev/null +++ b/nvim/lua/plug-config/lint.lua @@ -0,0 +1,10 @@ +require('lint').linters_by_ft = { + markdown = {'vale',}, + ruby = {'standardrb'} +} + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + callback = function() + require("lint").try_lint() + end, +}) diff --git a/nvim/plug-config/ale.vim b/nvim/plug-config/ale.vim index e1090e6..146e024 100644 --- a/nvim/plug-config/ale.vim +++ b/nvim/plug-config/ale.vim @@ -1,5 +1,5 @@ -let g:ale_linters = {'ruby': ['standardrb']} -let g:ale_fixers = {'*': ['remove_trailing_lines', 'trim_whitespace'], 'ruby': ['standardrb'], 'go': ['gofmt']} -" -" Set this. Airline will handle the rest. -let g:airline#extensions#ale#enabled = 1 +"let g:ale_linters = {'ruby': ['standardrb']} +"let g:ale_fixers = {'*': ['remove_trailing_lines', 'trim_whitespace'], 'ruby': ['standardrb'], 'go': ['gofmt']} +"" +"" Set this. Airline will handle the rest. +"let g:airline#extensions#ale#enabled = 1 diff --git a/nvim/vim-plug/plugins.vim b/nvim/vim-plug/plugins.vim index 66893a4..405b8fb 100644 --- a/nvim/vim-plug/plugins.vim +++ b/nvim/vim-plug/plugins.vim @@ -110,11 +110,13 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'github/copilot.vim' " Plug 'zbirenbaum/copilot.lua' - """""""""""""""" Ruby/rails related plugins """""""""""""""""" + " Lint + Plug 'mfussenegger/nvim-lint' - " ale for ruby & standardrb - Plug 'dense-analysis/ale' + " Formatter + Plug 'stevearc/conform.nvim' + """""""""""""""" Ruby/rails related plugins """""""""""""""""" """""""""""""""" PHP-related plugins """"""""""""""""