init.lua @ a5d1f93

M after/ftplugin/go.lua

@@ -1,8 +1,5 @@
 local map = require("core.utils").map
 
--- setup debugger
-require("gopher.dap").setup()
-
 -- options
 vim.opt_local.expandtab = false
 vim.opt_local.tabstop = 4

M after/ftplugin/lua.lua

@@ -5,7 +5,6 @@ vim.opt_local.shiftwidth = 2
 vim.opt_local.softtabstop = 2
 
 -- some maps
-map("n", "<leader>;t", "<cmd>PlenaryBustedFile %<cr>")
 map("n", "<leader>;s", function()
   vim.cmd.source "%"
 end)

M lazy-lock.json

@@ -2,28 +2,22 @@ {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-conjure": { "branch": "master", "commit": "d97816d5007be2b060f3a4e09f5b144d97d96fe8" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "codeium.vim": { "branch": "main", "commit": "436a7aa6f15502b20d06c420ba6cd944cc65ea8a" },
-  "conjure": { "branch": "develop", "commit": "0d9b823db06cc11e6115b54297f690dff10c0299" },
-  "debugprint.nvim": { "branch": "main", "commit": "681151b2f944ffea64efbbf29a518bd20b5d5a8e" },
-  "fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" },
+  "codeium.vim": { "branch": "main", "commit": "61bae002b0c93b9375b1a8f8f54641d479b5cf7d" },
+  "fidget.nvim": { "branch": "main", "commit": "89b633f3bd0b7187f070236b348697de176860e2" },
   "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" },
-  "git-conflict.nvim": { "branch": "main", "commit": "562e8fdf5a4a2c73c55640bcf660be33db669d2a" },
   "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
-  "helpful.vim": { "branch": "master", "commit": "3eb36ffdc615f0ee09cfb78b7bd2a05a6a0773f4" },
+  "helpful.vim": { "branch": "master", "commit": "8faea4ae7eff4895f077e2230699df835f6b93f1" },
   "hover.nvim": { "branch": "main", "commit": "c366d1b0f9d6612d25681d3fea0f9ea46fa54f4d" },
   "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" },
   "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" },
   "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
-  "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
-  "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
-  "neodev.nvim": { "branch": "main", "commit": "eb8d781cb261285eb556a15342158c2e5a4c801c" },
+  "neodev.nvim": { "branch": "main", "commit": "02d5988929635fe913daa60f19b909e6a7b23c58" },
   "neogit": { "branch": "master", "commit": "a5fb1b47975c43c1400e338f57badd94a6e09450" },
   "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" },
   "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" },
@@ -31,30 +25,23 @@ "neotest-plenary": { "branch": "master", "commit": "e0d9b1530307a03abcc52fc0ae28f054dea3f752" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
   "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
-  "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" },
-  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "67f151e84daddc86cc65f5d935e592f76b9f4496" },
-  "nvim-treesitter": { "branch": "master", "commit": "a185f8ebae9006b181e83f6569df68e7ff8aeb80" },
+  "nvim-lspconfig": { "branch": "master", "commit": "27c59475ae610cc8ccbb81d9d7859e5ffbd4ec8a" },
+  "nvim-treesitter": { "branch": "master", "commit": "2ee71c1a2fa74c10692be10ae420ff0c3a02eb3c" },
   "nvim-treesitter-context": { "branch": "master", "commit": "14856c9ee6eb0ede0ae9b43782c9be5e7bd946e6" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
-  "oil.nvim": { "branch": "master", "commit": "ff62fc28cd7976e49ddff6897a4f870785187f13" },
-  "parinfer-rust": { "branch": "master", "commit": "3c769707ad3b18d530f696fe42a9d495139149ab" },
-  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
+  "oil.nvim": { "branch": "master", "commit": "9509ae0feed5af04e4652375740a0722f2ee1a64" },
   "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
   "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "schemastore.nvim": { "branch": "main", "commit": "e71b32faec68f04a0f0a27fe8c15c96503039b1f" },
+  "schemastore.nvim": { "branch": "main", "commit": "b56b6ac795d988fa3522b279674990120e76b231" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
   "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" },
   "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
   "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" },
-  "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
   "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
   "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
 }

M lua/core/autocmd.lua

@@ -8,7 +8,7 @@ end,
 })
 
 cmd("FileType", {
-  pattern = "javascript,typescript,json,html,htmldjango,gotmpl,css,astro",
+  pattern = "javascript,typescript,json,html,htmldjango,css",
   callback = function()
     vim.bo.tabstop = 2
     vim.bo.shiftwidth = 2

M lua/core/keymaps.lua

@@ -5,12 +5,14 @@ -- general
 map("n", "<C-s>", "<cmd>write!<cr>")
 map("i", "jk", "<esc>")
 map("n", "<leader>h", "<cmd>nohlsearch<cr>")
-map("n", "<leader>n", "<cmd>e /tmp/note.md<cr>")
+
+-- quickfix
+map("n", "<leader>n", "<cmd>cnext<cr>")
+map("n", "<leader>p", "<cmd>cprev<cr>")
 
 --- buffers
 map("n", "<S-h>", "<cmd>bp!<cr>")
 map("n", "<S-l>", "<cmd>bn!<cr>")
-map("n", "<leader>c", "<cmd>bdelete!<cr>")
 map("n", "<leader>q", "<cmd>quit!<cr>")
 map("n", "<leader>w", "<cmd>write!<cr>")
 
@@ -42,4 +44,3 @@ map("v", ">", ">gv")
 
 -- plugins
 map("n", "<leader>L", vim.cmd.Lazy)
-map("n", "<leader>u", vim.cmd.UndotreeToggle)

M lua/core/options.lua

@@ -1,4 +1,3 @@
-vim.g.undotree_DiffAutoOpen = 0
 vim.g.editorconfig = true
 
 -- leader

D

@@ -1,21 +0,0 @@
-return {
-  "nvim-lua/plenary.nvim",
-  "kyazdani42/nvim-web-devicons",
-  { "olexsmir/gopher.nvim", ft = "go", dev = true },
-  { "tpope/vim-surround", keys = { "c", "d", "y" } },
-  { "tpope/vim-repeat", event = "VeryLazy" },
-  { "tpope/vim-sleuth", event = "VeryLazy" },
-  { "tweekmonster/helpful.vim", cmd = "HelpfulVersion" },
-  {
-    "folke/tokyonight.nvim",
-    lazy = false,
-    config = function()
-      vim.cmd.colorscheme "tokyonight-night"
-    end,
-  },
-  {
-    "folke/todo-comments.nvim",
-    event = "BufRead",
-    config = true,
-  },
-}

D

@@ -1,48 +0,0 @@
-local map = require("core.utils").smap
-return {
-  {
-    "ahmedkhalf/project.nvim",
-    event = "VeryLazy",
-    config = function()
-      require("project_nvim").setup {
-        show_hidden = true,
-        patterns = {
-          "^\\.git$",
-          "Makefile",
-          "Justfile",
-          [[Taskfile\.ya?ml]],
-          [[docker-compose\.ya?ml]],
-          "*.Dockerfile.*",
-          "package.json",
-          "go.mod",
-          "go.work",
-          "pyproject.toml",
-          "Cargo.toml",
-          "deps.edn",
-        },
-      }
-    end,
-  },
-  {
-    "numToStr/Comment.nvim",
-    event = "BufRead",
-    keys = "gc",
-    config = true,
-  },
-  {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    opts = {
-      check_ts = true,
-      disable_filetype = { "TelescopePrompt", "markdown" },
-    },
-  },
-  {
-    "folke/persistence.nvim",
-    event = "BufReadPre",
-    config = {},
-    keys = {
-      { "<leader>pp", map("persistence", "load") },
-    },
-  },
-}

M lua/plugins/completion.lua

@@ -3,24 +3,11 @@ {
     "Exafunction/codeium.vim",
     cmd = "Codeium",
     event = "InsertEnter",
+    -- stylua: ignore
     keys = {
       { "<C-;>", vim.fn["codeium#Accept"], mode = "i", expr = true },
-      {
-        "<C-,>",
-        function()
-          return vim.fn["codeium#CycleCompletions"](1)
-        end,
-        mode = "i",
-        expr = true,
-      },
-      {
-        "<C-.>",
-        function()
-          return vim.fn["codeium#CycleCompletions"](-1)
-        end,
-        mode = "i",
-        expr = true,
-      },
+      { "<C-,>", function() return vim.fn["codeium#CycleCompletions"](1) end, mode = "i", expr = true },
+      { "<C-.>", function() return vim.fn["codeium#CycleCompletions"](-1) end, mode = "i", expr = true },
     },
     init = function()
       vim.g.codeium_disable_bindings = 1
@@ -126,7 +113,6 @@ end,
         },
         sources = cmp.config.sources {
           { name = "nvim_lsp", max_item_count = 8 },
-          { name = "conjure", max_item_count = 4 },
           { name = "buffer", max_item_count = 4 },
           { name = "luasnip", max_item_count = 3 },
           { name = "path", max_item_count = 2 },

D

@@ -1,23 +0,0 @@
-return {
-  {
-    "eraserhd/parinfer-rust",
-    ft = { "clojure", "fennel", "scheme", "lisp" },
-    build = "cargo build --release",
-  },
-  {
-    "Olical/conjure",
-    ft = { "lua", "clojure", "fennel", "scheme", "lisp" },
-    branch = "develop",
-    dependencies = { "PaterJason/cmp-conjure" },
-    init = function()
-      vim.g["conjure#mapping#doc_word"] = false
-      vim.g["conjure#client#clojure#nrepl#eval#auto_require"] = false
-      vim.g["conjure#client#clojure#nrepl#connection#auto_repl#enabled"] = true
-      vim.g["conjure#extract#tree_sitter#enabled"] = true
-    end,
-    config = function()
-      require("conjure.main").main()
-      require("conjure.mapping")["on-filetype"]()
-    end,
-  },
-}

A lua/plugins/core.lua

@@ -0,0 +1,61 @@
+local map = require("core.utils").smap
+return {
+  "nvim-lua/plenary.nvim",
+  "kyazdani42/nvim-web-devicons",
+  { "olexsmir/gopher.nvim", ft = "go", dev = true },
+  { "tpope/vim-surround", keys = { "c", "d", "y" } },
+  { "tpope/vim-repeat", event = "VeryLazy" },
+  { "tweekmonster/helpful.vim", cmd = "HelpfulVersion" },
+  {
+    "folke/tokyonight.nvim",
+    lazy = false,
+    config = function()
+      vim.cmd.colorscheme "tokyonight-night"
+    end,
+  },
+  {
+    "folke/todo-comments.nvim",
+    event = "BufRead",
+    config = true,
+  },
+  {
+    "windwp/nvim-autopairs",
+    event = "InsertEnter",
+    opts = {
+      check_ts = true,
+      disable_filetype = { "TelescopePrompt", "markdown" },
+    },
+  },
+  {
+    "numToStr/Comment.nvim",
+    config = true,
+    keys = "gc",
+  },
+  {
+    "ahmedkhalf/project.nvim",
+    event = "VeryLazy",
+    config = function()
+      require("project_nvim").setup {
+        show_hidden = true,
+        patterns = {
+          "^\\.git$",
+          "Makefile",
+          "Justfile",
+          [[Taskfile\.ya?ml]],
+          [[docker-compose\.ya?ml]],
+          "*.Dockerfile.*",
+          "package.json",
+          "go.mod",
+          "go.work",
+          "pyproject.toml",
+          "Cargo.toml",
+          "deps.edn",
+        },
+      }
+    end,
+  },
+  {
+    "echasnovski/mini.bufremove",
+    keys = { { "<leader>c", map("mini.bufremove", "delete", "0, false") } },
+  },
+}

D

@@ -1,70 +0,0 @@
-local map = require("core.utils").smap
-return {
-  {
-    "mfussenegger/nvim-dap",
-    keys = {
-      { "<leader>dt", map("dap", "toggle_breakpoint") },
-      { "<leader>dc", map("dap", "continue") },
-      { "<leader>di", map("dap", "step_into") },
-      { "<leader>do", map("dap", "step_over") },
-      { "<leader>dO", map("dap", "step_out") },
-      { "<leader>dr", map("dap", "repl.toggle") },
-      { "<leader>dl", map("dap", "run_to_cursor") },
-      { "<leader>du", map("dap", "disconnect") },
-      { "<leader>dT", map("dap", "terminate") },
-    },
-    dependencies = {
-      { "theHamsta/nvim-dap-virtual-text", config = true },
-      {
-        "rcarriga/nvim-dap-ui",
-        config = function()
-          require("dapui").setup {
-            layouts = {
-              elements = {
-                { id = "scopes", size = 0.25 },
-                { id = "breakpoints", size = 0.25 },
-              },
-              size = 40,
-              position = "left",
-            },
-          }
-        end,
-      },
-    },
-    config = function()
-      vim.fn.sign_define("DapBreakpoint", {
-        text = "",
-        texthl = "DiagnosticSignError",
-        linehl = "",
-        numhl = "",
-      })
-
-      local dap = require "dap"
-      local dapui = require "dapui"
-      dap.listeners.after.event_initialized["dapui_config"] = function()
-        dapui.open {}
-      end
-
-      dap.listeners.before.event_terminated["dapui_config"] = function()
-        dapui.close {}
-      end
-
-      dap.listeners.before.event_exited["dapui_config"] = function()
-        dapui.close {}
-      end
-    end,
-  },
-
-  {
-    "andrewferrier/debugprint.nvim",
-    config = true,
-    keys = {
-      "g?",
-      {
-        "<leader>P",
-        map("debugprint", "debugprint", "{ variable = true }"),
-        expr = true,
-      },
-    },
-  },
-}

M lua/plugins/git.lua

@@ -1,6 +1,5 @@
 local map = require("core.utils").smap
 return {
-  { "akinsho/git-conflict.nvim", config = true },
   {
     "lewis6991/gitsigns.nvim",
     event = "BufRead",
@@ -11,7 +10,6 @@ { "<leader>gs", map("gitsigns", "stage_hunk") },
       { "<leader>gu", map("gitsigns", "undo_stage_hunk") },
       { "<leader>gr", map("gitsigns", "reset_hunk") },
       { "<leader>gp", map("gitsigns", "preview_hunk") },
-      { "<leader>gd", map("gitsigns", "diffthis") },
     },
     opts = {
       max_file_length = 1000,
@@ -22,6 +20,7 @@ delay = 300,
       },
     },
   },
+
   {
     "TimUntersberger/neogit",
     cmd = "Neogit",

M lua/plugins/hover.lua

@@ -12,7 +12,7 @@ require "hover.providers.gh"
       require "hover.providers.gh_user"
       -- require "hover.providers.jira"
       require "hover.providers.man"
-      require "hover.providers.dictionary"
+      -- require "hover.providers.dictionary"
     end,
     preview_window = false,
     preview_opts = { border = require("plugins.lsp.diagnostic").border },

M lua/plugins/lsp/attach.lua

@@ -13,21 +13,14 @@ if client.name == "gopls" then
       vim.lsp.codelens.refresh()
     end
 
-    if client.name == "clojure_lsp" then
-      client.server_capabilities.documentFormattingProvider = true
-    end
-
     if client.server_capabilities.inlayHintProvider then
       vim.lsp.inlay_hint(bufnr, true)
     end
 
     map("gd", "<cmd>Telescope lsp_definitions<cr>")
-    map("gD", vim.lsp.buf.declaration)
     map("gr", "<cmd>Telescope lsp_references<cr>")
     map("gi", "<cmd>Telescope lsp_implementations<cr>")
-    map("gs", vim.lsp.buf.signature_help)
     map("gl", vim.diagnostic.open_float)
-    map("<leader>li", "<cmd>LspInfo<cr>")
     map("<leader>la", vim.lsp.buf.code_action)
     map("<leader>lr", vim.lsp.buf.rename)
     map("<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
@@ -37,7 +30,6 @@ map("]d", vim.diagnostic.goto_next)
     map("[d", vim.diagnostic.goto_prev)
   end,
   null_ls = function(_, _)
-    map("<leader>li", "<cmd>LspInfo<cr>")
     map("<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
     map("]d", vim.diagnostic.goto_next)
     map("[d", vim.diagnostic.goto_prev)

M lua/plugins/lsp/init.lua

@@ -5,10 +5,8 @@ dependencies = {
     "b0o/schemastore.nvim",
     { "williamboman/mason-lspconfig.nvim", config = true },
     { "j-hui/fidget.nvim", config = true },
-    { "folke/neodev.nvim", config = true },
     {
-      "folke/neoconf.nvim",
-      cmd = "Neoconf",
+      "folke/neodev.nvim",
       config = true,
       dependencies = { "nvim-lspconfig" },
     },

M lua/plugins/lsp/null-ls.lua

@@ -16,6 +16,5 @@ formatting.goimports,
     formatting.golines,
     diagnostic.eslint_d,
     formatting.prettierd.with { extra_filetypes = { "astro" } },
-    formatting.rustfmt,
   },
 }

M lua/plugins/lsp/servers.lua

@@ -1,22 +1,7 @@
-local lspconfig = require "lspconfig"
-local html_ft = {
-  "html",
-  "typescriptreact",
-  "javascriptreact",
-  "css",
-  "scss",
-  "astro",
-  "gotmpl",
-}
-
 return {
-  denols = { root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc") },
-  tsserver = { root_dir = lspconfig.util.root_pattern "package.json" },
-  rust_analyzer = {},
-  clojure_lsp = {},
-  html = { filetypes = html_ft },
-  emmet_language_server = { filetypes = html_ft },
-  astro = {},
+  tsserver = {},
+  html = {},
+  emmet_language_server = {},
   dockerls = {},
   gopls = {
     settings = {
@@ -47,8 +32,6 @@ settings = {
       Lua = {
         format = { enable = false },
         completion = { callSnippet = "Replace" },
-        diagnostics = { globals = { "vim", "it", "describe" } },
-        workspace = { checkThirdParty = false },
         hint = {
           enable = true,
           arrayIndex = "Disable",
@@ -79,8 +62,6 @@ },
     },
   },
   jsonls = {
-    settings = {
-      json = { schemas = require("schemastore").json.schemas() },
-    },
+    settings = { json = { schemas = require("schemastore").json.schemas() } },
   },
 }

D

@@ -1,39 +0,0 @@
-local map = require("core.utils").smap
-return {
-  {
-    "echasnovski/mini.bufremove",
-    keys = {
-      { "<leader>c", map("mini.bufremove", "delete", "0, false") },
-    },
-  },
-  {
-    "echasnovski/mini.indentscope",
-    event = { "BufReadPre", "BufNewFile" },
-    opts = {
-      symbol = "│",
-      options = { try_as_border = true },
-      draw = {
-        delay = 10,
-        animation = function(_, _)
-          return 1
-        end,
-      },
-    },
-    init = function()
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = {
-          "help",
-          "Trouble",
-          "lazy",
-          "mason",
-          "notify",
-          "gitcommit",
-          "NeogitCommitMessage",
-        },
-        callback = function()
-          vim.b.miniindentscope_disable = true
-        end,
-      })
-    end,
-  },
-}

M lua/plugins/navigation.lua

@@ -1,23 +1,25 @@
 local map = require("core.utils").smap
 return {
-  { "mbbill/undotree", cmd = "UndotreeToggle" },
+  {
+    "mbbill/undotree",
+    cmd = "UndotreeToggle",
+    keys = { { "<leader>u", vim.cmd.UndotreeToggle } },
+    init = function()
+      vim.g.undotree_DiffAutoOpen = 0
+    end,
+  },
+
   {
     "ThePrimeagen/harpoon",
     config = true,
     keys = {
       { "<leader>a", map("harpoon.mark", "add_file") },
       { "<leader>1", map("harpoon.ui", "toggle_quick_menu") },
-      { "<leader>2", map("harpoon.ui", "nav_file", "1") },
-      { "<leader>3", map("harpoon.ui", "nav_file", "2") },
-      { "<leader>4", map("harpoon.ui", "nav_file", "3") },
-      { "<leader>5", map("harpoon.ui", "nav_file", "4") },
+      { "<M-j>", map("harpoon.ui", "nav_file", "1") },
+      { "<M-k>", map("harpoon.ui", "nav_file", "2") },
+      { "<M-l>", map("harpoon.ui", "nav_file", "3") },
+      { "<M-;>", map("harpoon.ui", "nav_file", "4") },
     },
-  },
-
-  {
-    "folke/trouble.nvim",
-    config = true,
-    cmd = { "Trouble", "TroubleToggle" },
   },
 
   {

M lua/plugins/telescope.lua

@@ -6,12 +6,8 @@ keys = {
     { "<leader>f", "<cmd>Telescope find_files<cr>" },
     { "<leader>b", "<cmd>Telescope buffers<cr>" },
     { "<leader>sr", "<cmd>Telescope oldfiles<cr>" },
-    { "<leader>sb", "<cmd>Telescope git_branches<cr>" },
     { "<leader>st", "<cmd>Telescope live_grep<cr>" },
     { "<leader>sp", "<cmd>Telescope projects<cr>" },
-    { "<leader>sf", "<cmd>Telescope git_bcommits<cr>" },
-    { "<leader>sc", "<cmd>Telescope git_commits<cr>" },
-    { "<leader>sk", "<cmd>Telescope keymaps<cr>" },
   },
   config = function()
     local telescope = require "telescope"
@@ -46,6 +42,7 @@ },
       pickers = {
         find_files = { theme = "ivy" },
         live_grep = { theme = "ivy" },
+        filetypes = { theme = "ivy" },
         buffers = { theme = "ivy" },
         oldfiles = { theme = "ivy" },
         keymaps = { theme = "ivy" },

M lua/plugins/treesitter.lua

@@ -13,14 +13,6 @@ vim.cmd "TSUpdate"
     end)
   end,
   config = function()
-    require("nvim-treesitter.parsers").get_parser_configs().gotmpl = {
-      filetype = "gotmpl",
-      install_info = {
-        url = "https://github.com/ngalaiko/tree-sitter-go-template",
-        files = { "src/parser.c" },
-      },
-    }
-
     require("nvim-treesitter.configs").setup {
       auto_install = true,
       ensure_installed = {
@@ -29,13 +21,10 @@ "go",
         "gomod",
         "gowork",
         "gosum",
-        "gotmpl",
-        "fish",
         "gitignore",
         "gitcommit",
         "query",
         "sql",
-        "html",
         "json",
       },
       indent = { enable = true, disable = { "python" } },

D

@@ -1,49 +0,0 @@
-; Identifiers
-[(field) (field_identifier)] @property
-(variable) @variable
-
-; Function calls
-(function_call
-  function: (identifier) @function)
-
-(method_call
-  method: (selector_expression
-  field: (field_identifier) @method))
-
-; Operators
-"|" @operator
-":=" @operator
-
-; Builtin functions
-((identifier) @function.builtin
- (#match? @function.builtin "^(and|call|html|index|slice|js|len|not|or|print|printf|println|urlquery|eq|ne|lt|ge|gt|ge)$"))
-
-; Delimiters
-"." @punctuation.delimiter
-"," @punctuation.delimiter
-"{{" @punctuation.bracket
-"}}" @punctuation.bracket
-"{{-" @punctuation.bracket
-"-}}" @punctuation.bracket
-")" @punctuation.bracket
-"(" @punctuation.bracket
-
-; Keywords
-["else" "else if" "if" "with"] @conditional
-["range" "end" "template" "define" "block"] @keyword
-
-; Literals
-[(interpreted_string_literal)
- (raw_string_literal)
- (rune_literal)] @string
-
-[(int_literal)
- (float_literal)
- (imaginary_literal)] @number
-
-[(true) (false)] @boolean
-[(nil)] @constant.builtin
-
-(escape_sequence) @string.special
-(comment) @comment
-(ERROR) @error

D

@@ -1,1 +0,0 @@
-(text) @html