diff --git a/lua/basics.lua b/lua/basics.lua index cd545ef..41a5917 100644 --- a/lua/basics.lua +++ b/lua/basics.lua @@ -15,8 +15,8 @@ set.tabstop = 2 set.shiftwidth = 2 set.expandtab = true -vim.cmd [[autocmd FileType markdown setlocal spell spelllang=de,en]] -vim.cmd [[autocmd FileType tex setlocal spell spelllang=de,en]] +-- vim.cmd [[autocmd FileType markdown setlocal spell spelllang=de,en]] +-- vim.cmd [[autocmd FileType tex setlocal spell spelllang=de,en]] vim.cmd [[autocmd bufnewfile,bufread *.tsx set filetype=typescriptreact]] vim.cmd [[autocmd bufnewfile,bufread *.jsx set filetype=javascriptreact]] vim.cmd [[autocmd bufnewfile,bufread Jenkinsfile set filetype=groovy]] diff --git a/lua/plugins.lua b/lua/plugins.lua index f758def..f4217e9 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -127,6 +127,7 @@ return require("packer").startup( require "plugins/lsp" end, requires = { + "jose-elias-alvarez/null-ls.nvim", "RishabhRD/popfix", "hood/popui.nvim", "onsails/lspkind-nvim", @@ -282,7 +283,7 @@ return require("packer").startup( } use { "ggandor/lightspeed.nvim", - requires = {"tpope/vim-repeat"}, + requires = {"tpope/vim-repeat"} } end ) diff --git a/lua/plugins/galaxyline.lua b/lua/plugins/galaxyline.lua index 706a301..cc4f00b 100644 --- a/lua/plugins/galaxyline.lua +++ b/lua/plugins/galaxyline.lua @@ -140,6 +140,20 @@ gls.left[12] = { } } +gls.right[0] = { + WordCount = { + provider = function() + local wc = vim.api.nvim_eval("wordcount()") + if wc["visual_words"] then + return wc["visual_words"] + else + return wc["words"] + end + end, + icon = "  ", + highlight = {colors("green"), color_bg} + } +} gls.right[1] = { FileEncode = { provider = "FileEncode", @@ -186,7 +200,7 @@ gls.right[5] = { separator = " ", separator_highlight = {nil, color_bg}, condition = condition.hide_in_width, - icon = "  ", + icon = "  ", highlight = {colors("green"), color_bg} } } @@ -194,7 +208,7 @@ gls.right[6] = { DiffModified = { provider = "DiffModified", condition = condition.hide_in_width, - icon = " 柳", + icon = "  ", highlight = {colors("orane"), color_bg} } } @@ -202,7 +216,7 @@ gls.right[7] = { DiffRemove = { provider = "DiffRemove", condition = condition.hide_in_width, - icon = "  ", + icon = "  ", highlight = {colors("red"), color_bg} } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index dd15038..7b21d5f 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -17,6 +17,22 @@ vim.fn.sign_define("DiagnosticSignInfo", signHint) --- Completion Icons require("lspkind").init({}) +--- Null-LS + +require("null-ls").setup( + { + sources = { + require("null-ls").builtins.diagnostics.cspell.with( + { + diagnostics_postprocess = function(diagnostic) + diagnostic.severity = vim.diagnostic.severity["WARN"] + end + } + ) + } + } +) + --- Languages require "lspconfig".html.setup {} require "lspconfig".vimls.setup {} @@ -24,6 +40,21 @@ require "lspconfig".yamlls.setup {} local nvim_lsp = require("lspconfig") +-- Mappings. +local opts = {noremap = true, silent = true} +vim.api.nvim_set_keymap("n", "gD", "lua vim.lsp.buf.declaration()", opts) +vim.api.nvim_set_keymap("n", "K", "lua vim.lsp.buf.hover()", opts) +vim.api.nvim_set_keymap("n", "", "lua vim.lsp.buf.signature_help()", opts) +vim.api.nvim_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) +vim.api.nvim_set_keymap("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) +vim.api.nvim_set_keymap("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) +-- buf_set_keymap("n", "t", "lua vim.lsp.buf.type_definition()", opts) +vim.api.nvim_set_keymap("n", "", "lua vim.lsp.buf.rename()", opts) +vim.api.nvim_set_keymap("n", "a", "lua vim.lsp.buf.code_action()", opts) +vim.api.nvim_set_keymap("n", "d", "lua vim.diagnostic.open_float()", opts) +vim.api.nvim_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) +vim.api.nvim_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) +vim.api.nvim_set_keymap("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) local on_attach = function(client, bufnr) local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) @@ -31,22 +62,6 @@ local on_attach = function(client, bufnr) local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - -- Mappings. - local opts = {noremap = true, silent = true} - buf_set_keymap("n", "gD", "lua vim.lsp.buf.declaration()", opts) - buf_set_keymap("n", "K", "lua vim.lsp.buf.hover()", opts) - buf_set_keymap("n", "", "lua vim.lsp.buf.signature_help()", opts) - buf_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) - buf_set_keymap("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) - buf_set_keymap("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) - -- buf_set_keymap("n", "t", "lua vim.lsp.buf.type_definition()", opts) - buf_set_keymap("n", "", "lua vim.lsp.buf.rename()", opts) - buf_set_keymap("n", "a", "lua vim.lsp.buf.code_action()", opts) - buf_set_keymap("n", "d", "lua vim.diagnostic.open_float()", opts) - buf_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) - buf_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) - buf_set_keymap("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) end local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()) diff --git a/setup.sh b/setup.sh index 0a953c9..a56204e 100755 --- a/setup.sh +++ b/setup.sh @@ -11,4 +11,5 @@ vscode-html-languageserver-bin \ vscode-json-languageserver \ vscode-langservers-extracted \ bash-language-server \ -@prisma/language-server +@prisma/language-server \ +cspell diff --git a/spell/de.utf-8.add b/spell/de.utf-8.add index df7437d..04fdda8 100644 --- a/spell/de.utf-8.add +++ b/spell/de.utf-8.add @@ -13,3 +13,6 @@ Grenning BWL Marriot Loadbalancer +nodejs +Wordpress +VSCode diff --git a/spell/de.utf-8.add.spl b/spell/de.utf-8.add.spl index e60550b..6697e95 100644 Binary files a/spell/de.utf-8.add.spl and b/spell/de.utf-8.add.spl differ