Work on LSP

after/ftplugin/lua.vim

@@ -0,0 +1,2 @@
+setlocal tabstop=2
+setlocal shiftwidth=2

after/syntax/diff.vim

@@ -0,0 +1,11 @@
+" hi DiffAdd      gui=none    guifg=NONE          guibg=#bada9f
+" hi DiffChange   gui=none    guifg=NONE          guibg=#e5d5ac
+" hi DiffDelete   gui=bold    guifg=#ff8080       guibg=#ffb0b0
+" hi DiffText     gui=none    guifg=NONE          guibg=#8cbee2
+hi DiffAdd      gui=none    guifg=NONE          guibg=#003200
+hi DiffChange   gui=none    guifg=NONE          guibg=#000032
+hi DiffDelete   gui=bold    guifg=#ff8080       guibg=#602020
+hi DiffText     gui=bold    guifg=NONE          guibg=#102040
+hi link @text.diff.add DiffAdd
+hi link @text.diff.delete DiffDelete
+hi link @text.diff.change DiffChange

lazy-lock.json

@@ -0,0 +1,66 @@
+{
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" },
+  "NvChad": { "branch": "v2.5", "commit": "fea5d02d2d07b148243c058d1b8b775f9cccac5e" },
+  "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" },
+  "base46": { "branch": "v2.5", "commit": "4f4a9d205ccef5785ca1d0ad875752478b8ef2a4" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conform.nvim": { "branch": "master", "commit": "667102f26106709cddd2dff1f699610df5b94d7f" },
+  "diaglist.nvim": { "branch": "master", "commit": "afc124a0976d56db43cc840e62757193ccab7856" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
+  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
+  "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" },
+  "macrothis.nvim": { "branch": "main", "commit": "3fe6af86ce9eb509737f7955007c58dec96eb02b" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
+  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" },
+  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
+  "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-lint": { "branch": "master", "commit": "ad0fe35e80f5cd31a0f19176d7b30e5c3011119d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "037ea0901ce9a28cfcaa36302618f06d2e164fbf" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" },
+  "nvim-treesitter": { "branch": "master", "commit": "bfb50de9cb0673a3bff620d881f690fb7e0d1328" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
+  "nvim-window": { "branch": "main", "commit": "81f29840ac3aaeea6fc2153edfabebd00d692476" },
+  "persistent-breakpoints.nvim": { "branch": "main", "commit": "4b199b1dcfd136cac8b0fa9c8dbbdeb81463f7a9" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "quicker.nvim": { "branch": "master", "commit": "6b79167543f1b18e76319217a29bb4e177a5e1ae" },
+  "rgflow.nvim": { "branch": "master", "commit": "8a2d80b8594591163d06b430be18c7376d5ae1b8" },
+  "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" },
+  "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
+  "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
+  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
+  "ui": { "branch": "v2.5", "commit": "6783a3ab3d9bf22859234dd2196888da1d0f0426" },
+  "vim-autoswap": { "branch": "master", "commit": "e587e4b14a605d8921942ba65a37583813289272" },
+  "vim-flog": { "branch": "master", "commit": "8520904c8b37fe74824f1c46ba73f75158d7ae3b" },
+  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
+  "vim-gutentags": { "branch": "master", "commit": "aa47c5e29c37c52176c44e61c780032dfacef3dd" },
+  "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
+  "vim-rest-console": { "branch": "master", "commit": "119d5d5e6c2f41510db89075ae564452be39eec3" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
+  "winshift.nvim": { "branch": "main", "commit": "37468ed6f385dfb50402368669766504c0e15583" },
+  "workspaces.nvim": { "branch": "master", "commit": "447306604259619618cd84c15b68f2ffdbc702ae" }
+}

lua/configs/blankline.lua

@@ -1,21 +1,22 @@
-return {}
+return {
--- return {
+  indent = {
---   indentLine_enabled = 1,
+    char = "│",
---   filetype_exclude = {
+    tab_char = "│",
---     "help",
+  },
---     "terminal",
+  scope = { enabled = false },
---     "lazy",
+  exclude = {
---     "lspinfo",
+    filetypes = {
---     "TelescopePrompt",
+      "NvimTree",
---     "TelescopeResults",
+      "Trouble",
---     "mason",
+      "alpha",
---     "nvdash",
+      "dashboard",
---     "nvcheatsheet",
+      "help",
---     "",
+      "lazy",
---   },
+      "lspinfo",
---   buftype_exclude = { "terminal" },
+      "mason",
---   show_trailing_blankline_indent = false,;
+      "neo-tree",
---   show_first_indent_level = false,
+      "notify",
---   show_current_context = true,
+      "toggleterm",
---   show_current_context_start = true,
+    },
--- }
+  },
+}

lua/configs/diffview.lua

@@ -1 +1,24 @@
-return {}
+local actions = require "diffview.actions"
+
+return {
+  hooks = {
+    diff_buf_read = function(_)
+      vim.opt_local.wrap = false
+      vim.opt_local.list = false
+    end,
+    view_opened = function(_)
+      vim.api.nvim_command "set ft=diff"
+    end,
+  },
+  keymaps = {
+    file_panel = {
+      ["<CR>"] = actions.focus_entry,
+    },
+    view = {
+      ["<CR>"] = function()
+        print "asd"
+        -- actions.diffget()
+      end,
+    },
+  },
+}

lua/configs/lspconfig.lua

@@ -16,9 +16,46 @@ for _, lsp in ipairs(servers) do
   }
 end
 
--- configuring single server, example: typescript
+-- lsp settings (for overriding per client)
--- lspconfig.tsserver.setup {
+local handlers = {
---   on_attach = nvlsp.on_attach,
+  ["textdocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" }),
+  ["textdocument/signaturehelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" }),
+}
+
+-- require("lspconfig").pyright.setup {
 --   on_init = nvlsp.on_init,
+--   on_attach = nvlsp.on_attach,
 --   capabilities = nvlsp.capabilities,
+--   handlers = handlers,
+--
+--   settings = {
+--     pyright = {
+--       -- options available here: https://github.com/microsoft/pyright/blob/main/docs/settings.md
+--       disableorganizeimports = true, -- using ruff
+--       -- disablelanguageservices = true, -- using ruff
+--     },
+--     python = {
+--       analysis = {
+--         -- ignore = { "*" }, -- using ruff
+--         -- typecheckingmode = "off", -- using mypy
+--         diagnosticseverityoverrides = {
+--           reportmissingimports = false,
+--           -- reportattributeaccessissue = false,
+--         },
+--       },
+--     },
+--   },
 -- }
+
+require("lspconfig").pylsp.setup {
+  settings = {
+    pylsp = {
+      plugins = {
+        pycodestyle = {
+          ignore = { "W391", "E501" },
+          maxLineLength = 100,
+        },
+      },
+    },
+  },
+}

lua/configs/telescope/init.lua

@@ -343,7 +343,9 @@ local options = {
           ["<C-k>"] = lga_actions.quote_prompt(),
         },
       },
-      advanced_git_search = {},
+    },
+    advanced_git_search = {
+      diff_plugin = "diffview",
     },
   },
 }

lua/mappings.lua

@@ -3,15 +3,7 @@ local map = vim.keymap.set
 map("n", ";", ":", { desc = "CMD enter command mode" })
 map("i", "jk", "<ESC>")
 
-map("n", "<A-f>", ":Telescope resume  <CR>", { desc = "Telescope resume" })
+map("n", "<leader>;", "<cmd> Telescope <CR>", { desc = "Open Telescope" })
-map("n", "<A-k>", ":Telescope keymaps <CR>", { desc = "Show (and search) all [k]eymaps" })
-
-map("n", "<C-g>", ":Telescope find_files <CR>", { desc = "Find files" })
-map("n", "<C-x>", ":Telescope find_files follow=true no_ignore=true hidden=true <CR>", { desc = "Find all files" })
-map("n", "<C-f>", ":Telescope live_grep <CR>", { desc = "Live grep" })
-map("n", "<C-b>", ":Telescope buffers <CR>", { desc = "Find buffers" })
-map("n", "<leader>/<CR>", ":Telescope search_history <CR>", { desc = "Search history" })
-map("n", "<leader>//", ":noh<CR>", { desc = "Clear highlights" })
 
 -- go to  beginning and end
 map("i", "<C-b>", "<ESC>^i", { desc = "Beginning of line" })
@@ -79,21 +71,24 @@ map("n", "<leader>tL", ":Trouble loclist toggle<CR>", { desc = "[T]rouble [L]ocl
 map("n", "<leader>tQ", ":Trouble qflist toggle<CR>", { desc = "[T]rouble [Q]uickfix" })
 
 -- DAP
-map("n", "<leader>dgg", ":lua require('dap').continue() <CR>", { desc = "Continue debu[g]ging" })
+local dap = require "dap"
-map("n", "<leader>dg<CR>", ":lua require('dapui').toggle() <CR>", { desc = "Toggle DAP ui" })
+local dapui = require "dapui"
-map("n", "<leader>dgw", ":lua require('dapui').eval() <CR>", { desc = "Open floating windows about current [w]ord" })
+local dappython = require "dap-python"
-map("n", "<leader>dgb", ":lua require('dap').toggle_breakpoint() <CR>", { desc = "Toggle [b]reakpoint" })
+
-map("n", "<leader>dgf", ":lua require('dap-python').test_method() <CR>", { desc = "Debug [f]unction" })
+map("n", "<leader>dgg", dap.continue, { desc = "Continue debu[g]ging" })
-map("n", "<leader>dgo", ":lua require('dap').step_over() <CR>", { desc = "DAP step [o]ver method" })
+map("n", "<leader>dg<CR>", dapui.toggle, { desc = "Toggle DAP ui" })
-map("n", "<leader>dgt", ":lua require('dap').step_into() <CR>", { desc = "DAP step in[t]o method" })
+map("n", "<leader>dgw", dapui.eval, { desc = "Open floating windows about current [w]ord" })
-map("n", "<leader>dgp", ":lua require('dap').step_back() <CR>", { desc = "DAP step back ([p]revious)" })
+map("n", "<leader>dgb", dap.toggle_breakpoint, { desc = "Toggle [b]reakpoint" })
+map("n", "<leader>dgf", dappython.test_method, { desc = "Debug [f]unction" })
+map("v", "<leader>dgd", dappython.debug_selection, { desc = "DAP debug selection" })
+map("n", "<leader>dgo", dap.step_over, { desc = "DAP step [o]ver method" })
+map("n", "<leader>dgt", dap.step_into, { desc = "DAP step in[t]o method" })
+map("n", "<leader>dgp", dap.step_back, { desc = "DAP step back ([p]revious)" })
 map("n", "<leader>dgs", function()
   local widgets = require "dap.ui.widgets"
   local sidebar = widgets.sidebar(widgets.scopes)
   sidebar.open { widgth = "50%" }
 end, { desc = "DAP Show debugged [s]copes" })
-map("v", "<leader>dgd", ":lua require('dap-python').debug_selection()", { desc = "DAP debug selection" })
-map("v", "<leader>dgw", ":lua require('dap-python').eval()", { desc = "DAP eval selection" })
 
 -- LSP
 map("n", "<leader>fm", function()
@@ -160,19 +155,24 @@ map("n", "}", "}zz", { desc = "Previous + auto center" })
 map("n", "[[", "[[zz", { desc = "Previous + auto center" })
 map("n", "]]", "]]zz", { desc = "Previous + auto center" })
 
-map("n", "<leader>ww", ":lua require('nvim-window').pick()<CR>", { desc = "Pick window to goto" })
+map("n", "<leader>ww", require("nvim-window").pick, { desc = "Pick window to goto" })
 map("n", "<leader>wm", ":WinShift<CR>", { desc = "Enter move window mode" })
 map("n", "<leader>ws", ":WinShift swap<CR>", { desc = "Swap window, with selection" })
 map("n", "<leader>gg", ":LazyGit<CR>", { desc = "Open lazygit" })
+
+-- Go to - uppercase
 map("n", "gf", ":call search('[A-Z]', 'W')<CR>", { desc = "Go to next uppercase" })
 map("n", "fg", ":call search('[A-Z]', 'bW')<CR>", { desc = "Go to last uppercase" })
-map("n", "glb", ":lua require('gitlab').choose_merge_request()<CR>", { desc = "Gitlab: Choose merge request" })
+
-map("n", "glr", ":lua require('gitlab').review()<CR>", { desc = "Gitlab: review" })
+-- Gitlab
-map("n", "gls", ":lua require('gitlab').summary()<CR>", { desc = "Gitlab: summary" })
+-- local gitlab = require "gitlab"
-map("n", "glo", ":lua require('gitlab').open_in_browser()<CR>", { desc = "Gitlab: open in browser" })
+-- map("n", "glb", gitlab.choose_merge_request, { desc = "Gitlab: Choose merge request" })
-map("n", "glu", ":lua require('gitlab').copy_mr_url()<CR>", { desc = "Gitlab: open in browser" })
+-- map("n", "glr", gitlab.review, { desc = "Gitlab: review" })
-map("n", "glO", ":lua require('gitlab').create_mr()<CR>", { desc = "Gitlab: create MR" })
+-- map("n", "gls", gitlab.summary, { desc = "Gitlab: summary" })
-map("n", "glaa", ":lua require('gitlab').add_assignee()<CR>", { desc = "Gitlab: add_assignee" })
+-- map("n", "glo", gitlab.open_in_browser, { desc = "Gitlab: open in browser" })
+-- map("n", "glu", gitlab.copy_mr_url, { desc = "Gitlab: open in browser" })
+-- map("n", "glO", gitlab.create_mr, { desc = "Gitlab: create MR" })
+-- map("n", "glaa", gitlab.add_assignee, { desc = "Gitlab: add_assignee" })
 
 -- map("n", "glb", gitlab.choose_merge_request)
 -- map("n", "glr", gitlab.review)
@@ -205,30 +205,22 @@ map(
 
 -- Tabufline
 -- cycle through buffers
+local tabufline = require "nvchad.tabufline"
 map("n", "<tab>", function()
-  require("nvchad.tabufline").tabuflineNext()
+  tabufline.next()
 end, { desc = "Goto next buffer" })
 
 map("n", "<S-tab>", function()
-  require("nvchad.tabufline").tabuflinePrev()
+  tabufline.prev()
 end, { desc = "Goto prev buffer" })
 
 -- close buffer + hide terminal buffer
 -- map("n", "<leader>x", function()
---   require("nvchad.tabufline").close_buffer()
+--   tabufline.close_buffer()
 -- end, { desc = "Close buffer" })
 
 -- Comment
-map("n", "<leader>ci", function()
+-- https://github.com/numToStr/Comment.nvim?tab=readme-ov-file#basic-mappings
-  require("Comment.api").toggle.linewise.current()
-end, { desc = "Toggle comment" })
-
-map(
-  "v",
-  "<leader>ci",
-  "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
-  { desc = "Toggle comment" }
-)
 
 -- LSP
 map("n", "gD", vim.lsp.buf.declaration, { desc = "LSP declaration" })
@@ -237,7 +229,6 @@ map("n", "K", vim.lsp.buf.hover, { desc = "LSP hover" })
 map("n", "gi", vim.lsp.buf.implementation, { desc = "LSP implementation" })
 map("n", "<leader>ls", vim.lsp.buf.signature_help, { desc = "LSP signature help" })
 map("n", "<leader>D", vim.lsp.buf.type_definition, { desc = "LSP definition type" })
---map("n", "<leader>ra", require("nvchad.renamer").open, { desc = "LSP rename" })
 map("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
 map("n", "gr", vim.lsp.buf.references, { desc = "LSP references" })
 map("n", "<leader>lf", function()
@@ -256,7 +247,7 @@ end, { desc = "Diagnostic previous" })
 -- LSP Workspace
 map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, { desc = "Add workspace folder" })
 map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, { desc = "Add workspace folder" })
-map("n", "]d", function()
+map("n", "<leader>wl", function()
   print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 end, { desc = "List workspace folders" })
 
@@ -267,41 +258,44 @@ map("n", "<C-n>", "<cmd> NvimTreeToggle <CR>", { desc = "Toggle nvimtree" })
 map("n", "<leader>e", "<cmd> NvimTreeFocus <CR>", { desc = "Focus nvimtree" })
 
 -- Telescope
-map("n", "<A-f>", "<cmd> Telescope resume <CR>", { desc = "Resume" })
+local telescope = require "telescope.builtin"
-map("n", "<A-k>", "<cmd> Telescope keymaps <CR>", { desc = "Show (and search) all [k]eymaps" })
+map("n", "<A-f>", telescope.resume, { desc = "Resume" })
-map("n", "<C-g>", "<cmd> Telescope find_files <CR>", { desc = "Find files" })
+map("n", "<A-k>", telescope.keymaps, { desc = "Show (and search) all [k]eymaps" })
-map("n", "<C-x>", "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", { desc = "Find all" })
+map("n", "<C-g>", telescope.find_files, { desc = "Find files" })
-map("n", "<C-f>", "<cmd> Telescope live_grep <CR>", { desc = "Live grep" })
+map("n", "<C-x>", function()
-map("n", "<C-b>", "<cmd> Telescope buffers <CR>", { desc = "Find buffers" })
+  telescope.find_files { follow = true, no_ignore = true, hidden = true }
+end, { desc = "Find all" })
+map("n", "<C-f>", telescope.live_grep, { desc = "Live grep" })
+map("n", "<C-b>", telescope.buffers, { desc = "Find buffers" })
 
 map("n", "<leader>ff", function()
-  require("telescope.builtin").live_grep { default_text = "<<<<<<< HEAD" }
+  telescope.live_grep { default_text = "<<<<<<< HEAD" }
 end, { desc = "Search for git conflicts" })
 
 -- Live grep
 map("n", "<leader>fg<CR>", function()
-  require("telescope.builtin").live_grep {}
+  telescope.live_grep {}
 end, { desc = "Live grep" })
 
 map("n", "<leader>fg/", function()
-  require("telescope.builtin").live_grep { default_text = vim.fn.getreg "/" }
+  telescope.live_grep { default_text = vim.fn.getreg "/" }
 end, { desc = "Live grep with search term" })
 
 map("n", "<leader>fgw", function()
-  require("telescope.builtin").live_grep { default_text = vim.fn.expand "<cword>" }
+  telescope.live_grep { default_text = vim.fn.expand "<cword>" }
 end, { desc = "Live grep with current word" })
 
 -- Find files
 map("n", "<leader>gf<CR>", function()
-  require("telescope.builtin").find_files {}
+  telescope.find_files {}
 end, { desc = "Find files" })
 
 map("n", "<leader>gf/", function()
-  require("telescope.builtin").find_files { default_text = vim.fn.getreg "/" }
+  telescope.find_files { default_text = vim.fn.getreg "/" }
 end, { desc = "Find files with search term" })
 
 map("n", "<leader>gfw", function()
-  require("telescope.builtin").find_files { default_text = vim.fn.expand "<cword>" }
+  telescope.find_files { default_text = vim.fn.expand "<cword>" }
 end, { desc = "Find files with current word" })
 
 -- Buffer replace
@@ -361,15 +355,15 @@ map("n", "<leader>lc", ":call setloclist([]) | lclose<CR>", { desc = "Clear locl
 map("n", "<leader>fh", "<cmd> Telescope help_tags <CR>", { desc = "Help page" })
 map("n", "<leader>fo", "<cmd> Telescope oldfiles <CR>", { desc = "Find oldfiles" })
 map("n", "<leader>fx<CR>", function()
-  require("telescope.builtin").current_buffer_fuzzy_find {}
+  telescope.current_buffer_fuzzy_find {}
 end, { desc = "Fuzzy find in current buffer" })
 
 map("n", "<leader>fx/", function()
-  require("telescope.builtin").current_buffer_fuzzy_find { default_text = vim.fn.getreg "/" }
+  telescope.current_buffer_fuzzy_find { default_text = vim.fn.getreg "/" }
 end, { desc = "Fuzzy find in current buffer with search term" })
 
 map("n", "<leader>fxw", function()
-  require("telescope.builtin").current_buffer_fuzzy_find { default_text = vim.fn.expand "<cword>" }
+  telescope.current_buffer_fuzzy_find { default_text = vim.fn.expand "<cword>" }
 end, { desc = "Fuzzy find in current buffer with current work" })
 
 map("n", "<leader>wl", "<cmd> Telescope workspaces <CR>", { desc = "Find workspaces" })
@@ -400,37 +394,15 @@ map("n", "<leader>ch", "<cmd> Telescope command_history <CR>", { desc = "telesco
 map("n", "<leader>/", "<cmd> Telescope search_history <CR>", { desc = "telescope search history" })
 
 -- Diaglist: LSP diagnostics in quick/loc list
+local diaglist = require "diaglist"
 map("n", "<leader>dw", function()
-  require("diaglist").open_all_diagnostics()
+  diaglist.open_all_diagnostics()
 end, { desc = "Open all open buffers diagnostics in qflist" })
 
 map("n", "<leader>d0", function()
-  require("diaglist").open_buffer_diagnostics()
+  diaglist.open_buffer_diagnostics()
 end, { desc = "Open current buffer diagnostics in qflist" })
 
-map("n", "<leader>;", "<cmd> Telescope <CR>", { desc = "Open Telescope" })
-
--- Terminal
-map({ "n", "t" }, "<A-i>", function()
-  require("nvterm.terminal").toggle "float"
-end, { desc = "Toggle floating term" })
-
-map({ "n", "t" }, "<A-h>", function()
-  require("nvterm.terminal").toggle "horizontal"
-end, { desc = "Toggle horizontal term" })
-
-map({ "n", "t" }, "<A-v>", function()
-  require("nvterm.terminal").toggle "vertical"
-end, { desc = "Toggle vertical term" })
-
-map("n", "<leader>h", function()
-  require("nvterm.terminal").new "horizontal"
-end, { desc = "New horizontal term" })
-
-map("n", "<leader>v", function()
-  require("nvterm.terminal").new "vertical"
-end, { desc = "New vertical term" })
-
 -- WhichKey
 map("n", "<leader>wK", function()
   vim.cmd "WhichKey"
@@ -443,30 +415,42 @@ map("n", "<leader>wk", function()
 end, { desc = "Which-key query lookup" })
 
 -- Git hunk
+local gitsigns = require "gitsigns"
 map("n", "]c", function()
   if vim.wo.diff then
-    return "]c"
+    -- Use default vim ]c when in diff mode
+    vim.cmd.normal { "]c", bang = true }
+  else
+    gitsigns.nav_hunk "next"
   end
-  vim.schedule(function()
+end, { desc = "Git: Jump to next hunk" })
-    require("gitsigns").next_hunk()
-  end)
-  return "<Ignore>"
-end, { desc = "Jump to next hunk" })
 
 map("n", "[c", function()
   if vim.wo.diff then
-    return "[c"
+    -- Use default vim ]c when in diff mode
+    vim.cmd.normal { "[c", bang = true }
+  else
+    gitsigns.nav_hunk "prev"
   end
-  vim.schedule(function()
+end, { desc = "Git: Jump to prev hunk" })
-    require("gitsigns").prev_hunk()
-  end)
-  return "<Ignore>"
-end, { desc = "Jump to prev hunk" })
 
-map("n", "<leader>rh", require("gitsigns").reset_hunk, { desc = "Git Reset hunk" })
+map("n", "<leader>rh", gitsigns.reset_hunk, { desc = "Git Reset hunk" })
-map("n", "<leader>ph", require("gitsigns").preview_hunk, { desc = "Git Preview hunk" })
+map("n", "<leader>ph", gitsigns.preview_hunk, { desc = "Git Preview hunk" })
-map("n", "<leader>bb", require("gitsigns").blame_line, { desc = "Git Blame line" })
+map("n", "<leader>bb", gitsigns.blame_line, { desc = "Git Blame line" })
-map("n", "<leader>bd", require("gitsigns").toggle_deleted, { desc = "Git Toggle deleted" })
+map("n", "<leader>bd", gitsigns.toggle_deleted, { desc = "Git Toggle deleted" })
+
+-- Macrothis
+local macrothis = require "macrothis"
+map("n", "<leader>kkd", macrothis.delete, { desc = "Macro: [d]elete" })
+map("n", "<leader>kke", macrothis.edit, { desc = "Macro: [e]dit" })
+map("n", "<leader>kkl", macrothis.load, { desc = "Macro: [l]oad" })
+map("n", "<leader>kkn", macrothis.rename, { desc = "Macro: re[n]ame" })
+map("n", "<leader>kkq", macrothis.quickfix, { desc = "Macro: [q]uickfix" })
+map("n", "<leader>kkr", macrothis.run, { desc = "Macro: [r]un" })
+map("n", "<leader>kks", macrothis.save, { desc = "Macro: [s]ave" })
+map("n", "<leader>kkx", macrothis.register, { desc = "Macro: edit register" })
+map("n", "<leader>kkpr", macrothis.copy_register_printable, { desc = "Macro: as [p]rintable [r]egister" })
+map("n", "<leader>kkpm", macrothis.copy_macro_printable, { desc = "Macro: as [p]rintable [m]acro" })
 
 -- Override all delete/yank/paste to use the registers M by default
 map({ "n", "v" }, "y", '"my', { desc = "Yank", remap = false })

lua/plugins/init.lua

@@ -18,13 +18,21 @@ return {
   { "ludovicchabant/vim-gutentags", lazy = false },
   { "emaniacs/vim-rest-console", lazy = false },
   { "mfussenegger/nvim-dap", lazy = false },
+  {
+    "mfussenegger/nvim-lint",
+    lazy = false,
+    init = function()
+      -- require("link").linters_by_ft = {
+      --   python = { "mypy" },
+      -- }
+    end,
+  },
   {
     "rcarriga/nvim-dap-ui",
     dependencies = {
       "mfussenegger/nvim-dap",
       "nvim-neotest/nvim-nio",
     },
-    lazy = false,
   },
   {
     "mfussenegger/nvim-dap-python",
@@ -32,7 +40,6 @@ return {
       "mfussenegger/nvim-dap",
       "rcarriga/nvim-dap-ui",
     },
-    lazy = false,
     init = function()
       require("dap-python").setup "python"
       -- Setup nvim-dap-ui also
@@ -49,15 +56,14 @@ return {
   },
   {
     "Weissle/persistent-breakpoints.nvim",
-    lazy = false,
     config = function(_, _)
       require("persistent-breakpoints").setup {
         load_breakpoints_event = { "BufReadPost" },
       }
     end,
   },
-  { "nvim-telescope/telescope-live-grep-args.nvim", lazy = false },
+  { "nvim-telescope/telescope-live-grep-args.nvim" },
-  { "nvim-telescope/telescope-dap.nvim", lazy = false },
+  { "nvim-telescope/telescope-dap.nvim" },
   -- {
   --   "harrisoncramer/gitlab.nvim",
   --   dependencies = {
@@ -68,7 +74,6 @@ return {
   --     "nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
   --   },
   --   enabled = true,
-  --   lazy = false,
   --   build = function()
   --     require("gitlab.server").build(true)
   --   end, -- Builds the Go binary
@@ -81,7 +86,6 @@ return {
   -- },
   {
     "sindrets/diffview.nvim",
-    lazy = false,
     opts = function()
       return require "configs.diffview"
     end,
@@ -114,7 +118,6 @@ return {
 
   {
     "chentoast/marks.nvim",
-    lazy = false,
     init = function()
       require("marks").setup {
         default_mappings = true,
@@ -159,7 +162,6 @@ return {
   {
     "nvim-tree/nvim-web-devicons",
     config = function(_, opts)
-      dofile(vim.g.base46_cache .. "devicons")
       require("nvim-web-devicons").setup(opts)
     end,
   },
@@ -182,14 +184,12 @@ return {
       return require "configs.treesitter"
     end,
     config = function(_, opts)
-      dofile(vim.g.base46_cache .. "syntax")
       require("nvim-treesitter.configs").setup(opts)
     end,
   },
 
   {
     "nvim-treesitter/nvim-treesitter-textobjects",
-    lazy = false,
     config = function()
       require("nvim-treesitter.configs").setup(require "configs.treesitter_textobjects")
     end,
@@ -202,10 +202,6 @@ return {
     opts = function()
       return require "configs.gitsigns"
     end,
-    -- config = function(_, opts)
-    --   dofile(vim.g.base46_cache .. "git")
-    --   require("gitsigns").setup(opts)
-    -- end,
   },
 
   -- lsp stuff
@@ -215,19 +211,6 @@ return {
     opts = function()
       return require "configs.mason"
     end,
-    -- config = function(_, opts)
-    --   dofile(vim.g.base46_cache .. "mason")
-    --   require("mason").setup(opts)
-    --
-    --   -- custom nvchad cmd to install all mason binaries listed
-    --   vim.api.nvim_create_user_command("MasonInstallAll", function()
-    --     if opts.ensure_installed and #opts.ensure_installed > 0 then
-    --       vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " "))
-    --     end
-    --   end, {})
-    --
-    --   vim.g.mason_binaries_list = opts.ensure_installed
-    -- end,
   },
 
   {
@@ -238,54 +221,6 @@ return {
     end,
   },
 
-  -- load luasnips + cmp related in insert mode only
-  {
-    "hrsh7th/nvim-cmp",
-    event = "InsertEnter",
-    dependencies = {
-      {
-        -- snippet plugin
-        "L3MON4D3/LuaSnip",
-        dependencies = "rafamadriz/friendly-snippets",
-        opts = { history = true, updateevents = "TextChanged,TextChangedI" },
-        config = function(_, opts)
-          require "configs.luasnip"(opts)
-        end,
-      },
-
-      -- autopairing of (){}[] etc
-      {
-        "windwp/nvim-autopairs",
-        opts = {
-          fast_wrap = {},
-          disable_filetype = { "TelescopePrompt", "vim" },
-        },
-        config = function(_, opts)
-          require("nvim-autopairs").setup(opts)
-
-          -- setup cmp for autopairs
-          local cmp_autopairs = require "nvim-autopairs.completion.cmp"
-          require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
-        end,
-      },
-
-      -- cmp sources plugins
-      {
-        "saadparwaiz1/cmp_luasnip",
-        "hrsh7th/cmp-nvim-lua",
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
-      },
-    },
-    opts = function()
-      return require "configs.cmp"
-    end,
-    config = function(_, opts)
-      require("cmp").setup(opts)
-    end,
-  },
-
   {
     "numToStr/Comment.nvim",
     keys = {
@@ -305,88 +240,14 @@ return {
   {
     "desdic/macrothis.nvim",
     opts = {},
-    keys = {
-      {
-        "<Leader>kkd",
-        function()
-          require("macrothis").delete()
-        end,
-        desc = "[D]elete",
-      },
-      {
-        "<Leader>kke",
-        function()
-          require("macrothis").edit()
-        end,
-        desc = "[E]dit",
-      },
-      {
-        "<Leader>kkl",
-        function()
-          require("macrothis").load()
-        end,
-        desc = "[L]oad",
-      },
-      {
-        "<Leader>kkn",
-        function()
-          require("macrothis").rename()
-        end,
-        desc = "Re[n]ame",
-      },
-      {
-        "<Leader>kkq",
-        function()
-          require("macrothis").quickfix()
-        end,
-        desc = "Run macro on all files in [q]uickfix",
-      },
-      {
-        "<Leader>kkr",
-        function()
-          require("macrothis").run()
-        end,
-        desc = "[R]un macro",
-      },
-      {
-        "<Leader>kks",
-        function()
-          require("macrothis").save()
-        end,
-        desc = "[S]ave",
-      },
-      {
-        "<Leader>kkx",
-        function()
-          require("macrothis").register()
-        end,
-        desc = "Edit register",
-      },
-      {
-        "<Leader>kkp",
-        function()
-          require("macrothis").copy_register_printable()
-        end,
-        desc = "Co[p]y register as printable",
-      },
-      {
-        "<Leader>kkm",
-        function()
-          require("macrothis").copy_macro_printable()
-        end,
-        desc = "Copy [m]acro as printable",
-      },
-    },
   },
   {
     "onsails/diaglist.nvim",
-    lazy = false,
     debug = false,
   },
 
   {
     "anuvyklack/hydra.nvim",
-    lazy = false,
     config = function()
       require "configs.hydra"
     end,
@@ -399,7 +260,6 @@ return {
 
   {
     "natecraddock/workspaces.nvim",
-    lazy = false,
 
     config = function()
       require("workspaces").setup {
@@ -433,7 +293,6 @@ return {
 
   {
     "yorickpeterse/nvim-window",
-    lazy = false,
     config = function()
       require("nvim-window").setup {
         normal_hl = "Normal",
@@ -445,12 +304,10 @@ return {
 
   {
     "sindrets/winshift.nvim",
-    lazy = false,
   },
 
   {
     "kdheepak/lazygit.nvim",
-    lazy = false,
     config = function()
       require("lazy").setup {
         {
@@ -471,10 +328,6 @@ return {
     opts = function()
       return require "configs.nvimtree"
     end,
-    config = function(_, opts)
-      dofile(vim.g.base46_cache .. "nvimtree")
-      require("nvim-tree").setup(opts)
-    end,
   },
 
   {
@@ -485,7 +338,6 @@ return {
       return require "configs.telescope"
     end,
     config = function(_, opts)
-      -- dofile(vim.g.base46_cache .. "telescope")
       local telescope = require "telescope"
       telescope.setup(opts)
 
@@ -499,13 +351,8 @@ return {
   -- Only load whichkey after all the gui
   {
     "folke/which-key.nvim",
-    lazy = false,
     keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
     cmd = "WhichKey",
-    config = function(_, opts)
-      dofile(vim.g.base46_cache .. "whichkey")
-      require("which-key").setup(opts)
-    end,
   },
   {
     "ThePrimeagen/harpoon",
@@ -532,12 +379,10 @@ return {
           },
         },
       }
-      -- require("notify").setup({
-      --   background_colour = "#000000"
-      -- })
     end,
     dependencies = {
       "MunifTanjim/nui.nvim",
+      -- Uncomment the next line to use nvim-notify
       -- "rcarriga/nvim-notify",
     },
   },
@@ -545,15 +390,10 @@ return {
     "folke/todo-comments.nvim",
     lazy = false,
     dependencies = { "nvim-lua/plenary.nvim" },
-    opts = {
+    opts = {},
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-    },
   },
   {
     "folke/trouble.nvim",
-    lazy = false,
     cmd = "Trouble",
     opts = {},
   },