Skip to content

Commit

Permalink
chore: QOL improvements and some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Manca committed Feb 8, 2025
1 parent f59ac34 commit e6fb9d7
Show file tree
Hide file tree
Showing 11 changed files with 131 additions and 121 deletions.
13 changes: 6 additions & 7 deletions after/ftplugin/java.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if not has_jdtls then
return
end

local javaBin = vim.fn.expand [[C:\Program Files\Amazon Corretto\jdk17.0.13_11\bin\java.exe]]
local javaBin = vim.fn.expand [[C:\Program Files\Amazon Corretto\jdk17.0.14_7\bin\java.exe]]

local data_path = vim.fn.stdpath "data"

Expand All @@ -22,9 +22,8 @@ extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
extendedClientCapabilities.document_formatting = false

local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew", "pom.xml" })
or vim.fs.dirname(vim.api.nvim_buf_get_name(0))
local cache_dir = vim.fn.stdpath "cache"
local project_name = vim.fs.basename(root_dir or vim.uv.cwd())
local project_name = vim.fs.basename(root_dir or vim.fs.dirname(vim.api.nvim_buf_get_name(0)))
local workspace_dir = string.format("%s/java/wksp/%s", cache_dir, project_name)

local launcher_path = vim.fn.glob(data_path .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar", true)
Expand Down Expand Up @@ -113,15 +112,15 @@ local config = {
runtimes = {
{
name = "JavaSE-17",
path = [[C:\Program Files\Amazon Corretto\jdk17.0.13_11]],
path = [[C:\Program Files\Amazon Corretto\jdk17.0.14_7]],
},
{
name = "JavaSE-1.8",
path = [[C:\Program Files\Amazon Corretto\jdk1.8.0_432]],
path = [[C:\Program Files\Amazon Corretto\jdk1.8.0_442]],
},
{
name = "JavaSE-11",
path = [[C:\Program Files\Amazon Corretto\jdk11.0.25_9]],
path = [[C:\Program Files\Amazon Corretto\jdk11.0.26_4]],
},
},
},
Expand Down Expand Up @@ -284,4 +283,4 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
end,
})

require("lib.gradle").setup { root_dir = root_dir }
require("lib.gradle").setup { root_dir = root_dir }
13 changes: 13 additions & 0 deletions after/ftplugin/pdf.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-------------------------------------
-- File : pdf.lua
-- Description : filetype PDF extra config
-- Author : Kevin
-- Last Modified: 18 Jul 2024, 09:57
-------------------------------------

vim.api.nvim_set_option_value("readonly", true, { buf = 0 })
if not vim.fn.executable "pdftotext" then
vim.notify("vim-pdf: pdftotext is not found.\nStop converting...", vim.log.levels.ERROR)
return
end
require("lib.pdf").load_pdf(vim.api.nvim_buf_get_name(0))
12 changes: 11 additions & 1 deletion after/ftplugin/qf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@ local del_qf_item = function()
end

vim.keymap.set("n", "dd", del_qf_item, { silent = true, buffer = true, desc = "Remove entry from QF" })
vim.keymap.set("v", "D", del_qf_item, { silent = true, buffer = true, desc = "Remove entry from QF" })
vim.keymap.set("v", "D", del_qf_item, { silent = true, buffer = true, desc = "Remove entry from QF" })

vim.keymap.set("n", "<C-k>", "<cmd>cprev<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "<C-j>", "<cmd>cnext<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "<C-l>", "<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "q", function()
vim.cmd.quit { bang = true }
end, { buffer = true, silent = true })
vim.keymap.set("n", "<esc>", function()
vim.cmd.quit { bang = true }
end, { buffer = true, silent = true })
13 changes: 13 additions & 0 deletions after/ftplugin/xml.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-------------------------------------
-- File : xml.lua
-- Description : filetype xml extra config
-- Author : Kevin
-- Last Modified: 05/01/2025 - 11:39
-------------------------------------

vim.api.nvim_create_user_command("UnescapeXml",
[[:%s/\&amp;/&/g | %s/\&lt;/</g | %s/\&gt;/>/g | %s/\&apos;/'/g | %s/\&quot;/"./g]],
{ desc = "Unescape Xml file" })
vim.api.nvim_create_user_command("EscapeXml",
[[:%s/&/\&amp;/g | %s/</\&lt;/g | %s/>/\&gt;/g | %s/'/\&apos;/g | %s/"/\&quot;/g]],
{ desc = "Escape Xml file" })
52 changes: 26 additions & 26 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
{
"SchemaStore.nvim": { "branch": "main", "commit": "feaa60d3451d7f7e52eaf76a07ea52808d68cf6c" },
"SchemaStore.nvim": { "branch": "main", "commit": "118e563101169e8c5096023bc45c460e4c4fb77c" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
"conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" },
"gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"kurayami.nvim": { "branch": "main", "commit": "57af5981ee831d53f7a61d697a50f4bda0f681de" },
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
"lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
"markdown.nvim": { "branch": "main", "commit": "17a77463f945c4b9e4f371c752efd90e3e1bf604" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"molten-nvim": { "branch": "main", "commit": "c621baf53459a6c45dfd98dcc11cbba7a7ae9470" },
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
"mini.surround": { "branch": "main", "commit": "f40be56134835421061bf32c3702de9a29fb789c" },
"molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
"nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
"nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
"nvim-jdtls": { "branch": "master", "commit": "baae618ccc7b6045f7d9453ea0566d1333100740" },
"nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
"nvim-lspconfig": { "branch": "master", "commit": "355c565eae59810c1af4cf132938fa0fc251c5a2" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
"nvim-treesitter": { "branch": "master", "commit": "984214ef8e4ca18d77639663319aabdfba89632f" },
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dbee": { "branch": "master", "commit": "98af3ed1fa93038030e48a0651dc762e851aa8b7" },
"nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" },
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
"nvim-lspconfig": { "branch": "master", "commit": "75edb91a3d2deabe76a9911cde2c13d411b3b097" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
"nvim-treesitter": { "branch": "master", "commit": "48f7ce34ef274af10a3b2aa24932a310b1bd055d" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
"nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" },
"otter.nvim": { "branch": "main", "commit": "3ff6c154d55528fbde475b2a722f91389421e873" },
"oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
"otter.nvim": { "branch": "main", "commit": "0e42fa795c35c7190935e3beda3791189c41bb72" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" },
"quarto-nvim": { "branch": "main", "commit": "abc417c7e7422033f1090c0da5f30ef3ecb0c7ca" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
"vimtex": { "branch": "master", "commit": "c8412f444bfaf447981242d685c40e45b1c96b82" },
"which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
"vimtex": { "branch": "master", "commit": "dfaf26c2cafddf61963ebeff28437352002691ac" },
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
}
2 changes: 2 additions & 0 deletions lua/plugins/editor/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ return {
["<C-k>"] = { "select_prev", "fallback" },
["<C-j>"] = { "select_next", "fallback" },
["<C-Space>"] = { "show", "hide" },
["<Tab>"] = { "show", "select_next" },
["<S-Tab>"] = { "show", "select_prev" },
["<C-e>"] = { "cancel" },
},
ghost_text = { enabled = true },
Expand Down
9 changes: 9 additions & 0 deletions lua/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ local M = {
{
"GCBallesteros/jupytext.nvim",
event = { "BufReadPre *.ipynb", "BufNewFile *.ipynb" },
enabled = function()
return vim.fn.has "win32" ~= 1
end,
init = function(p)
if vim.fn.argc() == 1 then
local argv = tostring(vim.fn.argv(0))
Expand Down Expand Up @@ -260,6 +263,9 @@ local M = {
{
"benlubas/molten-nvim",
ft = { "qmd", "jupyter_notebook", "quarto" },
enabled = function()
return vim.fn.has "win32" ~= 1
end,
version = "^1.0.0",
build = ":UpdateRemotePlugins",
init = function()
Expand Down Expand Up @@ -353,6 +359,9 @@ local M = {
{
"quarto-dev/quarto-nvim",
ft = { "quarto" },
enabled = function()
return vim.fn.has "win32" ~= 1
end,
opts = function(_, o)
o.codeRunner = {
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion lua/plugins/lsp/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ local function set_buf_keymaps(client, bufnr)
nmap { "<leader>ll", vim.lsp.codelens.run, "CodeLens" }

-- Enable completion on <c-x><c-o>
-- vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
end

--- Set buffer capabilities if supported by the passed client and buffer id
Expand Down
5 changes: 4 additions & 1 deletion lua/plugins/utils/databases.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ return {
"kndndrj/nvim-dbee",
ft = { "sql", "mysql" },
-- commit = "5062efbe5dfa3c0c6a51f5112c671f6625053f39",
enabled = function()
return vim.fn.has "win32" ~= 1
end,
cmd = "Dbee",
build = function()
require("dbee").install()
Expand Down Expand Up @@ -72,4 +75,4 @@ return {
},
}
end,
}
}
129 changes: 45 additions & 84 deletions plugin/autocommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,6 @@ autocmd("FileType", {
end,
})

---QuickFixList keymaps
autocmd("FileType", {
group = augroup("_maps_qf_ft", { clear = true }),
pattern = "qf",
callback = function()
vim.keymap.set("n", "<C-k>", "<cmd>cprev<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "<C-j>", "<cmd>cnext<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "<C-l>", "<CR>", { buffer = true, silent = true })
vim.keymap.set("n", "q", function()
vim.cmd.quit { bang = true }
end, { buffer = true, silent = true })
vim.keymap.set("n", "<esc>", function()
vim.cmd.quit { bang = true }
end, { buffer = true, silent = true })
end,
})

autocmd("FileType", {
group = augroup("_autocmd_statuscolumn", { clear = true }),
Expand All @@ -128,53 +112,53 @@ autocmd("FileType", {

---Autocmd for `NNN` cli tools useful
--- to quit buffer used by it for help and similar things
autocmd({ "BufNewFile", "BufRead" }, {
group = augroup("_ft_nnn_quit_on_q", { clear = true }),
pattern = "/tmp/.nnn*",
callback = function()
vim.keymap.set("n", "q", function()
vim.cmd.quit { bang = true }
end, { buffer = true, silent = true })
vim.keymap.set("n", "<esc>", function()
vim.cmd.quit { bang = true }
end, { buffer = true })
end,
})
-- autocmd({ "BufNewFile", "BufRead" }, {
-- group = augroup("_ft_nnn_quit_on_q", { clear = true }),
-- pattern = "/tmp/.nnn*",
-- callback = function()
-- vim.keymap.set("n", "q", function()
-- vim.cmd.quit { bang = true }
-- end, { buffer = true, silent = true })
-- vim.keymap.set("n", "<esc>", function()
-- vim.cmd.quit { bang = true }
-- end, { buffer = true })
-- end,
-- })

---Check if want to install Treesitter parser for current
---filetype if missing
autocmd("FileType", {
group = augroup("_check_ft_ts_parser", { clear = true }),
pattern = "*",
callback = function(ev)
if not filetypes_to_exclude[ev.match] then
local has_ts, ts_parsers = pcall(require, "nvim-treesitter.parsers")
if not has_ts then
return
end

local lang = ts_parsers.get_buf_lang()
local donot_ask_install = vim.g.dont_ask_install or {}
if
ts_parsers.get_parser_configs()[lang]
and not ts_parsers.has_parser(lang)
and not donot_ask_install[lang] == true
then
vim.schedule_wrap(function()
local msg = string.format("Install missing TS parser for < %s >?", lang)
local choice = vim.fn.confirm(msg, "&Yes\n&No")

if choice == 1 then
vim.cmd.TSInstall(lang)
else
donot_ask_install[lang] = true
vim.g.dont_ask_install = donot_ask_install
end
end)()
end
end
end,
})
-- autocmd("FileType", {
-- group = augroup("_check_ft_ts_parser", { clear = true }),
-- pattern = "*",
-- callback = function(ev)
-- if not filetypes_to_exclude[ev.match] then
-- local has_ts, ts_parsers = pcall(require, "nvim-treesitter.parsers")
-- if not has_ts then
-- return
-- end
--
-- local lang = ts_parsers.get_buf_lang()
-- local donot_ask_install = vim.g.dont_ask_install or {}
-- if
-- ts_parsers.get_parser_configs()[lang]
-- and not ts_parsers.has_parser(lang)
-- and not donot_ask_install[lang] == true
-- then
-- vim.schedule_wrap(function()
-- local msg = string.format("Install missing TS parser for < %s >?", lang)
-- local choice = vim.fn.confirm(msg, "&Yes\n&No")
--
-- if choice == 1 then
-- vim.cmd.TSInstall(lang)
-- else
-- donot_ask_install[lang] = true
-- vim.g.dont_ask_install = donot_ask_install
-- end
-- end)()
-- end
-- end
-- end,
-- })

---Set makeprg and keywordprg for filetype (using default compiler when available)
-- autocmd("FileType", {
Expand Down Expand Up @@ -258,29 +242,6 @@ autocmd({ "BufRead", "BufNewFile" }, {
end,
})

---Start postgresql service on sql files
-- autocmd("FileType", {
-- group = augroup("_postres_service", { clear = true }),
-- pattern = { "sql" },
-- once = true, -- don't run again on other sql files
-- callback = function()
-- require("lib").run_brew_service("postgresql@14", false)
-- end,
-- })

---Read PDF into neovim, using pdftotext binary
autocmd("FileType", {
group = augroup("_pdf_reader", { clear = true }),
pattern = { "pdf", "PDF" },
callback = function(ev)
vim.api.nvim_set_option_value("readonly", true, { buf = ev.buf })
if not vim.fn.executable "pdftotext" then
vim.notify("vim-pdf: pdftotext is not found.\nStop converting...", vim.log.levels.ERROR)
return
end
require("lib.pdf").load_pdf(ev.file)
end,
})

---Hex
autocmd("FileType", {
Expand Down Expand Up @@ -332,4 +293,4 @@ autocmd("BufNewFile", {
end
end
end,
})
})
2 changes: 1 addition & 1 deletion plugin/usercommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ vim.api.nvim_create_user_command("Session", function(arg)
end, {
nargs = "?",
desc = "Session Manager",
-- complete = "custom,v:lua.require'lib.session'.usercmd_session_completion",
complete = "custom,v:lua.require'lib.session'.usercmd_session_completion",
})

---Config File
Expand Down

0 comments on commit e6fb9d7

Please sign in to comment.