aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/lua/tobyvin/lsp.lua3
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins.lua10
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/dap.lua1
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua4
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua3
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/mason.lua2
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua2
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua2
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua3
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/which-key.lua25
-rw-r--r--nvim/.config/nvim/lua/tobyvin/utils/keymap.lua34
11 files changed, 0 insertions, 89 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp.lua b/nvim/.config/nvim/lua/tobyvin/lsp.lua
index 28bf3e8..04566ba 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local lsp = {
configs = require("tobyvin.lsp.configs"),
handlers = require("tobyvin.lsp.handlers"),
@@ -15,9 +14,7 @@ lsp.setup = function()
group = vim.api.nvim_create_augroup("tobyvin_lsp", { clear = true }),
desc = "lsp",
callback = function(args)
- local bufnr = args.buf
local client = vim.lsp.get_client_by_id(args.data.client_id)
- utils.keymap.group("n", "<leader>l", { desc = "LSP", buffer = bufnr })
vim.api.nvim_exec_autocmds("User", { pattern = "LspAttach", data = { client_id = client.id } })
end,
})
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index cd7e41e..875d198 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -1,5 +1,3 @@
----@diagnostic disable: missing-parameter
-local utils = require("tobyvin.utils")
local M = {}
M.ensure_packer = function()
@@ -348,13 +346,6 @@ M.plugins = function(use)
})
use({
- "folke/which-key.nvim",
- config = function()
- require("tobyvin.plugins.which-key").setup()
- end,
- })
-
- use({
"mfussenegger/nvim-dap",
requires = {
"nvim-telescope/telescope-dap.nvim",
@@ -428,7 +419,6 @@ 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" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
index 7a870af..068457e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
@@ -82,7 +82,6 @@ M.setup = function()
require("telescope").load_extension("dap")
local telescope = require("telescope").extensions.dap
- 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", set_custom_breakpoint, { desc = "custom breakpoint" })
vim.keymap.set("n", "<leader>dC", telescope.commands, { desc = "commands" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua b/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua
index 7536852..9f400ad 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/diffview.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local M = {}
local file_history = function()
@@ -24,12 +23,9 @@ M.setup = function()
diffview.setup()
- 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" })
-
- utils.keymap.group("v", "<leader>g", { desc = "git" })
vim.keymap.set("v", "<leader>gh", selection_history, { desc = "selection history" })
end
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
index a208394..67c4be9 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
@@ -38,8 +38,6 @@ end
M.on_attach = function(bufnr)
local gitsigns = package.loaded.gitsigns
- utils.keymap.group("n", "<leader>g", { desc = "git", 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 })
@@ -56,7 +54,6 @@ M.on_attach = function(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", 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 })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
index d694ce4..163917c 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local M = {}
local nil_wrap = function(func)
@@ -39,7 +38,6 @@ M.setup = function()
api.DapInstall = nil_wrap(mason_nvim_dap.DapInstall)
api.DapUninstall = nil_wrap(mason_nvim_dap.DapUninstall)
- utils.keymap.group("n", "<leader>i", { desc = "mason installer" })
vim.keymap.set("n", "<leader>ii", api.Mason, { desc = "mason" })
vim.keymap.set("n", "<leader>iI", api.MasonLog, { desc = "log" })
vim.keymap.set("n", "<leader>iu", api.UpdateAll, { desc = "update all" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
index 471c181..0bdd828 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local M = {}
M.setup = function()
@@ -16,7 +15,6 @@ M.setup = function()
},
})
- utils.keymap.group("n", "<leader>g", { desc = "git" })
vim.keymap.set("n", "<leader>gg", neogit.open, { desc = "neogit" })
end
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua b/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua
index a52a663..c181ff7 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/session_manager.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local M = {}
M.setup = function()
@@ -12,7 +11,6 @@ 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" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
index 0978c91..ac3391d 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
@@ -1,4 +1,3 @@
-local utils = require("tobyvin.utils")
local M = {}
M.frecency_sorter = function()
@@ -97,8 +96,6 @@ M.setup = function()
local builtins = require("telescope.builtin")
local extensions = telescope.extensions
- utils.keymap.group("n", "<leader>f", { desc = "find" })
-
vim.keymap.set("n", "<leader>fa", builtins.autocommands, { desc = "autocommands" })
vim.keymap.set("n", "<leader>fb", builtins.buffers, { desc = "buffers" })
vim.keymap.set("n", "<leader>fc", builtins.commands, { desc = "commands" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/which-key.lua b/nvim/.config/nvim/lua/tobyvin/plugins/which-key.lua
deleted file mode 100644
index e1be1fc..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/which-key.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local M = {}
-
-M.setup = function()
- local status_ok, which_key = pcall(require, "which-key")
- if not status_ok then
- vim.notify("Failed to load module 'which-key'", vim.log.levels.ERROR)
- return
- end
-
- which_key.setup({
- plugins = {
- spelling = {
- enabled = true,
- },
- },
- window = {
- border = "single",
- },
- layout = {
- align = "center",
- },
- })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/utils/keymap.lua b/nvim/.config/nvim/lua/tobyvin/utils/keymap.lua
deleted file mode 100644
index 83e5c12..0000000
--- a/nvim/.config/nvim/lua/tobyvin/utils/keymap.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local M = {}
-
-M.groups = {}
-
---- Helper function to create a group of keymaps that share a common prefix and/or options.
----@param mode string|table Same mode short names as vim.keymap.set(). A list will create the group on all modes.
----@param group_lhs string Prefix to prepend to the lhs of all keymaps in the group.
----@param group_opts ?table Options to apply to all keymaps in this group. (Same as options listed in vim.keymap.set)
----@return function Function to create mapping using the groups defaults.
--- TODO: Possibly add memoization to groups/subgroups using the __call metatable attribute
-M.group = function(mode, group_lhs, group_opts)
- group_opts = group_opts or {}
-
- for _, m in pairs(vim.tbl_flatten({ mode })) do
- M.groups[m] = M.groups[m] == nil and {} or M.groups[m]
- M.groups[m][group_lhs] = group_opts
- end
-
- local desc = group_opts.desc
- group_opts.desc = nil
-
- local status_ok, which_key = pcall(require, "which-key")
- if status_ok and desc ~= nil then
- for _, m in pairs(vim.tbl_flatten({ mode })) do
- which_key.register({ [group_lhs] = { name = desc } }, vim.tbl_extend("force", { mode = m }, group_opts))
- end
- end
-
- return function(lhs, rhs, opts)
- vim.keymap.set(mode, group_lhs .. lhs, rhs, vim.tbl_deep_extend("keep", opts or {}, group_opts))
- end
-end
-
-return M
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-29 17:36:31 +0000