chore(mappings): format

- Add a function for the word counter

init.lua

@@ -62,6 +62,9 @@ require('complete')
 -- [[ Configure neorg ]]
 require('neorg-configure')
 
+-- [[ Configure status line ]]
+require('statusline')
+
 -- Customizations
 require('restore-position')
 require('autocommands')

lazy-lock.json

@@ -1,50 +1,50 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitsigns.nvim": { "branch": "main", "commit": "39e0d1cd44eafed5f30c372e377ab1cb1781ec9f" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "c909a01eb923101c76a57fd2187835e9013ab59a" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "a4e3c15dfdce8783c074539b1835edae75fa63d5" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
   "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
   "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.icons": { "branch": "main", "commit": "86a633f0dffcfd80110bac86681dbf4b5c37ba5c" },
-  "mini.nvim": { "branch": "main", "commit": "189010888bc37fc1c382f2dcc81b7a6441160686" },
-  "neorg": { "branch": "main", "commit": "a48166d3f5729d424ad39254351288944994f097" },
-  "neorg-telescope": { "branch": "main", "commit": "ddb2556644cae922699a239bbb0fe16e25b084b7" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
-  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
+  "mason.nvim": { "branch": "main", "commit": "888d6ee499d8089a3a4be4309d239d6be1c1e6c0" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
+  "mini.nvim": { "branch": "main", "commit": "8f0969dd976e4f0cb8e2898596fa2eab18ce676b" },
+  "neorg": { "branch": "main", "commit": "8fdd9b2986acfb4ce310bebfc338111793862f00" },
+  "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "85e0dd26b710e834a105d679200d01e326a3d2b0" },
+  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "master", "commit": "da5825bf70cc2ea7eacd1e60c32c07baf19adeba" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
-  "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b0debd5c424969b4baeabdc8f54db3036c691732" },
+  "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "rose-pine": { "branch": "main", "commit": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3" },
+  "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "typst.vim": { "branch": "main", "commit": "8ce752f1ba1277046429cb469c17ff2e1abc718f" },
+  "typst.vim": { "branch": "main", "commit": "323539709e29a537ff39dfce6c05f175a8921504" },
   "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "vim-pandoc-syntax": { "branch": "master", "commit": "05ef7f44ebaea37159db8d365058c0a9e2ef14b5" },
+  "vim-pandoc-syntax": { "branch": "master", "commit": "ea3fc415784bdcbae7f0093b80070ca4ff9e44c8" },
   "vim-rhubarb": { "branch": "master", "commit": "386daa2e9d98e23e27ad089afcbe5c5a903e488d" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "vim-speeddating": { "branch": "master", "commit": "c17eb01ebf5aaf766c53bab1f6592710e5ffb796" },
-  "vimtex": { "branch": "master", "commit": "bcb14eb6e3739f0c1902115a710292bc37c62d2e" },
+  "vimtex": { "branch": "master", "commit": "9d9f74c3ab073b70bc943279af1aa86075de632c" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

lsp/gdscript.lua

@@ -0,0 +1,17 @@
+local port = os.getenv 'GDScript_Port' or '6005'
+local cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(port))
+
+return {
+  default_config = {
+    cmd = cmd,
+    filetypes = { 'gd', 'gdscript', 'gdscript3' },
+    root_markers = { '.git', 'project.godot' },
+  },
+  docs = {
+    description = [[
+https://github.com/godotengine/godot
+
+Language server for GDScript, used by Godot Engine.
+]],
+  },
+}

lsp/ltex_ls_plus.lua

@@ -6,6 +6,7 @@ local language_id_mapping = {
   rst = 'restructuredtext',
   tex = 'latex',
   text = 'plaintext',
+  norg = 'neorg',
 }
 
 local function get_language_id(_, filetype)
@@ -30,6 +31,18 @@ return {
   single_file_support = true,
   settings = {
     ltex = {
+      enabled = {
+        'markdown',
+        'pandoc',
+        'latex',
+        'text',
+        'norg',
+        'gitcommit',
+        'jj',
+        'jjdescription',
+        'rst',
+        'typst'
+      },
       language = "auto",
       diagnosticSeverity = "information",
       checkFrequency = "save",
@@ -42,9 +55,8 @@ return {
         en = { "EN_CONSISTENT_APOS" },
       },
       disabledRules = {
-        fr = { "APOS_TYP", "FRENCH_WHITESPACE", "CHANGE", "ISSUE" },
-        en = { "DASH_RULE", "TWO_HYPHENS", "CHANGE", "ISSUE", "CHECK",
-          "ACTUALLY", "CONSISTENT" },
+        fr = { "APOS_TYP", "FRENCH_WHITESPACE", "CHANGE", "ISSUE", },
+        en = { "DASH_RULE", "TWO_HYPHENS", "CHANGE", "ISSUE", "CHECK", "ACTUALLY", "CONSISTENT", "EN_CONSISTENT_APOS", },
       },
       dictionary = {
         fr = { "CryptPad", "Chouhartem",

lsp/rust-analyzer.lua

@@ -0,0 +1,21 @@
+return {
+  cmd = { 'rust-analyzer' },
+  filetypes = { 'rust' },
+  root_markers = { '.git', 'Cargo.toml' },
+  settings = {
+    imports = {
+      granularity = {
+        group = "module",
+      },
+      prefix = "self",
+    },
+    cargo = {
+      buildScripts = {
+        enable = true,
+      },
+    },
+    procMacro = {
+      enable = true
+    },
+  }
+}

lua/complete.lua

@@ -69,7 +69,6 @@ cmp.setup {
     { name = 'lazydev',
       group_index = 0 },
     { name = 'nvim_lsp' },
-    { name = 'nvim_lsp' },
     { name = 'luasnip' },
     { name = 'path' },
   },

lua/lsp.lua

@@ -20,7 +20,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 
     nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
     nmap('<leader>c', vim.lsp.buf.code_action, '[C]ode action') -- NOTE: to see if ca is needed
-    nmap('<leader>f', function()                              -- https://stackoverflow.com/a/74303272
+    nmap('<leader>f', function()                                -- https://stackoverflow.com/a/74303272
       vim.lsp.buf.code_action({
         filter = function(a)
           return a.isPreferred
@@ -35,6 +35,10 @@ vim.api.nvim_create_autocmd("LspAttach", {
     nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
     nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
     nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+    nmap('<leader>dd', function()
+      local new_config = not vim.diagnostic.config().virtual_lines
+      vim.diagnostic.config({ virtual_lines = new_config })
+    end, '[D]iagnostic toggle virtual lines')
     nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 
     -- See `:help K` for why this keymap
@@ -60,7 +64,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 require('which-key').add {
   -- { "<leader>c",  group = "[C]ode" },
   -- { "<leader>c_", hidden = true },
-  { "<leader>d",  group = "[D]ocument" },
+  { "<leader>d",  group = "[D]ocument / [D]iagnostic" },
   { "<leader>d_", hidden = true },
   { "<leader>g",  group = "[G]it" },
   { "<leader>g_", hidden = true },
@@ -105,6 +109,7 @@ local servers = {
   eslint = {},
   -- html = { filetypes = { 'html', 'twig', 'hbs'} },
   texlab = {},
+  tinymist = {},
   lua_ls = {
     Lua = {
       workspace = { checkThirdParty = false },
@@ -124,50 +129,11 @@ local mason_lspconfig = require 'mason-lspconfig'
 
 mason_lspconfig.setup {
   ensure_installed = vim.tbl_keys(servers),
-}
-
-mason_lspconfig.setup_handlers {
-  function(server_name)
-    require('lspconfig')[server_name].setup {
-      capabilities = capabilities,
-      settings = servers[server_name],
-      filetypes = (servers[server_name] or {}).filetypes,
-    }
-  end,
+  automatic_installation = true,
+  automatic_enable = true,
 }
 
 -- [[ System LSPs ]]
-local lspconfig = require('lspconfig')
-servers = {
-  rust_analyzer = {
-    ["rust-analyzer"] = {
-      imports = {
-        granularity = {
-          group = "module",
-        },
-        prefix = "self",
-      },
-      cargo = {
-        buildScripts = {
-          enable = true,
-        },
-      },
-      procMacro = {
-        enable = true
-      },
-    }
-  },
-  gdscript = {},
-}
-
-for server_name, server_settings in pairs(servers) do
-  lspconfig[server_name].setup {
-    capabilities = capabilities,
-    settings = server_settings,
-    filetypes = (servers[server_name] or {}).filetypes,
-  }
-end
-
 local setup_godot_dap = function()
   local dap = require("dap")
 
@@ -189,7 +155,7 @@ local setup_godot_dap = function()
   }
 end
 
-vim.diagnostic.config({ virtual_text = true })
-vim.lsp.enable({ "ltex_plus" })
-
 setup_godot_dap()
+
+vim.diagnostic.config({ virtual_lines = true })
+vim.lsp.enable({ "ltex_ls_plus", "rust-analyzer", "gdscript" })

lua/mappings.lua

@@ -21,8 +21,6 @@ keymap('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 keymap('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
 -- Diagnostic keymaps
-keymap('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-keymap('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
 keymap('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
 keymap('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 
@@ -36,8 +34,8 @@ for i = 0, 9 do
   keymap('n', 'z' .. i, ':set fdl=' .. i .. '<CR>', { noremap = true, silent = false })
 end
 -- tab for folds management
-keymap('n', '<Tab>', 'za', {noremap= true, silent = true, desc = 'Toggle open folds'})
-keymap('n', '<S-Tab>', 'zA', {noremap= true, silent = true, desc = 'Toggle open all folds'})
+keymap('n', '<Tab>', 'za', { noremap = true, silent = true, desc = 'Toggle open folds' })
+keymap('n', '<S-Tab>', 'zA', { noremap = true, silent = true, desc = 'Toggle open all folds' })
 
 -- in :terminal esc exits edit mode
 keymap('t', '<Esc>', '<C-\\><C-n>', { noremap = true, silent = true })
@@ -68,6 +66,9 @@ keymap({ 'n', 'v' }, '<C-l>', ':set hlsearch!<CR>', { silent = true, noremap = t
 -- Undotree
 keymap('n', 'U', vim.cmd.UndotreeToggle, { desc = "[U]ndotree toggle", silent = true, noremap = true })
 
+-- [[ Paste ]]
+keymap('i', '<C-S-v>', '<C-r>+', { noremap = true, silent = true, desc = 'Paste from "+' })
+
 -- [[ Some standard behaviour changes ]]
 -- Y is mapped to y$, remap to yg_
 keymap('n', 'Y', 'yg_', { noremap = true, silent = true, desc = '[Y]ank the line' })

lua/neorg-configure.lua

@@ -33,6 +33,8 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
       { noremap = true, silent = true, desc = "[T]ask on [R]ecurring" })
     vim.keymap.set("n", "<LocalLeader>ti", "<Plug>(neorg.qol.todo-items.todo.task-important)",
       { noremap = true, silent = true, desc = "[T]ask on [I]mportant" })
+    vim.keymap.set("n", "gO", ":Neorg toc<CR>",
+      { noremap = true, silent = true, desc = "[O]pen toc" })
   end,
 })
 

lua/plugins-configure.lua

@@ -161,25 +161,8 @@ require('lazy').setup({
     end,
   },
 
-  {
-    -- Set lualine as statusline
-    'nvim-lualine/lualine.nvim',
-    -- See `:help lualine.txt`
-    opts = {
-      options = {
-        icons_enabled = true,
-        theme = 'rose-pine',
-        component_separators = '|',
-        section_separators = '',
-      },
-      symbols = {
-        error = " ",
-        warn = " ",
-        info = " ",
-        hint = " ",
-      }
-    },
-  },
+  -- Set lualine as statusline
+  'nvim-lualine/lualine.nvim',
 
   {
     -- Add indentation guides even on blank lines
@@ -281,7 +264,7 @@ require('lazy').setup({
   {
     "nvim-neorg/neorg",
     dependencies = { "luarocks.nvim", { "nvim-lua/plenary.nvim" }, { "nvim-neorg/neorg-telescope" } },
-    lazy = false,  -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
+    lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
     -- version = "*", -- Pin Neorg to the latest stable release
     config = function()
       require("neorg").setup {

lua/statusline.lua

@@ -0,0 +1,48 @@
+-- Character, word and line counts
+-- https://www.reddit.com/r/neovim/comments/1130kh5/comment/j8navg6/
+local function counters()
+  local isVisualMode = vim.fn.mode():find("[Vv]")
+  if not isVisualMode then return "" end
+  local starts = vim.fn.line("v")
+  local ends = vim.fn.line(".")
+  local lines = starts <= ends and ends - starts + 1 or starts - ends + 1
+  local wordcount = vim.fn.wordcount()
+  return tostring(wordcount.visual_words) ..
+      "W " .. tostring(wordcount.visual_chars) .. "C " .. tostring(lines) .. "L"
+end
+
+-- See `:help lualine.txt`
+require('lualine').setup({
+  options = {
+    icons_enabled = true,
+    theme = 'rose-pine',
+    component_separators = '|',
+    section_separators = '',
+  },
+  sections = {
+    lualine_c = {
+      {
+        'filename',
+        path = 1,
+      }
+    },
+    lualine_y = {
+      { counters },
+      'progress'
+    }
+  },
+  inactive_sections = {
+    lualine_c = {
+      {
+        'filename',
+        path = 1,
+      }
+    },
+  },
+  symbols = {
+    error = " ",
+    warn = " ",
+    info = " ",
+    hint = " ",
+  }
+})