improved spellcheck

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]]

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
 )

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}
   }
 }

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", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
+vim.api.nvim_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
+-- buf_set_keymap("n", "<leader>t", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<F2>", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
+vim.api.nvim_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
+vim.api.nvim_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", 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", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
-  buf_set_keymap("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
-  buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-  buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
-  buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
-  buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
-  -- buf_set_keymap("n", "<leader>t", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
-  buf_set_keymap("n", "<F2>", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-  buf_set_keymap("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
-  buf_set_keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
-  buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
-  buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
-  buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
 end
 local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities())
 

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

spell/de.utf-8.add

@@ -13,3 +13,6 @@ Grenning
 BWL
 Marriot
 Loadbalancer
+nodejs
+Wordpress
+VSCode