diff options
20 files changed, 90 insertions, 93 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua index 8cd0c56..394a03f 100644 --- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua +++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua @@ -16,7 +16,7 @@ M.setup = function() vim.keymap.set("n", "gn", "<cmd>bnext<cr>", { desc = "bnext" }) vim.keymap.set("n", "gp", "<cmd>bprev<cr>", { desc = "bprev" }) vim.keymap.set("n", "gb", utils.buffer.bselect, { desc = "bselect" }) - vim.keymap.set("n", "gk", utils.documentation.open, { desc = "Documentation" }) + vim.keymap.set("n", "gk", utils.documentation.open, { desc = "documentation" }) vim.keymap.set("n", "K", function() if utils.hover.open() then -- Fix for diagnostics immediately overriding hover window @@ -25,7 +25,7 @@ M.setup = function() return "<Ignore>" end return "K" - end, { expr = true, desc = "Hover" }) + end, { expr = true, desc = "hover" }) vim.keymap.set("n", "<leader>q", "<cmd>qall<cr>", { desc = "quit" }) vim.keymap.set("n", "<leader>c", utils.buffer.bdelete, { desc = "bdelete" }) @@ -33,13 +33,13 @@ M.setup = function() vim.keymap.set("n", "<leader>z", "<cmd>tabclose<cr>", { desc = "tabclose" }) vim.keymap.set("n", "<leader>w", "<cmd>write<cr>", { desc = "write" }) - vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Up half page and center" }) - vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Down half page and center" }) - vim.keymap.set("n", "<a-j>", "<CMD>m +1<CR>", { desc = "Move line down" }) - vim.keymap.set("n", "<a-k>", "<CMD>m -2<CR>", { desc = "Move line up" }) - vim.keymap.set("v", "<a-k>", "<CMD>m '<-2<CR>gv=gv", { desc = "Move selection up" }) - vim.keymap.set("v", "<a-j>", "<CMD>m '>+1<CR>gv=gv", { desc = "Move selection down" }) - vim.keymap.set("i", "<C-c>", M.training_wheels, { desc = "Helper to quit using <C-c>" }) + vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "up half page and center" }) + vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "down half page and center" }) + vim.keymap.set("n", "<a-j>", "<CMD>m +1<CR>", { desc = "move line down" }) + vim.keymap.set("n", "<a-k>", "<CMD>m -2<CR>", { desc = "move line up" }) + vim.keymap.set("v", "<a-k>", "<CMD>m '<-2<CR>gv=gv", { desc = "move selection up" }) + vim.keymap.set("v", "<a-j>", "<CMD>m '>+1<CR>gv=gv", { desc = "move selection down" }) + vim.keymap.set("i", "<C-c>", M.training_wheels, { desc = "helper to quit using <C-c>" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/formatting.lua b/nvim/.config/nvim/lua/tobyvin/lsp/formatting.lua index 588c5c8..c08fe99 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/formatting.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/formatting.lua @@ -2,7 +2,7 @@ local formatting = {} formatting.setup = function() vim.api.nvim_create_autocmd("LspAttach", { - group = vim.api.nvim_create_augroup("tobyvin_lsp_formatting", { clear = true }), + group = vim.api.nvim_create_augroup("tobyvin_lsp_formatting", { clear = true }), desc = "setup lsp formatting", callback = function(args) local bufnr = args.buf @@ -14,12 +14,12 @@ formatting.setup = function() if client.server_capabilities.documentFormattingProvider then vim.api.nvim_buf_set_option(bufnr, "formatexpr", "v:lua.vim.lsp.formatexpr()") vim.api.nvim_buf_create_user_command(bufnr, "Format", vim.lsp.buf.format, { nargs = "*" }) - vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { desc = "Format", buffer = bufnr }) + vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { desc = "format", buffer = bufnr }) end if client.server_capabilities.documentRangeFormattingProvider then vim.api.nvim_buf_create_user_command(bufnr, "FormatRange", vim.lsp.buf.format, { nargs = "*" }) - vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { desc = "Format Range", buffer = bufnr }) + vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { desc = "format range", buffer = bufnr }) end end, }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index 289fe53..4d28bc9 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -464,13 +464,13 @@ M.setup = function() return end - utils.keymap.group("n", "<leader>p", { desc = "Packer" }) - vim.keymap.set("n", "<leader>pc", packer.compile, { desc = "Compile" }) - vim.keymap.set("n", "<leader>pC", packer.clean, { desc = "Clean" }) - vim.keymap.set("n", "<leader>pi", packer.install, { desc = "Install" }) - vim.keymap.set("n", "<leader>pp", packer.profile_output, { desc = "Profile" }) - vim.keymap.set("n", "<leader>ps", packer.sync, { desc = "Sync" }) - vim.keymap.set("n", "<leader>pu", packer.update, { desc = "Update" }) + utils.keymap.group("n", "<leader>p", { desc = "packer" }) + vim.keymap.set("n", "<leader>pc", packer.compile, { desc = "compile" }) + vim.keymap.set("n", "<leader>pC", packer.clean, { desc = "clean" }) + vim.keymap.set("n", "<leader>pi", packer.install, { desc = "install" }) + vim.keymap.set("n", "<leader>pp", packer.profile_output, { desc = "profile" }) + vim.keymap.set("n", "<leader>ps", packer.sync, { desc = "sync" }) + vim.keymap.set("n", "<leader>pu", packer.update, { desc = "update" }) return packer.startup({ function(...) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua index a787bed..42c8a88 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua @@ -170,15 +170,15 @@ M.setup = function() vim.api.nvim_create_autocmd("User", { pattern = "DapAttach", callback = function(args) - vim.keymap.set("n", "<leader>dc", dap.continue, { desc = "Continue", buffer = args.buf }) - vim.keymap.set("n", "<leader>da", dap.step_over, { desc = "Step Over", buffer = args.buf }) - vim.keymap.set("n", "<leader>di", dap.step_into, { desc = "Step Into", buffer = args.buf }) - vim.keymap.set("n", "<leader>do", dap.step_out, { desc = "Step Out", buffer = args.buf }) - vim.keymap.set("n", "<leader>dq", dap.terminate, { desc = "Terminate", buffer = args.buf }) - vim.keymap.set("n", "<F5>", dap.continue, { desc = "Continue", buffer = args.buf }) - vim.keymap.set("n", "<F10>", dap.step_over, { desc = "Step Over", buffer = args.buf }) - vim.keymap.set("n", "<F11>", dap.step_into, { desc = "Step Into", buffer = args.buf }) - vim.keymap.set("n", "<F12>", dap.step_out, { desc = "Step Out", buffer = args.buf }) + vim.keymap.set("n", "<leader>dc", dap.continue, { desc = "continue", buffer = args.buf }) + vim.keymap.set("n", "<leader>da", dap.step_over, { desc = "step over", buffer = args.buf }) + vim.keymap.set("n", "<leader>di", dap.step_into, { desc = "step into", buffer = args.buf }) + vim.keymap.set("n", "<leader>do", dap.step_out, { desc = "step out", buffer = args.buf }) + vim.keymap.set("n", "<leader>dq", dap.terminate, { desc = "terminate", buffer = args.buf }) + vim.keymap.set("n", "<F5>", dap.continue, { desc = "continue", buffer = args.buf }) + vim.keymap.set("n", "<F10>", dap.step_over, { desc = "step over", buffer = args.buf }) + vim.keymap.set("n", "<F11>", dap.step_into, { desc = "step into", buffer = args.buf }) + vim.keymap.set("n", "<F12>", dap.step_out, { desc = "step out", buffer = args.buf }) local dap_ui_widgets = require("dap.ui.widgets") @@ -221,9 +221,9 @@ M.setup = function() dap.listeners.before.event_terminated["close_repl"] = dap.repl.close dap.listeners.before.event_exited["close_repl"] = dap.repl.close - utils.keymap.group("n", "<leader>d", { desc = "Debug" }) - vim.keymap.set("n", "<leader>db", dap.toggle_breakpoint, { desc = "Toggle Breakpoint" }) - vim.keymap.set("n", "<leader>dB", M.set_custom_breakpoint, { desc = "Custom Breakpoint" }) + utils.keymap.group("n", "<leader>d", { desc = "debug" }) + vim.keymap.set("n", "<leader>db", dap.toggle_breakpoint, { desc = "toggle breakpoint" }) + vim.keymap.set("n", "<leader>dB", M.set_custom_breakpoint, { desc = "custom breakpoint" }) -- Signs vim.fn.sign_define("DapBreakpoint", utils.debug.signs.breakpoint) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dapui.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dapui.lua index e12e67a..0eb1875 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/dapui.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/dapui.lua @@ -29,8 +29,6 @@ M.open = function() dap.listeners.before.event_exited["dapui_config"] = M.close dap.listeners.before.disconnect["dapui_config"] = M.close - vim.keymap.set("n", "<leader>q", dap.terminate, { desc = "Quit (DAP)" }) - vim.api.nvim_create_autocmd("TabClosed", { group = vim.api.nvim_create_augroup("DapAU", { clear = true }), callback = function() @@ -45,8 +43,6 @@ M.close = function() dapui.close({}) - vim.keymap.set("n", "<leader>q", utils.buffer.quit, { desc = "Quit" }) - if M.dapui_tab and vim.api.nvim_tabpage_is_valid(M.dapui_tab) then local tabnr = vim.api.nvim_tabpage_get_number(M.dapui_tab) vim.cmd("tabclose " .. tabnr) @@ -63,8 +59,8 @@ M.setup = function() return end - vim.keymap.set("n", "<leader>de", M.eval, { desc = "Eval" }) - vim.keymap.set("n", "<leader>du", dapui.open, { desc = "DapUI" }) + vim.keymap.set("n", "<leader>de", M.eval, { desc = "eval" }) + vim.keymap.set("n", "<leader>du", dapui.open, { desc = "dapui" }) -- Attach DAP UI to DAP events vim.api.nvim_set_hl(0, "DapUIVariable", { link = "TSVariable" }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua b/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua index ddf9f89..7536852 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua @@ -1,15 +1,15 @@ local utils = require("tobyvin.utils") local M = {} -M.file_history = function() +local file_history = function() require("diffview").file_history(nil, vim.fn.bufname()) end -M.workspace_history = function() +local workspace_history = function() require("diffview").file_history() end -M.selection_history = function() +local selection_history = function() local first = vim.api.nvim_buf_get_mark(0, "<")[1] local last = vim.api.nvim_buf_get_mark(0, ">")[1] require("diffview").file_history({ first, last }) @@ -24,13 +24,13 @@ M.setup = function() diffview.setup() - local nmap = utils.keymap.group("n", "<leader>g", { desc = "Git" }) - nmap("d", diffview.open, { desc = "Diffview" }) - nmap("h", M.file_history, { desc = "File History" }) - nmap("H", M.workspace_history, { desc = "Workspace History" }) + utils.keymap.group("n", "<leader>g", { desc = "git" }) + vim.keymap.set("n", "<leader>gd", diffview.open, { desc = "diffview" }) + vim.keymap.set("n", "<leader>gh", file_history, { desc = "file history" }) + vim.keymap.set("n", "<leader>gH", workspace_history, { desc = "workspace history" }) - local vmap = utils.keymap.group("v", "<leader>g", { desc = "Git" }) - vmap("h", M.selection_history, { desc = "Selection History" }) + utils.keymap.group("v", "<leader>g", { desc = "git" }) + vim.keymap.set("v", "<leader>gh", selection_history, { desc = "selection history" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua index 07228fd..a208394 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua @@ -1,20 +1,20 @@ local utils = require("tobyvin.utils") local M = {} -M.with_range = function(callback) +local with_range = function(callback) return function() callback(utils.buffer.get_visual_range()) end end -M.show_blameline = function() +local show_blameline = function() require("gitsigns").blame_line({ full = true }) end -M.toggle_blameline = function() +local toggle_blameline = function() require("gitsigns").toggle_current_line_blame() end -M.next_hunk = function() +local next_hunk = function() local gitsigns = package.loaded.gitsigns if vim.wo.diff then return "]c" @@ -25,7 +25,7 @@ M.next_hunk = function() return "<Ignore>" end -M.prev_hunk = function() +local prev_hunk = function() local gitsigns = package.loaded.gitsigns if vim.wo.diff then return "[c" @@ -38,29 +38,29 @@ end M.on_attach = function(bufnr) local gitsigns = package.loaded.gitsigns - utils.keymap.group("n", "<leader>g", { desc = "Git", buffer = bufnr }) + utils.keymap.group("n", "<leader>g", { desc = "git", buffer = bufnr }) - vim.keymap.set("n", "]c", M.next_hunk, { expr = true, desc = "Next hunk", buffer = bufnr }) - vim.keymap.set("n", "[c", M.prev_hunk, { expr = true, desc = "Previous hunk", buffer = bufnr }) + vim.keymap.set("n", "]c", next_hunk, { expr = true, desc = "next hunk", buffer = bufnr }) + vim.keymap.set("n", "[c", prev_hunk, { expr = true, desc = "previous hunk", buffer = bufnr }) - vim.keymap.set("n", "<leader>gb", gitsigns.blame_line, { desc = "Show blame", buffer = bufnr }) - vim.keymap.set("n", "<leader>gB", M.show_blameline, { desc = "Show blame", buffer = bufnr }) - vim.keymap.set("n", "<leader>g<C-b>", M.toggle_blameline, { desc = "Toggle blame", buffer = bufnr }) + vim.keymap.set("n", "<leader>gb", gitsigns.blame_line, { desc = "show blame", buffer = bufnr }) + vim.keymap.set("n", "<leader>gB", show_blameline, { desc = "show blame", buffer = bufnr }) + vim.keymap.set("n", "<leader>g<C-b>", toggle_blameline, { desc = "toggle blame", buffer = bufnr }) - vim.keymap.set("n", "<leader>gp", gitsigns.preview_hunk, { desc = "Preview Hunk", buffer = bufnr }) - vim.keymap.set("n", "<leader>gr", gitsigns.reset_hunk, { desc = "Reset Hunk", buffer = bufnr }) - vim.keymap.set("n", "<leader>gs", gitsigns.stage_hunk, { desc = "Stage Hunk", buffer = bufnr }) - vim.keymap.set("n", "<leader>gu", gitsigns.undo_stage_hunk, { desc = "Undo Stage Hunk", buffer = bufnr }) + vim.keymap.set("n", "<leader>gp", gitsigns.preview_hunk, { desc = "preview hunk", buffer = bufnr }) + vim.keymap.set("n", "<leader>gr", gitsigns.reset_hunk, { desc = "reset hunk", buffer = bufnr }) + vim.keymap.set("n", "<leader>gs", gitsigns.stage_hunk, { desc = "stage hunk", buffer = bufnr }) + vim.keymap.set("n", "<leader>gu", gitsigns.undo_stage_hunk, { desc = "undo stage hunk", buffer = bufnr }) - vim.keymap.set("n", "<leader>gR", gitsigns.reset_buffer, { desc = "Reset Buffer", buffer = bufnr }) - vim.keymap.set("n", "<leader>gS", gitsigns.stage_buffer, { desc = "Stage Buffer", buffer = bufnr }) - vim.keymap.set("n", "<leader>gU", gitsigns.reset_buffer_index, { desc = "Undo Stage Buffer", buffer = bufnr }) + vim.keymap.set("n", "<leader>gR", gitsigns.reset_buffer, { desc = "reset buffer", buffer = bufnr }) + vim.keymap.set("n", "<leader>gS", gitsigns.stage_buffer, { desc = "stage buffer", buffer = bufnr }) + vim.keymap.set("n", "<leader>gU", gitsigns.reset_buffer_index, { desc = "undo stage buffer", buffer = bufnr }) - utils.keymap.group("v", "<leader>g", { desc = "Git", buffer = bufnr }) - vim.keymap.set("v", "<leader>gp", M.with_range(gitsigns.preview_hunk), { desc = "Preview Hunk", buffer = bufnr }) - vim.keymap.set("v", "<leader>gr", M.with_range(gitsigns.reset_hunk), { desc = "Reset Hunk", buffer = bufnr }) - vim.keymap.set("v", "<leader>gs", M.with_range(gitsigns.stage_hunk), { desc = "Stage Hunk", buffer = bufnr }) - vim.keymap.set("v", "<leader>gu", M.with_range(gitsigns.undo_stage_hunk), { desc = "Unstage Hunk", buffer = bufnr }) + utils.keymap.group("v", "<leader>g", { desc = "git", buffer = bufnr }) + vim.keymap.set("v", "<leader>gp", with_range(gitsigns.preview_hunk), { desc = "preview hunk", buffer = bufnr }) + vim.keymap.set("v", "<leader>gr", with_range(gitsigns.reset_hunk), { desc = "reset hunk", buffer = bufnr }) + vim.keymap.set("v", "<leader>gs", with_range(gitsigns.stage_hunk), { desc = "stage hunk", buffer = bufnr }) + vim.keymap.set("v", "<leader>gu", with_range(gitsigns.undo_stage_hunk), { desc = "unstage hunk", buffer = bufnr }) vim.api.nvim_exec_autocmds("User", { pattern = "GitAttach", data = { buf = bufnr } }) end diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua index cdf85d4..dd7c78a 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua @@ -28,7 +28,7 @@ M.setup = function() desc = "lsp", callback = function(args) local lspinfo = require("lspconfig.ui.lspinfo") - vim.keymap.set("n", "<leader>li", lspinfo, { desc = "LSP info", buffer = args.buf }) + vim.keymap.set("n", "<leader>li", lspinfo, { desc = "lsp info", buffer = args.buf }) end, }) end diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason-lspconfig.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason-lspconfig.lua index 9581d36..bcdf9ca 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/mason-lspconfig.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason-lspconfig.lua @@ -18,7 +18,7 @@ M.setup = function() callback = function(args) local client = vim.lsp.get_client_by_id(args.data.client_id) if client.name ~= "null-ls" then - vim.keymap.set("n", "<leader>lI", M.install, { desc = "LSP Install", buffer = args.buf }) + vim.keymap.set("n", "<leader>lI", M.install, { desc = "lsp install", buffer = args.buf }) end end, }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua index b200bfa..89dce5f 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua @@ -18,7 +18,7 @@ M.setup = function() callback = function(args) local client = vim.lsp.get_client_by_id(args.data.client_id) if client.name == "null-ls" then - vim.keymap.set("n", "<leader>lN", M.install, { desc = "Null-LS Install", buffer = args.buf }) + vim.keymap.set("n", "<leader>lN", M.install, { desc = "null-ls install", buffer = args.buf }) end end, }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason-nvim-dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason-nvim-dap.lua index d846c4e..0cca51f 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/mason-nvim-dap.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason-nvim-dap.lua @@ -13,7 +13,7 @@ M.setup = function() mason_nvim_dap.setup() - vim.keymap.set("n", "<leader>dI", M.install, { desc = "Dap Install" }) + vim.keymap.set("n", "<leader>dI", M.install, { desc = "dap install" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason-update-all.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason-update-all.lua index a80f27c..bf59763 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/mason-update-all.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason-update-all.lua @@ -9,7 +9,7 @@ M.setup = function() mason_update_all.setup() - vim.keymap.set("n", "<leader>M", mason_update_all.update_all, { desc = "Update All" }) + vim.keymap.set("n", "<leader>M", mason_update_all.update_all, { desc = "update all" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua index ce0c52e..9838aa9 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua @@ -21,7 +21,7 @@ M.setup = function() }, }) - vim.keymap.set("n", "<leader>m", M.install, { desc = "Mason" }) + vim.keymap.set("n", "<leader>m", M.install, { desc = "mason" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua index 01c5c05..471c181 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua @@ -16,8 +16,8 @@ M.setup = function() }, }) - utils.keymap.group("n", "<leader>g", { desc = "Git" }) - vim.keymap.set("n", "<leader>gg", neogit.open, { desc = "Neogit" }) + utils.keymap.group("n", "<leader>g", { desc = "git" }) + vim.keymap.set("n", "<leader>gg", neogit.open, { desc = "neogit" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua b/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua index 613029e..dc4155a 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua @@ -9,7 +9,7 @@ M.setup = function() end notify.setup({ - background_colour = "#" .. vim.api.nvim_get_hl_by_name("Pmenu", "rgb").background, + background_colour = "#" .. vim.api.nvim_get_hl_by_name("Pmenu", true).background, }) vim.notify = notify @@ -17,8 +17,9 @@ M.setup = function() local telescope_ok, telescope = pcall(require, "telescope") if telescope_ok then telescope.load_extension("notify") - local nmap = utils.keymap.group("n", "<leader>f", { desc = "Find" }) - nmap("n", telescope.extensions.notify.notify, { desc = "Notifications" }) + + utils.keymap.group("n", "<leader>f", { desc = "find" }) + vim.keymap.set("n", "<leader>fn", telescope.extensions.notify.notify, { desc = "notifications" }) end end diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua index 3fba5c2..fff115a 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua @@ -26,7 +26,7 @@ M.setup = function() null_ls.builtins.formatting.cbfmt, }, on_attach = function(_, bufnr) - vim.keymap.set("n", "<leader>ln", "<CMD>NullLsInfo<CR>", { desc = "Null-LS Info", buffer = bufnr }) + vim.keymap.set("n", "<leader>ln", "<CMD>NullLsInfo<CR>", { desc = "null-ls info", buffer = bufnr }) end, }) end diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua index 7f178b2..27674f9 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua @@ -70,10 +70,10 @@ M.setup = function() local expand_macro = rust_tools.expand_macro.expand_macro local hover_actions = rust_tools.hover_actions.hover_actions - vim.keymap.set("n", "<leader>dd", debuggables, { desc = "Debuggables", buffer = bufnr }) - vim.keymap.set("n", "<leader>r", runnables, { desc = "Runnables", buffer = bufnr }) - vim.keymap.set("n", "<leader>lo", open_cargo_toml, { desc = "Open Cargo.toml", buffer = bufnr }) - vim.keymap.set("n", "<leader>le", expand_macro, { desc = "Expand macro", buffer = bufnr }) + vim.keymap.set("n", "<leader>dd", debuggables, { desc = "debug", buffer = bufnr }) + vim.keymap.set("n", "<leader>tt", runnables, { desc = "test", buffer = bufnr }) + vim.keymap.set("n", "<leader>lo", open_cargo_toml, { desc = "open Cargo.toml", buffer = bufnr }) + vim.keymap.set("n", "<leader>le", expand_macro, { desc = "expand macro", buffer = bufnr }) utils.documentation.register("rust", external_docs) utils.hover.register(hover_actions, { desc = "rust-tools hover actions", buffer = bufnr, priority = 10 }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua b/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua index d6fe0d9..a52a663 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua @@ -12,12 +12,12 @@ M.setup = function() autoload_mode = require("session_manager.config").AutoloadMode.Disabled, }) - utils.keymap.group("n", "<leader>s", { desc = "Sessions" }) - vim.keymap.set("n", "<leader>ss", session_manager.save_current_session, { desc = "Save session" }) - vim.keymap.set("n", "<leader>sl", session_manager.load_current_dir_session, { desc = "Load current session" }) - vim.keymap.set("n", "<leader>sL", session_manager.load_session, { desc = "Load session" }) - vim.keymap.set("n", "<leader>sr", session_manager.load_last_session, { desc = "Load last session" }) - vim.keymap.set("n", "<leader>sd", session_manager.delete_session, { desc = "Delete session" }) + utils.keymap.group("n", "<leader>s", { desc = "sessions" }) + vim.keymap.set("n", "<leader>ss", session_manager.save_current_session, { desc = "save session" }) + vim.keymap.set("n", "<leader>sl", session_manager.load_current_dir_session, { desc = "load current session" }) + vim.keymap.set("n", "<leader>sL", session_manager.load_session, { desc = "load session" }) + vim.keymap.set("n", "<leader>sr", session_manager.load_last_session, { desc = "load last session" }) + vim.keymap.set("n", "<leader>sd", session_manager.delete_session, { desc = "delete session" }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua index af82832..bbbcc09 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua @@ -107,7 +107,7 @@ M.setup = function() end, }) - utils.keymap.group("n", "<leader>f", { desc = "Find" }) + utils.keymap.group("n", "<leader>f", { desc = "find" }) vim.keymap.set("n", "<leader>fa", pickers.autocommands, { desc = "autocommands" }) vim.keymap.set("n", "<leader>fb", pickers.buffers, { desc = "buffers" }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua b/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua index a90a3e0..81d374d 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua @@ -19,7 +19,7 @@ M.setup = function() local picker = require("yanky.picker") picker.setup() - vim.keymap.set({ "n", "x" }, "<C-p>", picker.select_in_history, { desc = "Yank History" }) + vim.keymap.set({ "n", "x" }, "<C-p>", picker.select_in_history, { desc = "yank history" }) end return M |