13 files changed, 292 insertions, 113 deletions

diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 2e8fade..097d413 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -3,14 +3,22 @@ return {
         "hrsh7th/nvim-cmp",
         dependencies = {
             "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-nvim-lsp-signature-help",
             "hrsh7th/cmp-nvim-lua",
             "hrsh7th/cmp-buffer",
             "hrsh7th/cmp-path",
             "hrsh7th/cmp-omni",
-            "hrsh7th/cmp-nvim-lsp-signature-help",
+            "micangl/cmp-vimtex",
             "L3MON4D3/LuaSnip",
             "saadparwaiz1/cmp_luasnip",
         },
+        opts = function(_, opts)
+            opts.sources = opts.sources or {}
+            table.insert(opts.sources, {
+                name = "lazydev",
+                group_index = 0, -- set group index to 0 to skip loading LuaLS completions
+            })
+        end,
         config = function()
             local cmp = require("cmp")
             local luasnip = require("luasnip")
@@ -45,15 +53,13 @@ return {
                 TypeParameter = "",
             }
 
-            ---@diagnostic disable-next-line: missing-fields
             cmp.setup({
                 enabled = function()
                     -- disable autocompletion in telescope prompt
-                    local buftype = vim.api.nvim_buf_get_option(0, "buftype")
+                    local buftype = vim.api.nvim_get_option_value("buftype", {})
 
                     return buftype ~= "prompt"
                 end,
-                ---@diagnostic disable-next-line: missing-fields
                 completion = {
                     completeopt = "menu,menuone,noselect",
                 },
@@ -67,32 +73,25 @@ return {
                     end,
                 },
                 mapping = cmp.mapping.preset.insert({
-                    ["<C-f>"] = cmp.mapping.scroll_docs(-4),
-                    ["<C-d>"] = cmp.mapping.scroll_docs(4),
-                    ["<CR>"] = cmp.mapping.confirm({
+                    ["<C-l>"] = cmp.mapping.confirm({
                         behavior = cmp.ConfirmBehavior.Replace,
-                        select = false,
+                        select = true,
                     }),
                     ["<Tab>"] = cmp.mapping(function(fallback)
-                        if cmp.visible() then
-                            cmp.select_next_item()
-                        elseif luasnip.expand_or_jumpable() then
-                            luasnip.expand_or_jump()
+                        if luasnip.locally_jumpable(1) then
+                            luasnip.jump(1)
                         else
                             fallback()
                         end
                     end, { "i", "s" }),
                     ["<S-Tab>"] = cmp.mapping(function(fallback)
-                        if cmp.visible() then
-                            cmp.select_prev_item()
-                        elseif luasnip.jumpable(-1) then
+                        if luasnip.locally_jumpable(-1) then
                             luasnip.jump(-1)
                         else
                             fallback()
                         end
                     end, { "i", "s" }),
                 }),
-                ---@diagnostic disable-next-line: missing-fields
                 formatting = {
                     fields = { "kind", "abbr", "menu" },
                     format = function(entry, vim_item)
@@ -106,15 +105,18 @@ return {
                             buffer = "[󰮳 ]",
                             path = "[ ]",
                         })[entry.source.name]
-                        return vim_item
+                        -- return vim_item
+                        return require("nvim-highlight-colors").format(entry, vim_item)
                     end,
                 },
                 sources = {
                     { name = "nvim_lsp" },
-                    { name = "nvim_lsp_signature_help" },
-                    { name = "luasnip" },
+                    { name = "nvim_lua" },
                     { name = "buffer" },
                     { name = "path" },
+                    { name = "vimtex" },
+                    { name = "nvim_lsp_signature_help" },
+                    { name = "luasnip" },
                 },
             })
 
@@ -126,7 +128,6 @@ return {
             )
 
             -- use omnifunc in vimwiki to complete paths and tags
-            ---@diagnostic disable-next-line: missing-fields
             cmp.setup.filetype('vimwiki', {
                 sources = cmp.config.sources({
                     { name = "omni" },
@@ -142,7 +143,7 @@ return {
     },
     {
         'mireq/luasnip-snippets',
-        dependencies = {'L3MON4D3/LuaSnip'},
+        dependencies = { 'L3MON4D3/LuaSnip' },
         init = function()
             require('luasnip_snippets.common.snip_utils').setup()
         end
@@ -166,15 +167,10 @@ return {
                 -- Required to automatically include base snippets, like "c" snippets for "cpp"
                 load_ft_func = require('luasnip_snippets.common.snip_utils').load_ft_func,
                 ft_func = require('luasnip_snippets.common.snip_utils').ft_func,
-                -- To enable auto expansin
+                -- To enable auto expansion
                 enable_autosnippets = true,
-                -- Uncomment to enable visual snippets triggered using <c-x>
-                -- store_selection_keys = '<c-x>',
             })
-            -- LuaSnip key bindings
-            vim.keymap.set({"i", "s"}, "<C-l>", function() if ls.expand_or_jumpable() then ls.expand_or_jump() else vim.api.nvim_input('<C-l>') end end, {silent = true})
-            vim.keymap.set({"i", "s"}, "<C-k>", function() ls.jump(-1) end, {silent = true})
-            vim.keymap.set({"i", "s"}, "<C-E>", function() if ls.choice_active() then ls.change_choice(1) end end, {silent = true})
+            require("luasnip.loaders.from_lua").lazy_load({ paths = "./lua/luasnippets" })
         end
 
     },
diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..9f15bbb
--- /dev/null
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -0,0 +1,18 @@
+return {
+    {
+        'stevearc/conform.nvim',
+        opts = {
+            formatters_by_ft = {
+                lua = { "stylua" },
+                -- Conform will run multiple formatters sequentially
+                python = { "isort", "black" },
+                -- 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" },
+            },
+        }
+    },
+}
diff --git a/.config/nvim/lua/plugins/cutlass.lua b/.config/nvim/lua/plugins/cutlass.lua
index b9332a9..c3cabe4 100644
--- a/.config/nvim/lua/plugins/cutlass.lua
+++ b/.config/nvim/lua/plugins/cutlass.lua
@@ -32,19 +32,39 @@ return {
     {
         "gbprod/yanky.nvim",
         config = function()
-            -- fix Target STRING not available
-            vim.g.clipboard = {
-                name = 'xsel_override',
-                copy = {
-                    ['+'] = 'xsel --input --clipboard',
-                    ['*'] = 'xsel --input --primary',
-                },
-                paste = {
-                    ['+'] = 'xsel --output --clipboard',
-                    ['*'] = 'xsel --output --primary',
-                },
-                cache_enabled = 1,
-            }
+            if os.getenv("WAYLAND_DISPLAY") then
+                vim.g.clipboard = {
+                    name = "wl-clipboard",
+                    copy = {
+                        ["+"] = 'wl-copy --foreground --type text/plain',
+                        ["*"] = 'wl-copy --foreground --primary --type text/plain',
+                    },
+                    paste = {
+                        ["+"] = (function()
+                            return vim.fn.systemlist('wl-paste --no-newline', { '' }, 1) -- '1' keeps empty lines
+                        end),
+                        ["*"] = (function()
+                            return vim.fn.systemlist('wl-paste --primary --no-newline', { '' }, 1)
+                        end),
+                    },
+                    cache_enabled = true
+                }
+            else
+                -- fix Target STRING not available
+                -- if we are using xsel (X11)
+                vim.g.clipboard = {
+                    name = 'xsel_override',
+                    copy = {
+                        ['+'] = 'xsel --input --clipboard',
+                        ['*'] = 'xsel --input --primary',
+                    },
+                    paste = {
+                        ['+'] = 'xsel --output --clipboard',
+                        ['*'] = 'xsel --output --primary',
+                    },
+                    cache_enabled = 1,
+                }
+            end
 
             local map = require("helpers.keys").map
 
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
index 0e4d7f5..5f1c1e3 100644
--- a/.config/nvim/lua/plugins/git.lua
+++ b/.config/nvim/lua/plugins/git.lua
@@ -1,15 +1,27 @@
 return {
     {
+        "purarue/gitsigns-yadm.nvim",
+        lazy = true,
+    },
+    {
         "lewis6991/gitsigns.nvim",
+        event = { "BufReadPost", "VeryLazy" },
         opts = {
             signs                        = {
                 add          = { text = '│' },
-                change       = { text = '│' },
+                change       = { text = '~' },
                 delete       = { text = '_' },
                 topdelete    = { text = '‾' },
                 changedelete = { text = '~' },
                 untracked    = { text = '┆' },
             },
+            _on_attach_pre               = function(_, callback)
+                if vim.fn.executable("yadm") == 1 then
+                    require("gitsigns-yadm").yadm_signs(callback)
+                else
+                    callback()
+                end
+            end,
             signcolumn                   = true,  -- Toggle with `:Gitsigns toggle_signs`
             numhl                        = false, -- Toggle with `:Gitsigns toggle_numhl`
             linehl                       = false, -- Toggle with `:Gitsigns toggle_linehl`
@@ -38,10 +50,6 @@ return {
                 row = 0,
                 col = 1
             },
-            yadm                         = {
-                enable = true
-            },
-
             on_attach                    = function(bufnr)
                 local gs = package.loaded.gitsigns
 
@@ -89,7 +97,13 @@ return {
         },
     },
     {
-        "tpope/vim-fugitive",
-        cmd = { 'Git', 'Gstatus', 'Gblame', 'Gpush', 'Gpull' },
-    },
+        "NeogitOrg/neogit",
+        dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+            "nvim-telescope/telescope.nvim", -- optional
+        },
+        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 029a0f1..e710fd7 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -1,9 +1,10 @@
 return {
     {
         "neovim/nvim-lspconfig",
+        event = { "BufReadPost", "BufNewFile" },
+        cmd = { "LspInfo", "LspInstall", "LspUninstall" },
         dependencies = {
             "j-hui/fidget.nvim",
-            "folke/neodev.nvim",
             "RRethy/vim-illuminate",
             "hrsh7th/cmp-nvim-lsp",
         },
@@ -14,9 +15,6 @@ return {
             map('n', '[d', vim.diagnostic.goto_prev, "lsp: goto previous diagnostic")
             map('n', ']d', vim.diagnostic.goto_next, "lsp: goto next diagnostic")
 
-            -- neodev setup before lsp config
-            require("neodev").setup()
-
             -- set up cool signs for diagnostics
             local signs = { Error = " ", Warn = "", Hint = "", Info = "" }
             for type, icon in pairs(signs) do
@@ -72,6 +70,29 @@ return {
             local capabilities = vim.lsp.protocol.make_client_capabilities()
             capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
 
+            -- misc.
+            local lspconfig = require('lspconfig')
+            local servers = { 'ts_ls', 'jsonls', 'eslint', 'cssls', 'html', 'vala_ls', 'gopls' }
+            for _, lsp in pairs(servers) do
+                lspconfig[lsp].setup {
+                    on_attach = on_attach,
+                    capabilites = capabilities,
+                }
+            end
+
+            -- typst/tinymist
+            require("lspconfig")["tinymist"].setup({
+                on_attach = on_attach,
+                capabilities = capabilities,
+                single_file_support = true,
+                root_dir = function()
+                    return vim.fn.getcwd()
+                end,
+                settings = {
+                    formatterMode = "typstyle",
+                }
+            })
+
             -- lua
             require("lspconfig")["lua_ls"].setup({
                 on_attach = on_attach,
@@ -120,10 +141,52 @@ return {
             -- efm
             require("lspconfig")["efm"].setup({
                 on_attach = on_attach,
-                filetypes = { 'sh' },
-                capabilities = capabilities
+                settings = {
+                    initializationOptions = {
+                        documentFormatting = true,
+                        documentRangeFormatting = true,
+                        hover = true,
+                        documentSymbol = true,
+                        codeAction = true,
+                        completion = true
+                    }
+                },
+                capabilities = capabilities,
+                filetypes = { 'sh', 'tex' },
             })
 
+            require("lspconfig")["harper_ls"].setup {
+                on_attach = on_attach,
+                capabilities = capabilities,
+                settings = {
+                    ["harper-ls"] = {
+                        linters = {
+                            spell_check = true,
+                            spelled_numbers = false,
+                            an_a = true,
+                            sentence_capitalization = true,
+                            unclosed_quotes = true,
+                            wrong_quotes = false,
+                            long_sentences = true,
+                            repeated_words = true,
+                            spaces = true,
+                            matcher = true,
+                            correct_number_suffix = true,
+                            number_suffix_capitalization = true,
+                            multiple_sequential_pronouns = true,
+                            linking_verbs = false,
+                            avoid_curses = true,
+                        }
+                    }
+                },
+                filetypes = {
+                    "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
             require("lspconfig")["ltex"].setup({
                 capabilities = capabilities,
@@ -135,51 +198,38 @@ return {
                         log_level = "none",
                     }
                 end,
+                filetypes = { "bib", "gitcommit", "markdown", "org", "plaintex", "rst", "rnoweb", "tex", "pandoc", "quarto", "rmd", "context", "mail", "text" },
                 settings = {
                     ltex = {
-                        -- my settings here
+                        enabled = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex", "quarto", "rmd", "context", "mail", "plaintext" }
                     }
                 }
             })
 
-            -- rust-tools
-            local rust_opts = {
+            vim.g.rustaceanvim = {
+                -- Plugin configuration
                 tools = {
-                    runnables = {
-                        use_telescope = true,
-                    },
-                    inlay_hints = {
-                        auto = true,
-                        show_parameter_hints = true,
-                        parameter_hints_prefix = "↸ ",
-                        other_hints_prefix = "❱ ",
-                    },
                 },
-
-                -- all the opts to send to nvim-lspconfig
-                -- these override the defaults set by rust-tools.nvim
-                -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer
+                -- LSP configuration
                 server = {
                     on_attach = on_attach,
-                    settings = {
-                        -- to enable rust-analyzer settings visit:
-                        -- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc
-                        ["rust-analyzer"] = {
-                            -- enable clippy on save
-                            checkOnSave = {
-                                command = "clippy",
-                            },
+                    vim.lsp.inlay_hint.enable(true),
+                    default_settings = {
+                        -- rust-analyzer language server configuration
+                        ['rust-analyzer'] = {
                         },
                     },
                 },
+                -- DAP configuration
+                dap = {
+                },
             }
-
-            require('rust-tools').setup(rust_opts)
         end,
     },
     {
-        "barreiroleo/ltex-extra.nvim",
-        event = "LspAttach",
+        "barreiroleo/ltex_extra.nvim",
+        ft = { "markdown", "tex" },
+        dependencies = { "neovim/nvim-lspconfig" },
     },
     {
         "j-hui/fidget.nvim",
@@ -199,7 +249,38 @@ return {
         },
     },
     {
-        "simrat39/rust-tools.nvim",
-        event = "LspAttach",
+        'mrcjkb/rustaceanvim',
+        version = '^5', -- Recommended
+        lazy = false,   -- This plugin is already lazy
+    },
+    {
+        "folke/lazydev.nvim",
+        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/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index c4e936e..ba1099e 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -30,6 +30,7 @@ end
 
 return {
     "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
     dependencies = {
         "nvim-tree/nvim-web-devicons"
     },
diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua
index f99051e..fc28ffa 100644
--- a/.config/nvim/lua/plugins/misc.lua
+++ b/.config/nvim/lua/plugins/misc.lua
@@ -80,4 +80,11 @@ return {
             npairs.add_rule(Rule('%"', '%"', "remind"))
         end
     },
+    {
+        "brenoprata10/nvim-highlight-colors",
+        event = { "BufReadPost", "VeryLazy" },
+        config = function()
+            require('nvim-highlight-colors').setup({})
+        end
+    }
 }
diff --git a/.config/nvim/lua/plugins/nvim-tree.lua b/.config/nvim/lua/plugins/nvim-tree.lua
index a2d4532..667a873 100644
--- a/.config/nvim/lua/plugins/nvim-tree.lua
+++ b/.config/nvim/lua/plugins/nvim-tree.lua
@@ -1,14 +1,15 @@
 return {
     {
         "nvim-tree/nvim-tree.lua",
-        lazy = false,
         dependencies = {
             "nvim-tree/nvim-web-devicons",
         },
         opts = {
-            sort_by = "case_sensitive",
+            sort = {
+                sorter = "case_sensitive"
+            },
             diagnostics = {
-                enable = false,
+                enable = true,
                 icons = {
                     hint = "❔",
                     info = "❕",
@@ -16,9 +17,6 @@ return {
                     error = "❌",
                 }
             },
-            view = {
-                adaptive_size = true,
-            },
             renderer = {
                 group_empty = true,
             },
@@ -34,7 +32,7 @@ return {
 
             map("n", "vt", "<cmd>NvimTreeToggle<cr>")
             map("n", "vr", "<cmd>NvimTreeRefresh<cr>")
-            map("n", "vs", "<cmd>NvimTreeFindFile<cr>")
+            map("n", "vs", "<cmd>NvimTreeFindFile!<cr>")
         end,
     },
 }
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 6acc9a6..bfda4aa 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -11,7 +11,6 @@ return {
             },
             "gbprod/yanky.nvim",
         },
-        lazy = false,
         config = function()
             require('telescope').setup({
                 defaults = {
@@ -47,6 +46,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/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
index b80aed3..c11778c 100644
--- a/.config/nvim/lua/plugins/trouble.lua
+++ b/.config/nvim/lua/plugins/trouble.lua
@@ -1,16 +1,37 @@
 return {
     "folke/trouble.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons" },
+    cmd = "Trouble",
     opts = {},
-    config = function()
-        local map = require("helpers.keys").map
-        map("n", "<leader>xx", function() require("trouble").open() end, "trouble: open")
-        map("n", "<leader>xw", function() require("trouble").open("workspace_diagnostics") end,
-            "trouble: open workspace diagnostics")
-        map("n", "<leader>xd", function() require("trouble").open("document_diagnostics") end,
-            "trouble: open document diagnostics")
-        map("n", "<leader>xq", function() require("trouble").open("quickfix") end, "trouble: open quickfix")
-        map("n", "<leader>xl", function() require("trouble").open("loclist") end, "trouble: open loclist")
-        map("n", "gR", function() require("trouble").open("lsp_references") end, "trouble: open lsp references")
-    end,
+    keys = {
+        {
+            "<leader>xx",
+            "<cmd>Trouble diagnostics toggle<cr>",
+            desc = "Diagnostics (Trouble)",
+        },
+        {
+            "<leader>xX",
+            "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+            desc = "Buffer Diagnostics (Trouble)",
+        },
+        {
+            "<leader>cs",
+            "<cmd>Trouble symbols toggle focus=false<cr>",
+            desc = "Symbols (Trouble)",
+        },
+        {
+            "<leader>cl",
+            "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+            desc = "LSP Definitions / references / ... (Trouble)",
+        },
+        {
+            "<leader>xL",
+            "<cmd>Trouble loclist toggle<cr>",
+            desc = "Location List (Trouble)",
+        },
+        {
+            "<leader>xQ",
+            "<cmd>Trouble qflist toggle<cr>",
+            desc = "Quickfix List (Trouble)",
+        },
+    },
 }
diff --git a/.config/nvim/lua/plugins/typst.lua b/.config/nvim/lua/plugins/typst.lua
new file mode 100644
index 0000000..c04ea70
--- /dev/null
+++ b/.config/nvim/lua/plugins/typst.lua
@@ -0,0 +1,10 @@
+return {
+    {
+        'chomosuke/typst-preview.nvim',
+        ft = 'typst',
+        version = '1.*',
+        config = function()
+            require 'typst-preview'.setup {}
+        end,
+    }
+}
diff --git a/.config/nvim/lua/plugins/vimwiki.lua b/.config/nvim/lua/plugins/vimwiki.lua
index a114b04..75d69cf 100644
--- a/.config/nvim/lua/plugins/vimwiki.lua
+++ b/.config/nvim/lua/plugins/vimwiki.lua
@@ -1,6 +1,6 @@
 return {
     {
-        "yigitsever/vimwiki",
+        "vimwiki/vimwiki",
         init = function()
             vim.g.vimwiki_list = {
                 {
@@ -17,13 +17,12 @@ return {
             }
             vim.g.vimwiki_global_ext = 0
             vim.g.vimwiki_hl_headers = 1
-
-            local map = require("helpers.keys").map
-
-            --toggle checkmarks
-            map('n', '<leader>v', '<Plug>VimwikiToggleListItem', "vimwiki: toggle checkmark")
-            -- add/increase header level
-            map('n', '<leader>a', '<Plug>VimwikiAddHeaderLevel', "vimwiki: add header level")
         end,
+        keys = {
+            { "<leader>ww", "<Plug>VimwikiIndex",          "vimwiki: goto wiki" },
+            { "<leader>v",  "<Plug>VimwikiToggleListItem", "vimwiki: toggle list item" },
+            { "<leader>a",  "<Plug>VimwikiAddHeaderLevel", "vimwiki: add header level" }
+        },
+        ft = { "vimwiki" }
     },
 }