cleaning out keys and plugins I don't want, slowly

This commit is contained in:
Solomon Laing 2024-07-05 15:51:39 +09:30
parent 38f33925db
commit fa97251839
8 changed files with 148 additions and 97 deletions

20
.config/nvim/lua/lazyvim/config/keymaps.lua Normal file → Executable file
View File

@ -42,13 +42,23 @@ map("n", "<S-h>", ":bprevious<CR>", opts)
map("n", "<C-u>", "<C-u>zz", opts) map("n", "<C-u>", "<C-u>zz", opts)
map("n", "<C-d>", "<C-d>zz", opts) map("n", "<C-d>", "<C-d>zz", opts)
-- Easy exit insert mode
map("i", "jk", "<ESC>", opts)
-- Indenting -- Indenting
map("v", "<", "<gv", opts) map("v", "<", "<gv", opts)
map("v", ">", ">gv", opts) map("v", ">", ">gv", opts)
-- move through quickfix list -- move through quickfix list
map("n", "<C-n>", ":cnext<cr>", opts) map("n", "<C-l>", ":cnext<cr>zz", { noremap = true, silent = true, desc = "Next quickfix" })
map("n", "<C-p>", ":cprev<cr>", opts) map("n", "<C-h>", ":cprev<cr>zz", { noremap = true, silent = true, desc = "Prev quickfix" })
map("n", "]q", ":cnext<cr>zz", { noremap = true, silent = true, desc = "Next quickfix" })
map("n", "[q", ":cprev<cr>zz", { noremap = true, silent = true, desc = "Prev quickfix" })
-- Thanks Prime
vim.keymap.set("x", "<leader>p", [["_dP]])
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
vim.keymap.set("n", "<leader>Y", [["+Y]])
vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
vim.keymap.set("i", "<C-c>", "<Esc>")
vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "<leader>T", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })

View File

@ -9,7 +9,7 @@ return {
{ "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" }, { "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
{ "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" }, { "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
{ "<leader>tt", "<cmd>TodoTrouble<cr>", desc = "Todo Trouble" }, { "<leader>tt", "<cmd>TodoTrouble<cr>", desc = "Todo Trouble" },
{ "<leader>tT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo Trouble" }, { "<leader>tT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo, Fix and, FixMe Trouble " },
{ "<leader>tf", "<cmd>TodoTelescope<cr>", desc = "Todo Telescope" }, { "<leader>tf", "<cmd>TodoTelescope<cr>", desc = "Todo Telescope" },
}, },
}, },

View File

@ -5,10 +5,10 @@ return {
opts = {}, opts = {},
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
{ "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, -- { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, -- { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, -- { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-- no command mode keys using leader as space... -- no command mode keys using leader as space...
-- { "<leader>oS", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, -- { "<leader>oS", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
}, },

View File

@ -1,57 +1,57 @@
return { return {
{ {
"folke/noice.nvim", "folke/noice.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = { opts = {
lsp = { lsp = {
progress = { progress = {
enabled = true, enabled = true,
}, },
hover = { hover = {
enabled = true, enabled = true,
}, },
signature = { signature = {
enabled = true, enabled = true,
}, },
message = { message = {
enabled = true, enabled = true,
}, },
override = { override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true, ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true, ["vim.lsp.util.stylize_markdown"] = true,
}, },
}, },
cmdline = { cmdline = {
enabled = false, enabled = false,
}, },
messages = { messages = {
enabled = false, enabled = false,
}, },
popupmenu = { popupmenu = {
enabled = true, enabled = true,
}, },
notify = { notify = {
enabled = false, enabled = false,
}, },
smart_move = { smart_move = {
enabled = true, enabled = true,
}, },
presets = { presets = {
bottom_search = false, bottom_search = false,
command_palette = false, command_palette = false,
long_message_to_split = false, long_message_to_split = false,
inc_rename = false, inc_rename = false,
lsp_doc_border = false, lsp_doc_border = false,
}, },
}, },
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "<S-Enter>", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" }, { "<S-Enter>", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" },
{ "<leader>Nl", function() require("noice").cmd("last") end, desc = "Noice Last Message" }, { "<leader>Nl", function() require("noice").cmd("last") end, desc = "Noice Last Message" },
{ "<leader>Nh", function() require("noice").cmd("history") end, desc = "Noice History" }, { "<leader>Nh", function() require("noice").cmd("history") end, desc = "Noice History" },
{ "<leader>Na", function() require("noice").cmd("all") end, desc = "Noice All" }, { "<leader>Na", function() require("noice").cmd("all") end, desc = "Noice All" },
{ "<c-f>", function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end, silent = true, expr = true }, { "<c-f>", function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end, silent = true, expr = true },
{ "<c-b>", function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true, expr = true }, { "<c-b>", function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true, expr = true },
}, },
}, },
} }

View File

@ -1,11 +1,11 @@
return { return {
{ -- {
"windwp/nvim-spectre", -- "windwp/nvim-spectre",
-- stylua: ignore -- -- stylua: ignore
keys = { -- keys = {
{ "<leader>rr", function() require("spectre").open() end, desc = "Replace in files" }, -- { "<leader>rr", function() require("spectre").open() end, desc = "Replace in files" },
{ "<leader>rw", function() require("spectre").open_visual({ select_word = true }) end, desc = "Relpace Word" }, -- { "<leader>rw", function() require("spectre").open_visual({ select_word = true }) end, desc = "Relpace Word" },
{ "<leader>rb", function() require("spectre").open_file_search() end, desc = "Relpace in Buffer" }, -- { "<leader>rb", function() require("spectre").open_file_search() end, desc = "Relpace in Buffer" },
}, -- },
}, -- },
} }

View File

@ -5,29 +5,29 @@ return {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
event = "VeryLazy", event = "VeryLazy",
keys = { keys = {
{ "<leader>/", util.telescope("live_grep"), desc = "Find in Files (Grep)" }, { "<leader>/", util.telescope("live_grep"), desc = "Telescope Find in Files (Grep)" },
{ "<leader><space>", util.telescope("find_files"), desc = "Find Files (root dir)" }, { "<leader><space>", util.telescope("find_files"), desc = "Telescope Find Files (root dir)" },
{ "<leader>ff", util.telescope("find_files"), desc = "Find Files (root dir)" }, { "<leader>ff", util.telescope("find_files"), desc = "Telescope Find Files (root dir)" },
{ "<leader>fF", util.telescope("find_files", { cwd = false }), desc = "Find Files (cwd)" }, { "<leader>fF", util.telescope("find_files", { cwd = false }), desc = "Telescope Find Files (cwd)" },
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" }, { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Telescope Recent" },
{ "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" }, { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "Telescope commits" },
{ "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "status" }, { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Telescope status" },
{ "<leader>gb", "<cmd>Telescope git_branches<CR>", desc = "branches" }, { "<leader>gb", "<cmd>Telescope git_branches<CR>", desc = "Telescope branches" },
{ "<leader>ha", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" }, { "<leader>ha", "<cmd>Telescope autocommands<cr>", desc = "Telescope Auto Commands" },
{ "<leader>hc", "<cmd>Telescope commands<cr>", desc = "Commands" }, { "<leader>hc", "<cmd>Telescope commands<cr>", desc = "Telescope Commands" },
{ "<leader>hf", "<cmd>Telescope filetypes<cr>", desc = "File Types" }, { "<leader>hf", "<cmd>Telescope filetypes<cr>", desc = "Telescope File Types" },
{ "<leader>hh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" }, { "<leader>hh", "<cmd>Telescope help_tags<cr>", desc = "Telescope Help Pages" },
{ "<leader>hk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" }, { "<leader>hk", "<cmd>Telescope keymaps<cr>", desc = "Telescope Key Maps" },
{ "<leader>hm", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" }, { "<leader>hm", "<cmd>Telescope man_pages<cr>", desc = "Telescope Man Pages" },
{ "<leader>ho", "<cmd>Telescope vim_options<cr>", desc = "Options" }, { "<leader>ho", "<cmd>Telescope vim_options<cr>", desc = "Telescope Options" },
{ "<leader>hs", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" }, { "<leader>hs", "<cmd>Telescope highlights<cr>", desc = "Telescope Search Highlight Groups" },
{ "<leader>ht", "<cmd>Telescope builtin<cr>", desc = "Telescope" }, { "<leader>ht", "<cmd>Telescope builtin<cr>", desc = "Telescope" },
{ "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" }, { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Telescope Buffer" },
{ "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" }, { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Telescope Command History" },
{ "<leader>sG", util.telescope("live_grep"), desc = "Grep (root dir)" }, { "<leader>sG", util.telescope("live_grep"), desc = "Telescope Grep (root dir)" },
{ "<leader>sg", util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" }, { "<leader>sg", util.telescope("live_grep", { cwd = false }), desc = "Telescope Grep (cwd)" },
{ "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" }, { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Telescope Jump to Mark" },
{ "<leader>so", "<cmd>Telescope resume<cr>", desc = "Resume last search" }, { "<leader>so", "<cmd>Telescope resume<cr>", desc = "Telescope Resume last search" },
{ {
"<leader>ss", "<leader>ss",
util.telescope("lsp_document_symbols", { util.telescope("lsp_document_symbols", {

View File

@ -11,7 +11,47 @@ return {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
}, },
autopairs = { enable = true }, incremental_selection = { enable = true },
textobjects = {
select = {
enable = true,
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
keymaps = {
-- You can use the capture groups defined in textobjects.scm
['aa'] = '@parameter.outer',
['ia'] = '@parameter.inner',
['af'] = '@function.outer',
['if'] = '@function.inner',
['ac'] = '@class.outer',
['ic'] = '@class.inner',
['ii'] = '@conditional.inner',
['ai'] = '@conditional.outer',
['il'] = '@loop.inner',
['al'] = '@loop.outer',
['at'] = '@comment.outer',
},
},
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
[']f'] = '@function.outer',
[']c'] = '@class.outer',
},
goto_next_end = {
[']F'] = '@function.outer',
[']C'] = '@class.outer',
},
goto_previous_start = {
['[f'] = '@function.outer',
['[c'] = '@class.outer',
},
goto_previous_end = {
['[F'] = '@function.outer',
['[C'] = '@class.outer',
},
},
},
indent = { enable = true }, indent = { enable = true },
ensure_installed = { ensure_installed = {
"c_sharp", "c_sharp",

View File

@ -106,6 +106,7 @@ return {
name = "+lsp", name = "+lsp",
l = { "<cmd>lopen<cr>", "Open Location List" }, l = { "<cmd>lopen<cr>", "Open Location List" },
q = { "<cmd>copen<cr>", "Open Quickfix List" }, q = { "<cmd>copen<cr>", "Open Quickfix List" },
x = { "<cmd>cclose<cr>", "Close Quickfix List" },
}, },
C = { C = {