11 files changed, 292 insertions, 218 deletions

diff --git a/.config/nvim/after/ftplugin/c.vim b/.config/nvim/after/ftplugin/c.vim
index 25eeecd..41a9917 100644
--- a/.config/nvim/after/ftplugin/c.vim
+++ b/.config/nvim/after/ftplugin/c.vim
@@ -1,4 +1,4 @@
-setlocal tabstop=8
-setlocal softtabstop=8
-setlocal shiftwidth=8
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
 setlocal noexpandtab
diff --git a/.config/nvim/after/plugin/autocmds.lua b/.config/nvim/after/plugin/autocmds.lua
deleted file mode 100644
index 3751cd4..0000000
--- a/.config/nvim/after/plugin/autocmds.lua
+++ /dev/null
@@ -1,158 +0,0 @@
-local function augroup(name)
-    return vim.api.nvim_create_augroup("lazyvim_" .. name, { clear = true })
-end
-
--- Set typst filetype
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "*.typ",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_set_option_value("filetype", "typst", { buf = buf })
-            vim.api.nvim_set_option_value("shiftwidth", 2, { buf = buf })
-        end
-    }
-)
-
--- Set PKGBUILD filetype
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "PKGBUILD",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_set_option_value("filetype", "PKGBUILD", { buf = buf })
-        end
-    }
-)
-
--- Set vimwiki filetype
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "PKGBUILD",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_set_option_value("filetype", "*.wiki", { buf = buf })
-        end
-    }
-)
-
--- Set buku-edit filetype
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "buku-edit-*",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_set_option_value("filetype", "buku", { buf = buf })
-        end
-    }
-)
-
--- Set mail filetype
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "/tmp/neomutt*",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_set_option_value("autoindent", false, { buf = buf })
-            vim.api.nvim_set_option_value("filetype", "mail", { buf = buf })
-            vim.api.nvim_set_option_value("wrapmargin", 0, { buf = buf })
-            vim.api.nvim_set_option_value("textwidth", 80, { buf = buf })
-        end
-    }
-)
-
--- Resize splits if window got resized
-vim.api.nvim_create_autocmd({ "VimResized" }, {
-    group = augroup("resize_splits"),
-    callback = function()
-        local current_tab = vim.fn.tabpagenr()
-        vim.cmd("tabdo wincmd =")
-        vim.cmd("tabnext " .. current_tab)
-    end,
-})
-
--- go to last loc when opening a buffer
-vim.api.nvim_create_autocmd("BufReadPost", {
-    group = augroup("last_loc"),
-    callback = function(event)
-        local exclude = { "gitcommit" }
-        local buf = event.buf
-        if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].lazyvim_last_loc then
-            return
-        end
-        vim.b[buf].lazyvim_last_loc = true
-        local mark = vim.api.nvim_buf_get_mark(buf, '"')
-        local lcount = vim.api.nvim_buf_line_count(buf)
-        if mark[1] > 0 and mark[1] <= lcount then
-            pcall(vim.api.nvim_win_set_cursor, 0, mark)
-        end
-    end,
-})
-
--- close some filetypes with <q>
-vim.api.nvim_create_autocmd("FileType", {
-    group = augroup("close_with_q"),
-    pattern = {
-        "PlenaryTestPopup",
-        "checkhealth",
-        "dbout",
-        "gitsigns-blame",
-        "grug-far",
-        "help",
-        "lspinfo",
-        "neotest-output",
-        "neotest-output-panel",
-        "neotest-summary",
-        "notify",
-        "qf",
-        "snacks_win",
-        "spectre_panel",
-        "startuptime",
-        "tsplayground",
-    },
-    callback = function(event)
-        vim.bo[event.buf].buflisted = false
-        vim.schedule(function()
-            vim.keymap.set("n", "q", function()
-                vim.cmd("close")
-                pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
-            end, {
-                buffer = event.buf,
-                silent = true,
-                desc = "Quit buffer",
-            })
-        end)
-    end,
-})
-
--- Auto create dir when saving a file, in case some intermediate directory does not exist
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
-    group = augroup("auto_create_dir"),
-    callback = function(event)
-        if event.match:match("^%w%w+:[\\/][\\/]") then
-            return
-        end
-        local file = vim.uv.fs_realpath(event.match) or event.match
-        vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
-    end,
-})
diff --git a/.config/nvim/after/plugin/autocmds.vim b/.config/nvim/after/plugin/autocmds.vim
index ae55046..21c7bc4 100644
--- a/.config/nvim/after/plugin/autocmds.vim
+++ b/.config/nvim/after/plugin/autocmds.vim
@@ -1,2 +1,7 @@
 " I don't know how to port this yet
 autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif
+
+augroup vimwiki
+    autocmd!
+    autocmd BufRead,BufNewFile *.wiki set filetype=vimwiki
+augroup END
diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua
index 1a45b8f..9962f4f 100644
--- a/.config/nvim/lua/core/options.lua
+++ b/.config/nvim/lua/core/options.lua
@@ -63,6 +63,8 @@ local opts = {
     -- switch case labels
     cinoptions = "l1",
 
+    signcolumn = "yes:1",
+
 }
 
 for opt, val in pairs(opts) do
diff --git a/.config/nvim/lua/helpers/autocmds.lua b/.config/nvim/lua/helpers/autocmds.lua
index 11f4480..7461090 100644
--- a/.config/nvim/lua/helpers/autocmds.lua
+++ b/.config/nvim/lua/helpers/autocmds.lua
@@ -29,3 +29,130 @@ vim.api.nvim_create_autocmd("VimResized", {
     },
     command = "wincmd =",
 })
+
+-- https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+-- Set typst filetype
+vim.api.nvim_create_autocmd(
+    {
+        "BufNewFile",
+        "BufRead",
+    },
+    {
+        group = augroup("typst"),
+        pattern = "*.typ",
+        callback = function()
+            local buf = vim.api.nvim_get_current_buf()
+            vim.api.nvim_set_option_value("filetype", "typst", { buf = buf })
+            vim.api.nvim_set_option_value("shiftwidth", 2, { buf = buf })
+        end
+    }
+)
+
+-- Set PKGBUILD filetype
+vim.api.nvim_create_autocmd(
+    {
+        "BufNewFile",
+        "BufRead",
+    },
+    {
+        group = augroup("pkgbuild"),
+        pattern = "PKGBUILD",
+        callback = function()
+            local buf = vim.api.nvim_get_current_buf()
+            vim.api.nvim_set_option_value("filetype", "PKGBUILD", { buf = buf })
+        end
+    }
+)
+
+-- Set buku-edit filetype
+vim.api.nvim_create_autocmd(
+    {
+        "BufNewFile",
+        "BufRead",
+    },
+    {
+        group = augroup("buku-edit"),
+        pattern = "buku-edit-*",
+        callback = function()
+            local buf = vim.api.nvim_get_current_buf()
+            vim.api.nvim_set_option_value("filetype", "buku", { buf = buf })
+        end
+    }
+)
+
+-- Set mail filetype
+vim.api.nvim_create_autocmd(
+    {
+        "BufNewFile",
+        "BufRead",
+    },
+    {
+        group = augroup("mail"),
+        pattern = "/tmp/neomutt*",
+        callback = function()
+            local buf = vim.api.nvim_get_current_buf()
+            vim.api.nvim_set_option_value("autoindent", false, { buf = buf })
+            vim.api.nvim_set_option_value("filetype", "mail", { buf = buf })
+            vim.api.nvim_set_option_value("wrapmargin", 0, { buf = buf })
+            vim.api.nvim_set_option_value("textwidth", 80, { buf = buf })
+        end
+    }
+)
+
+-- Resize splits if window got resized
+vim.api.nvim_create_autocmd({ "VimResized" }, {
+    group = augroup("resize_splits"),
+    callback = function()
+        local current_tab = vim.fn.tabpagenr()
+        vim.cmd("tabdo wincmd =")
+        vim.cmd("tabnext " .. current_tab)
+    end,
+})
+
+-- close some filetypes with <q>
+vim.api.nvim_create_autocmd("FileType", {
+    group = augroup("close_with_q"),
+    pattern = {
+        "PlenaryTestPopup",
+        "checkhealth",
+        "dbout",
+        "gitsigns-blame",
+        "grug-far",
+        "help",
+        "lspinfo",
+        "neotest-output",
+        "neotest-output-panel",
+        "neotest-summary",
+        "notify",
+        "qf",
+        "snacks_win",
+        "spectre_panel",
+        "startuptime",
+        "tsplayground",
+    },
+    callback = function(event)
+        vim.bo[event.buf].buflisted = false
+        vim.schedule(function()
+            vim.keymap.set("n", "q", function()
+                vim.cmd("close")
+                pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
+            end, {
+                buffer = event.buf,
+                silent = true,
+                desc = "Quit buffer",
+            })
+        end)
+    end,
+})
+
+-- Auto create dir when saving a file, in case some intermediate directory does not exist
+vim.api.nvim_create_autocmd({ "BufWritePre" }, {
+    group = augroup("auto_create_dir"),
+    callback = function(event)
+        if event.match:match("^%w%w+:[\\/][\\/]") then
+            return
+        end
+        local file = vim.uv.fs_realpath(event.match) or event.match
+        vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
+    end,
+})
diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..06231dc
--- /dev/null
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -0,0 +1,24 @@
+return {
+    {
+        'stevearc/conform.nvim',
+        opts = {
+            format_on_save = {
+                -- These options will be passed to conform.format()
+                timeout_ms = 500,
+                lsp_format = "fallback",
+            },
+            formatters_by_ft = {
+                lua = { "stylua" },
+                -- Conform will run multiple formatters sequentially
+                -- You can customize some of the format options for the filetype (:help conform.format)
+                rust = { "rustfmt", lsp_format = "fallback" },
+                -- Conform will run the first available formatter
+                javascript = { "prettierd", "prettier", stop_after_first = true },
+                -- latex
+                tex = { "tex-fmt" },
+                -- sql
+                sql = { "sqruff" },
+            },
+        }
+    },
+}
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
index db1f435..5f1c1e3 100644
--- a/.config/nvim/lua/plugins/git.lua
+++ b/.config/nvim/lua/plugins/git.lua
@@ -99,11 +99,11 @@ return {
     {
         "NeogitOrg/neogit",
         dependencies = {
-            "nvim-lua/plenary.nvim", -- required
-            "sindrets/diffview.nvim", -- optional - Diff integration
+            "nvim-lua/plenary.nvim",         -- required
+            "sindrets/diffview.nvim",        -- optional - Diff integration
             "nvim-telescope/telescope.nvim", -- optional
         },
-        cmd="Neogit",
+        cmd = "Neogit",
         config = true
     }
 }
diff --git a/.config/nvim/lua/plugins/lastplace.lua b/.config/nvim/lua/plugins/lastplace.lua
new file mode 100644
index 0000000..72e5c7f
--- /dev/null
+++ b/.config/nvim/lua/plugins/lastplace.lua
@@ -0,0 +1,11 @@
+return {
+    {
+        "ethanholz/nvim-lastplace",
+
+        opts = {
+            lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
+            lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
+            lastplace_open_folds = true,
+        },
+    }
+}
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 2fa92c2..b10aa58 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -12,37 +12,38 @@ return {
             local map = require("helpers.keys").map
 
             map('n', '<leader>e', vim.diagnostic.open_float, "lsp: open diagnostics float")
-            map('n', '[d', vim.diagnostic.goto_prev, "lsp: goto previous diagnostic")
-            map('n', ']d', vim.diagnostic.goto_next, "lsp: goto next diagnostic")
-
-            -- set up cool signs for diagnostics
-            local signs = { Error = " ", Warn = "", Hint = "", Info = "" }
-            for type, icon in pairs(signs) do
-                local hl = "DiagnosticSign" .. type
-                vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-            end
+            map('n', '[d', function() vim.diagnostic.jump({ count = -1, float = true }) end,
+                "lsp: goto previous diagnostic")
+            map('n', ']d', function() vim.diagnostic.jump({ count = 1, float = true }) end, "lsp: goto next diagnostic")
 
-            -- Diagnostic config
-            local config = {
-                virtual_text = false,
+            vim.diagnostic.config({
+                underline = true,
                 signs = {
-                    active = signs,
+                    active = true,
+                    text = {
+                        [vim.diagnostic.severity.ERROR] = "",
+                        [vim.diagnostic.severity.WARN]  = "",
+                        [vim.diagnostic.severity.HINT]  = "󰟃",
+                        [vim.diagnostic.severity.INFO]  = "",
+                    },
                 },
-                update_in_insert = true,
-                underline = true,
-                severity_sort = true,
+                virtual_text = false,
                 float = {
-                    focusable = true,
-                    style = "minimal",
-                    border = "rounded",
-                    source = "always",
                     header = "",
-                    prefix = "",
+                    border = "rounded",
+                    format = function(diagnostic)
+                        return string.format(
+                            "%s (%s) [%s]",
+                            diagnostic.message,
+                            diagnostic.source,
+                            diagnostic.code or diagnostic.user_data.lsp.code
+                        )
+                    end,
                 },
-            }
-            vim.diagnostic.config(config)
 
-            -- this function gets run when an lsp connects to a particular buffer.
+            })
+
+            -- This function gets run when an LSP connects to a particular buffer.
             local on_attach = function(_, bufnr)
                 map = require("helpers.keys").lsp_map
 
@@ -71,17 +72,16 @@ return {
             capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
 
             -- misc.
-            local lspconfig = require('lspconfig')
-            local servers = { 'ts_ls', 'jsonls', 'eslint', 'cssls', 'html', 'vala_ls', 'gopls' }
+            local servers = { 'ts_ls', 'jsonls', 'eslint', 'cssls', 'html', 'vala_ls', 'gopls', 'clangd' }
             for _, lsp in pairs(servers) do
-                lspconfig[lsp].setup {
+                vim.lsp.config(lsp, {
                     on_attach = on_attach,
                     capabilites = capabilities,
-                }
+                })
             end
 
             -- typst/tinymist
-            require("lspconfig")["tinymist"].setup({
+            vim.lsp.config("tinymist", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 single_file_support = true,
@@ -94,7 +94,7 @@ return {
             })
 
             -- lua
-            require("lspconfig")["lua_ls"].setup({
+            vim.lsp.config("lua_ls", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -116,7 +116,7 @@ return {
             })
 
             -- python
-            require("lspconfig")["pylsp"].setup({
+            vim.lsp.config("pylsp", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -139,7 +139,7 @@ return {
             })
 
             -- efm
-            require("lspconfig")["efm"].setup({
+            vim.lsp.config("efm", {
                 on_attach = on_attach,
                 settings = {
                     initializationOptions = {
@@ -155,26 +155,7 @@ return {
                 filetypes = { 'sh', 'tex' },
             })
 
-            vim.g.rustaceanvim = {
-                -- Plugin configuration
-                tools = {
-                },
-                -- LSP configuration
-                server = {
-                    on_attach = on_attach,
-                    vim.lsp.inlay_hint.enable(true),
-                    default_settings = {
-                        -- rust-analyzer language server configuration
-                        ['rust-analyzer'] = {
-                        },
-                    },
-                },
-                -- DAP configuration
-                dap = {
-                },
-            }
-
-            lspconfig.harper_ls.setup {
+            vim.lsp.config("harper_ls", {
                 on_attach = on_attach,
                 capabilities = capabilities,
                 settings = {
@@ -199,12 +180,58 @@ return {
                     }
                 },
                 filetypes = {
-                    "markdown", "rust", "typescript", "typescriptreact", "javascript", "python", "c", "cpp", "ruby", "swift", "csharp", "toml", "lua", "gitcommit", "java", "html", "vimwiki"
+                    "markdown", "rust", "typescript", "typescriptreact", "javascript", "python", "c", "cpp", "ruby", "swift", "csharp", "toml", "lua", "gitcommit", "java", "html", "vimwiki", "tex"
+                },
+                root_dir = function(fname)
+                    return vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1])
+                end,
+            })
+
+            -- ltex
+            vim.lsp.config("ltex", {
+                capabilities = capabilities,
+                on_attach = function(client, bufnr)
+                    on_attach(client, bufnr)
+                    require("ltex_extra").setup {
+                        load_langs = { "en-GB" },
+                        init_check = true,
+                        log_level = "warn",
+                    }
+                end,
+                filetypes = { "bib", "gitcommit", "markdown", "org", "plaintex", "rst", "rnoweb", "tex", "pandoc", "quarto", "rmd", "context", "mail", "text" },
+                settings = {
+                    ltex = {
+                        enabled = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex", "quarto", "rmd", "context", "mail", "plaintext" }
+                    }
                 }
+            })
+
+            vim.g.rustaceanvim = {
+                -- Plugin configuration
+                tools = {
+                },
+                -- LSP configuration
+                server = {
+                    on_attach = on_attach,
+                    vim.lsp.inlay_hint.enable(true),
+                    default_settings = {
+                        -- rust-analyzer language server configuration
+                        ['rust-analyzer'] = {
+                        },
+                    },
+                },
+                -- DAP configuration
+                dap = {
+                },
             }
         end,
     },
     {
+        "barreiroleo/ltex_extra.nvim",
+        ft = { "markdown", "tex" },
+        dependencies = { "neovim/nvim-lspconfig" },
+    },
+    {
         "j-hui/fidget.nvim",
         event = "VeryLazy",
         opts = {
@@ -228,9 +255,32 @@ return {
     },
     {
         "folke/lazydev.nvim",
-        ft = "lua", -- only load on lua files
+        ft = "lua",
     },
     {
         'fatih/vim-go'
+    },
+    {
+        "danymat/neogen",
+        config = true,
+        opts = {
+            snippet_engine = "luasnip",
+            languages = {
+                python = {
+                    template = {
+                        annotation_convention = "reST",
+                    }
+                }
+            }
+        }
+    },
+    {
+        'marcelofern/vale.nvim',
+        config = function()
+            require("vale").setup({
+                bin = "/usr/bin/vale",
+                vale_config_path = "$HOME/.config/vale/.vale.ini",
+            })
+        end,
     }
 }
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 40c99a4..24f820d 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -12,10 +12,16 @@ return {
             "gbprod/yanky.nvim",
         },
         config = function()
+            local open_with_trouble = require("trouble.sources.telescope").open
+
             require('telescope').setup({
                 defaults = {
                     path_display = { "truncate" },
                     prompt_prefix = " ",
+                    mappings = {
+                        i = { ["<leader>xt"] = open_with_trouble },
+                        n = { ["<leader>xt"] = open_with_trouble },
+                    },
                 },
                 extensions = {
                     fzf = {
@@ -46,6 +52,10 @@ return {
             map("n", "<leader>sw", require("telescope.builtin").grep_string, "🔭: current word")
             map("n", "<leader>sg", require("telescope.builtin").live_grep, "🔭: live grep")
             map("n", "<leader>sd", require("telescope.builtin").diagnostics, "🔭: diagnostics")
+            map("n", "<leader>sc", function()
+                require("telescope.builtin").lsp_document_symbols({ symbols = 'function' })
+            end, "🔭: lsp symbols (functions)")
+
             map("n", "<leader>st", function()
                 require("telescope.builtin").spell_suggest(require("telescope.themes").get_cursor({
                     prompt_title = "",
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index 8374b5b..da95938 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -129,3 +129,6 @@ Wayback
 FarSight
 Zetalytics
 VirusTotal
+eSLD
+NXDOMAIN
+CrUX