chore: various improvements and fixes

- mini.clue -> `which-key.nvim` and update config to v3 - fixes for jupyter notebooks handling - better practices for Lazy specs - more...
kevinm6 · Jul 18, 2024 · 868c799 · 868c799
1 parent d0f123f
commit 868c799
Show file tree

Hide file tree

Showing 35 changed files with 962 additions and 881 deletions.
diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua
@@ -208,7 +208,7 @@ local config = {
       end,
     })
     local function map(tbl)
-      vim.keymap.set(tbl[1], tbl[2], tbl[3], { buffer = bufnr, desc = "󰬷 " .. tbl[4] })
+      vim.keymap.set(tbl[1], tbl[2], tbl[3], { buffer = bufnr, desc = "Java❭ " .. tbl[4] })
     end
 
     map {
@@ -217,23 +217,23 @@ local config = {
       function()
         jdtls.organize_imports()
       end,
-      "[o]rganize [i]mports",
+      "Organize Imports",
     }
     map {
       { "n", "v" },
       "crv",
       function()
         jdtls.extract_variable()
       end,
-      "e[x]tract [v]ariable",
+      "Extract Variable",
     }
     map {
       { "n", "v" },
       "crc",
       function()
         jdtls.extract_constant()
       end,
-      "e[x]tract [c]onstant",
+      "Extract Constant",
     }
 
     map {
@@ -242,7 +242,7 @@ local config = {
       function()
         jdtls.extract_method { visual = true }
       end,
-      "ext[r]act [m]ethod",
+      "Extract Method",
     }
 
     -- nvim-dap keymaps
@@ -252,15 +252,15 @@ local config = {
       function()
         jdtls.test_class()
       end,
-      "[t]est class",
+      "Test Class",
     }
     map {
       "n",
       "<localleader>dp",
       function()
         jdtls.pick_test()
       end,
-      "[p]ick test",
+      "Pick Test",
     }
     map {
       "n",
@@ -270,7 +270,7 @@ local config = {
           config = { console = "console" },
         }
       end,
-      "Test [n]ear method",
+      "Test Near method",
     }
   end,
 }
@@ -282,4 +282,4 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
   callback = function()
     vim.lsp.codelens.refresh()
   end,
-})
+})
diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua
@@ -2,7 +2,7 @@
 -- File         : markdown.lua
 -- Description  : filetype markdown extra config
 -- Author       : Kevin
--- Last Modified: 31 Mar 2024, 18:37
+-- Last Modified: 14 Jul 2024, 13:21
 -------------------------------------
 
 vim.opt_local.conceallevel = 2
@@ -13,23 +13,30 @@ vim.opt_local.linebreak = true
 vim.opt_local.autoindent = true
 vim.opt_local.formatoptions = "tcoqln"
 vim.opt_local.comments:append { "nb:+", "nb:>", "nb:-", "nb:." }
+vim.opt_local.spell = true
 
-vim.opt.spell = false
+-- NOTE: this is not working since `get_node_text` is returning a nil `range`
+--(match: table<integer, TSNode[]>, pattern: integer, source: string|integer, predicate: any[], metadata: table)
+-- local function conceal_with_icon(match, _, bufnr, pred, metadata)
+--   local capture_id = pred[2]
+--   local txt = vim.treesitter.get_node_text(match[capture_id], bufnr, metadata)
+--   vim.print(txt)
+-- vim.print("match", match[capture_id])
+-- vim.print("buf", bufnr)
+-- vim.print("pred", pred)
+-- vim.print("metadata", metadata)
 
-local function conceal_as_devicon(match, _, bufnr, pred, metadata)
-  if #pred == 2 then
-    -- (#as_devicon! @capture)
-    local capture_id = pred[2]
-    local lang = vim.treesitter.get_node_text(match[capture_id], bufnr)
-
-    local icon, _ = require("nvim-web-devicons").get_icon_by_filetype(lang,
-      { default = true })
-    metadata["conceal"] = icon
-  end
-end
-
-vim.treesitter.query.add_directive("as_devicon!", conceal_as_devicon,
-  { force = true, all = true })
+-- local range = metadata[capture_id].range or { match[capture_id]:range() }
+-- vim.print(range)
+-- vim.print(vim.treesitter.get_range)
+-- local range = vim.treesitter.get_range(match[capture_id], bufnr, metadata)
+-- vim.print(range)
+-- local node = vim.treesitter.get_node_text(match[capture_id], bufnr, metadata)
+--
+-- local icon = require("mini.icons").get("filetype", lang)
+-- metadata[capture_id]["conceal"] = icon
+-- end
+-- vim.treesitter.query.add_directive("as_icon!", conceal_with_icon, { force = true, all = true })
 
 -- add custom mappings only for markdown files
 -- if plugin 'peek' is installed
@@ -42,7 +49,6 @@ if has_peek then
       peek.open()
     end
   end, { desc = "Markdown Preview [Peek]" })
-else
-  vim.notify("Peek is not installed or loaded!\n Can't preview markdown!",
-    vim.log.levels.WARN)
+  -- else
+  --   vim.notify("Peek is not installed or loaded!\n Can't preview markdown!", vim.log.levels.WARN)
 end
diff --git a/after/ftplugin/sql.lua b/after/ftplugin/sql.lua
@@ -15,5 +15,3 @@ vim.opt_local.autoindent = true
 vim.opt_local.commentstring = "-- %s"
 
 vim.opt.spell = false
-
-require("lib").run_brew_service("postgresql@14", false)
diff --git a/after/ftplugin/tex.lua b/after/ftplugin/tex.lua
@@ -0,0 +1,18 @@
+-------------------------------------
+-- File         : tex.lua
+-- Description  : filetype tex extra config
+-- Author       : Kevin
+-- Last Modified: 10 Jul 2024, 09:02
+-------------------------------------
+
+vim.opt_local.conceallevel = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.wrap = true
+vim.opt_local.linebreak = true
+vim.opt_local.autoindent = true
+
+vim.opt_local.spell = true
+
+vim.g.vimtex_compiler_latexmk = {
+  aux_dir = string.format("%s/vimtex/aux_dir/%s", vim.fn.stdpath "cache", vim.fn.expand "%:t:r"),
+}
diff --git a/after/queries/markdown/highlights.scm b/after/queries/markdown/highlights.scm
@@ -40,10 +40,10 @@
   (task_list_marker_unchecked)
   ] @conceal (#set! conceal ""))
 
-
-;; (fenced_code_block
-;;   (info_string) @devicon
-;;   (#as_devicon! @devicon))
+; NOTE: due to markdown error
+; (fenced_code_block
+;   (info_string (language)) @as_icon
+;   (#as_icon! @as_icon))
 
 ([
   (block_quote_marker)

diff --git a/init.lua b/init.lua
@@ -2,7 +2,7 @@
 -- File         : init.lua
 -- Description  : NeoVim configuration
 -- Author       : Kevin
--- Last Modified: 09 May 2024, 10:04
+-- Last Modified: 13 Jul 2024, 16:10
 --------------------------------------
 
 -- Set leader key

diff --git a/lazy-lock.json b/lazy-lock.json
@@ -1,5 +1,5 @@
 {
-  "SchemaStore.nvim": { "branch": "main", "commit": "b606847df9f91ab6a7d0484c2e3fae096c9fe028" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "57116dd9fd9ee4d73c1e9a1335d92b4c71851cf7" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
@@ -8,53 +8,52 @@
   "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-vimtex": { "branch": "master", "commit": "a64b1b5eec0460144c91c4f20a45c74b8ded48ae" },
   "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
-  "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
+  "conform.nvim": { "branch": "master", "commit": "acc7d93f4a080fec587a99fcb36cffa29adc4bad" },
   "data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d44a7948ffc717af578c424add818b7684c7ed68" },
-  "image.nvim": { "branch": "master", "commit": "7d021c94e231d491355f5e724ba357ace296f06d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
+  "go.nvim": { "branch": "master", "commit": "033344ddfa3cd5cfd55037903264b2bb86691619" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
-  "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" },
-  "lazydev.nvim": { "branch": "main", "commit": "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8" },
+  "lazy.nvim": { "branch": "main", "commit": "6ca90a21202808796418e46d3cebfbb5a44e54a2" },
+  "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
-  "mini.clue": { "branch": "main", "commit": "847376b3a044129348cea9eedb841106379e0796" },
+  "mini.icons": { "branch": "main", "commit": "9d9d21868841ce0a26fb2b8ef0eba7021055145c" },
   "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
-  "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" },
-  "molten-nvim": { "branch": "main", "commit": "df5ccef3b6fda3582f7746e45327ee031f668826" },
-  "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
+  "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
+  "molten-nvim": { "branch": "main", "commit": "eb6d0fe33e14989b0f1fbe25d9732889ee57bd1a" },
+  "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
-  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-dbee": { "branch": "master", "commit": "85622c8d95b53f62329627fd461c52fca7cb612b" },
-  "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dbee": { "branch": "master", "commit": "5062efbe5dfa3c0c6a51f5112c671f6625053f39" },
+  "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
-  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
+  "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" },
-  "nvim-treesitter": { "branch": "master", "commit": "8a04f1aaa9f6fdd1f29e68a33ef9a1ae0423816c" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "cc908326c93473041d44398d5ebfa2bb4169d649" },
+  "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
+  "nvim-treesitter": { "branch": "master", "commit": "355af0c8cef433fd5f0aa6cd05b62ad618df1609" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
-  "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "obsidian.nvim": { "branch": "main", "commit": "f0bc495b4a3852a83b48636e9f564586f5e2d29e" },
-  "oil.nvim": { "branch": "master", "commit": "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54" },
-  "otter.nvim": { "branch": "main", "commit": "e8787988f2f51dc4678aa13c4553613fff0132b5" },
+  "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" },
+  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
+  "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
+  "otter.nvim": { "branch": "main", "commit": "0cd6d5a3c04a2aec73899f68fb75dfee3225499a" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" },
-  "quarto-nvim": { "branch": "main", "commit": "09fabb62d414e56ee3245c558aaedbdc662b6493" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
+  "quarto-nvim": { "branch": "main", "commit": "eed598983fa4040eed77191f69462c1348770b8a" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" },
   "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
-  "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" },
-  "vimtex": { "branch": "master", "commit": "2dc2a5435809c13f6f4aa07964be4ef19a7864f5" },
-  "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
-}
+  "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" },
+  "vimtex": { "branch": "master", "commit": "80c9bc179784c30192d482741a43f176c859daa1" },
+  "which-key.nvim": { "branch": "main", "commit": "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131" }
+}
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
@@ -22,6 +22,9 @@ require("lazy").setup({
   dev = {
     path = "~/dev",
   },
+  -- rocks = {
+  --   hererocks = true,
+  -- },
   install = {
     missing = false,
     colorscheme = { "knvim", "default" },
@@ -65,8 +68,8 @@ require("lazy").setup({
         "matchparen",
         "netrwPlugin",
         "tarPlugin",
-        -- "tohtml",
         "tutor",
+        -- "tohtml",
         -- "zipPlugin",
         -- "spellfile",
       },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,3 @@ vim.opt_local.autoindent = true
		vim.opt_local.commentstring = "-- %s"

		vim.opt.spell = false

		require("lib").run_brew_service("postgresql@14", false)