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
kevinm6 committed Feb 8, 2025
1 parent c3aff5b commit fd19510
Show file tree
Hide file tree
Showing 12 changed files with 115 additions and 205 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,14 @@
- [Which-Key](https://github.com/folke/which-key.nvim)
- [Mason](https://github.com/williamboman/mason.nvim)
- [Mason-lspconfig](https://github.com/williamboman/mason-lspconfig.nvim)
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
- [blink-cmp](https://github.com/saghen/blink.cmp)
- [Dap](https://github.com/mfussenegger/nvim-dap)
- [Gitsigns](https://github.com/lewis6991/gitsigns.nvim)
- [Luasnip](https://github.com/L3MON4D3/LuaSnip)
- [None-ls](https://github.com/nvimtools/none-ls.nvim)
- [Which-Key](https://github.com/folke/which-key.nvim)
- [Notify](https://github.com/rcarriga/nvim-notify)
- [Noice](https://github.com/folke/noice.nvim)
- [ToggleTerm](https://github.com/akinsho/toggleterm.nvim)
- [Mini-Surround](https://github.com/echasnovski/mini.surround)
- [Mini-Autopairs](https://github.com/echasnovski/mini.pairs)
- [Mini-Pairs](https://github.com/echasnovski/mini.pairs)
- [Ufo](https://github.com/kevinhwang91/nvim-ufo)
- [Oil](https://github.com/stevearc/oil.nvim)
- [Markdown-Render](https://github.com/MeanderingProgrammer/markdown.nvim)
Expand Down
6 changes: 3 additions & 3 deletions after/ftplugin/lua.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
-- Last Modified: 19/01/2025 - 10:15
-------------------------------------

vim.keymap.set("n", "<leader>r", "<cmd>lua<CR>", { desc = "Execute current line" })
vim.keymap.set("n", "<leader>R", "<cmd>% lua<CR>", { desc = "Execute the current file" })
vim.keymap.set("x", "<leader>r", ":'<,'>lua<CR>", { desc = "Execute current selection" })
vim.keymap.set("n", "<leader>r", "<cmd>lua<CR>", { desc = "Execute current line", buffer = true })
vim.keymap.set("n", "<leader>R", "<cmd>% lua<CR>", { desc = "Execute the current file", buffer = true })
vim.keymap.set("x", "<leader>r", ":'<,'>lua<CR>", { desc = "Execute current selection", buffer = true })
5 changes: 5 additions & 0 deletions after/ftplugin/markdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ vim.keymap.set("n", "<leader>p", function()
local buf = vim.api.nvim_buf_get_name(0)
vim.system({ "qlmanage", "-p", buf, ">", "/dev/null" }, { text = true }):wait()
end, { desc = "Preview Markdown", buffer = true })

---Export to PDF
vim.api.nvim_create_user_command("TOpdf", function()
require("lib.pdf").convert_md_to_pdf()
end, { desc = "Export markdown to pdf" })
14 changes: 14 additions & 0 deletions after/ftplugin/pdf.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-------------------------------------
-- File : pdf.lua
-- Description : PDF filetype extra config
-- Author : Kevin
-- Last Modified: 08/02/2025 - 09:43
-------------------------------------

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))
22 changes: 20 additions & 2 deletions after/ftplugin/qf.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
-------------------------------------
-- File : qf.lua
-- Description : filetype qf extra config
-- Author : Kevin
-- Last Modified: 20/10/2024 - 19:10
-------------------------------------

local del_qf_item = function()
local items = vim.fn.getqflist()
local line = vim.fn.line('.')
local line = vim.fn.line "."
table.remove(items, line)
vim.fn.setqflist(items, "r")
vim.api.nvim_win_set_cursor(0, { line, 0 })
end

---Keymaps
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 })

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" })
3 changes: 3 additions & 0 deletions after/ftplugin/sql.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ vim.opt_local.autoindent = true
vim.opt_local.commentstring = "-- %s"

vim.opt.spell = false

---Start postgresql service on sql files (Mac)
-- require("lib").run_brew_service("postgresql@14", false)
82 changes: 0 additions & 82 deletions after/syntax/freemarker.vim

This file was deleted.

30 changes: 15 additions & 15 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"SchemaStore.nvim": { "branch": "main", "commit": "4244700eff0a9258b88f48b2b0d0339dea3338af" },
"SchemaStore.nvim": { "branch": "main", "commit": "b265e7b68308c9b68581d57c3f79419ce5e8dca2" },
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
"gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" },
"go.nvim": { "branch": "master", "commit": "79857f92433d18857167cdc18c417701778185bf" },
"gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" },
"go.nvim": { "branch": "master", "commit": "9ecbd0950bac754d9c449ca79e883ab6b230bda2" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" },
"lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
"markdown.nvim": { "branch": "main", "commit": "b9c98ff7d47dfe2a972f1b08340850c92e6ca9bc" },
"markdown.nvim": { "branch": "main", "commit": "5c2440d932a4ba96840e5ce5a7bd40f0624bdaa2" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
"mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" },
"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": "b4f27d451c187de912fa8d3229025a952917eb9e" },
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dbee": { "branch": "master", "commit": "495f6f718ccfb98eba51c7998e30f3f3ea6e95e1" },
"nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" },
"nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
"nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" },
"nvim-dbee": { "branch": "master", "commit": "f9aa10f113ae439ef20c6d8b91b27dab93274360" },
"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": "bcd0b26607c1a4336c392285a9f13e31f514ccf2" },
"nvim-treesitter": { "branch": "master", "commit": "62911c78a868bac24c8a86f2c1c412d0b799f885" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
"otter.nvim": { "branch": "main", "commit": "3ff6c154d55528fbde475b2a722f91389421e873" },
"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" },
"sqls.nvim": { "branch": "main", "commit": "a514379f5f89bf72955ed3bf5c1c31a40b8a1472" },
"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": "3a9f47ce6e42c4a3c9a92a254f1f611a8d374fc9" },
"vimtex": { "branch": "master", "commit": "dfaf26c2cafddf61963ebeff28437352002691ac" },
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
}
17 changes: 9 additions & 8 deletions lua/lib/compiler.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@ local function getCommand(command)
local filepath = vim.fn.expand "%:p"
local clean_cmd = command

command = command:gsub("$fileNameWithoutExt", vim.fn.fnamemodify(filepath, ":t:r"))
command = command:gsub("$fileName", vim.fn.fnamemodify(filepath, ":t"))
command = command:gsub("$file", filepath)
command = command:gsub("$dir", vim.fn.fnamemodify(filepath, ":p:h"))
command = command:gsub("$dName", vim.fn.fnamemodify(vim.uv.cwd() or vim.loop.cwd() or "", ":t"))
command = command:gsub("$end", "")
command = command
:gsub("$fileNameWithoutExt", vim.fn.fnamemodify(filepath, ":t:r"))
:gsub("$fileName", vim.fn.fnamemodify(filepath, ":t"))
:gsub("$file", filepath)
:gsub("$dir", vim.fn.fnamemodify(filepath, ":p:h"))
:gsub("$dName", vim.fn.fnamemodify(vim.uv.cwd() or vim.loop.cwd() or "", ":t"))
:gsub("$end", "")

return (command == clean_cmd) and command or string.format("%s %s", command, filepath)
end
Expand Down Expand Up @@ -164,12 +165,12 @@ end
---In this way, only if user wants to compile/run the file, prompt the selection
---@param buf any bufId for which set keymap
local function set_keymaps(buf)
local icons = require "lib.icons"
local icons = require "mini.icons"
local function map(tbl)
vim.keymap.set("n", tbl[1], tbl[2], { buffer = buf, desc = "Run❭ " .. tbl[3] })
end

vim.keymap.set({ "n", "v" }, "<leader>R", function() end, { buffer = buf, desc = icons.debug.run .. " Run" })
vim.keymap.set({ "n", "v" }, "<leader>R", function() end, { buffer = buf, desc = icons.file.rerun .. " Run" })

local function run_file_cmd()
if not compiler.compilers[vim.bo.filetype] then
Expand Down
4 changes: 2 additions & 2 deletions lua/plugins/ui/dashboard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ return {

db_btn("f", "󰾰 Find file", "<cmd>lua require 'lib'.find_files()<CR>"),
db_btn("r", " Recent files", "<cmd>lua require 'lib'.recent_files()<CR>"),
db_btn("R", " Find project", "<cmd>lua require 'lib'.projects()<CR>"),
db_btn("p", " Find project", "<cmd>lua require 'lib'.projects()<CR>"),
db_btn("d", "󰾰 Developer", [[<cmd>lua require "lib".dev_folder()<CR>]]),
db_btn("L", " Plugin Manager", "<cmd>Lazy<CR>"),
db_btn("m", " Package Manager", "<cmd>Mason<CR>"),
Expand All @@ -111,4 +111,4 @@ return {
db.config.opts.noautocmd = true
alpha.setup(db.opts)
end,
}
}
Loading

0 comments on commit fd19510

Please sign in to comment.