more updates <3
This commit is contained in:
parent
4ef2b18c5d
commit
a3a79d9e4d
@ -4,14 +4,37 @@ local map = vim.api.nvim_set_keymap
|
||||
|
||||
map("n", "<Space>", "", opts)
|
||||
|
||||
-- NORMAL
|
||||
-- better up/down
|
||||
map("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
map("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
|
||||
-- Move text up and down
|
||||
map("n", "<C-k>", "<ESC>:m .-2<CR>==", opts)
|
||||
map("n", "<C-j>", "<ESC>:m .+1<CR>==", opts)
|
||||
|
||||
-- Move Lines
|
||||
map("n", "<C-j>", ":m .+1<CR>==", { desc = "Move down" })
|
||||
map("v", "<C-j>", ":m '>+1<CR>gv=gv", { desc = "Move down" })
|
||||
map("i", "<C-j>", "<Esc>:m .+1<CR>==gi", { desc = "Move down" })
|
||||
map("n", "<C-k>", ":m .-2<CR>==", { desc = "Move up" })
|
||||
map("v", "<C-k>", ":m '<-2<CR>gv=gv", { desc = "Move up" })
|
||||
map("i", "<C-k>", "<Esc>:m .-2<CR>==gi", { desc = "Move up" })
|
||||
|
||||
-- Clear search with <esc>
|
||||
map("n", "<esc>", "<cmd>noh<cr><esc>", opts)
|
||||
map("i", "<esc>", "<cmd>noh<cr><esc>", opts)
|
||||
|
||||
-- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
|
||||
map("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
||||
map("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
||||
map("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
||||
map("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
||||
map("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
||||
map("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
||||
|
||||
-- Copy/Paste
|
||||
map("n", "<C-y>", '"+y', opts)
|
||||
map("n", "<C-p>", '"+y', opts)
|
||||
map("n", "<C-p>", '"+p', opts)
|
||||
|
||||
-- Save
|
||||
map("n", "<C-s>", ":w<CR>", opts)
|
||||
@ -24,7 +47,6 @@ map("n", "<S-h>", ":CybuPrev<CR>", opts)
|
||||
map("n", "<C-u>", "<C-u>zz", opts)
|
||||
map("n", "<C-d>", "<C-d>zz", opts)
|
||||
|
||||
-- INSERT
|
||||
-- Easy exit insert mode
|
||||
map("i", "jk", "<ESC>", opts)
|
||||
|
||||
@ -34,7 +56,6 @@ map("i", "<C-p>", '"+y', opts)
|
||||
-- Save
|
||||
map("i", "<C-s>", "<ESC>:w<CR>a", opts)
|
||||
|
||||
-- VISUAL
|
||||
-- Indenting
|
||||
map("v", "<", "<gv", opts)
|
||||
map("v", ">", ">gv", opts)
|
||||
|
||||
@ -28,12 +28,6 @@ return {
|
||||
-- Animation style (see below for details)
|
||||
stages = "fade_in_slide_out",
|
||||
|
||||
-- Function called when a new window is opened, use for changing win settings/config
|
||||
on_open = nil,
|
||||
|
||||
-- Function called when a window is closed
|
||||
on_close = nil,
|
||||
|
||||
-- Render function for notifications. See notify-render()
|
||||
render = "default",
|
||||
|
||||
@ -283,5 +277,17 @@ return {
|
||||
},
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
keys = {
|
||||
{ "mm", '<cmd>lua require("harpoon.mark").add_file()<cr>', desc = "Harpoon" },
|
||||
{ "ml", '<cmd>lua require("harpoon.ui").nav_next()<cr>', desc = "Harpoon Next" },
|
||||
{ "mh", '<cmd>lua require("harpoon.ui").nav_prev()<cr>', desc = "Harpoon Prev" },
|
||||
{ "ms", "<cmd>Telescope harpoon marks<cr>", desc = "Search Files" },
|
||||
{ "mu", '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', desc = "Harpoon UI" },
|
||||
|
||||
{ "m1", '<cmd> lua require("harpoon.ui").nav_file(1)<cr>', desc = "Goto 1" },
|
||||
{ "m2", '<cmd> lua require("harpoon.ui").nav_file(2)<cr>', desc = "Goto 2" },
|
||||
{ "m3", '<cmd> lua require("harpoon.ui").nav_file(3)<cr>', desc = "Goto 3" },
|
||||
{ "m4", '<cmd> lua require("harpoon.ui").nav_file(4)<cr>', desc = "Goto 4" },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@ -62,15 +62,6 @@ return {
|
||||
},
|
||||
})
|
||||
|
||||
local opts = {
|
||||
mode = "n", -- NORMAL mode
|
||||
buffer = nil, -- Global mappings
|
||||
prefix = "",
|
||||
silent = true, -- use 'silent'
|
||||
noremap = true, -- use 'noremap'
|
||||
nowait = true, -- use 'nowait'
|
||||
}
|
||||
|
||||
local leader_opts = {
|
||||
mode = "n", -- NORMAL mode
|
||||
buffer = nil, -- Global mappings
|
||||
@ -80,49 +71,165 @@ return {
|
||||
nowait = true, -- use 'nowait'
|
||||
}
|
||||
|
||||
local m_opts = {
|
||||
mode = "n", -- NORMAL mode
|
||||
buffer = nil, -- Global mappings
|
||||
prefix = "m",
|
||||
silent = true, -- use 'silent'
|
||||
noremap = true, -- use 'noremap'
|
||||
nowait = true, -- use 'nowait'
|
||||
}
|
||||
|
||||
local m_mappings = {
|
||||
m = { '<cmd>lua require("harpoon.mark").add_file()<cr>', "Harpoon" },
|
||||
l = { '<cmd>lua require("harpoon.ui").nav_next()<cr>', "Harpoon Next" },
|
||||
h = { '<cmd>lua require("harpoon.ui").nav_prev()<cr>', "Harpoon Prev" },
|
||||
s = { "<cmd>Telescope harpoon marks<cr>", "Search Files" },
|
||||
u = { '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', "Harpoon UI" },
|
||||
|
||||
["1"] = { '<cmd> lua require("harpoon.ui").nav_file(1)<cr>', "Goto 1" },
|
||||
["2"] = { '<cmd> lua require("harpoon.ui").nav_file(2)<cr>', "Goto 2" },
|
||||
["3"] = { '<cmd> lua require("harpoon.ui").nav_file(3)<cr>', "Goto 3" },
|
||||
["4"] = { '<cmd> lua require("harpoon.ui").nav_file(4)<cr>', "Goto 4" },
|
||||
}
|
||||
|
||||
whichkey.register(m_mappings, m_opts)
|
||||
|
||||
whichkey.register({
|
||||
mode = { "n", "v" },
|
||||
["g"] = { name = "+goto" },
|
||||
["]"] = { name = "+next" },
|
||||
["["] = { name = "+prev" },
|
||||
["<leader>b"] = { name = "+buffer" },
|
||||
["<leader>c"] = { name = "+code" },
|
||||
["<leader>f"] = { name = "+file" },
|
||||
["<leader>g"] = { name = "+git" },
|
||||
["<leader>h"] = { name = "+help" },
|
||||
["<leader>n"] = { name = "+noice" },
|
||||
["<leader>o"] = { name = "+open" },
|
||||
["<leader>q"] = { name = "+quit/session" },
|
||||
["<leader>s"] = { name = "+search" },
|
||||
["<leader>t"] = { name = "+toggle" },
|
||||
["<leader>x"] = { name = "+diagnostics/quickfix" },
|
||||
["<leader>w"] = { name = "+windows" },
|
||||
["<leader><tab>"] = { name = "+tabs" },
|
||||
["m"] = { name = "+harpoon" },
|
||||
})
|
||||
|
||||
local leader_mappings = {
|
||||
a = { "<cmd>Lspsaga code_action<cr>", "Action" },
|
||||
c = { "<cmd>Bdelete<cr>", "Close Buffer" },
|
||||
H = { "<cmd>split<cr>", "split" },
|
||||
h = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Hover" },
|
||||
n = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
|
||||
O = { "<cmd>setlocal spell! spelllang=en_us<CR>", "Toggle Spelling" },
|
||||
P = { "<cmd>!opout %<cr><cr>", "Preview Document" },
|
||||
q = { '<cmd>lua require("lazyvim.functions").smart_quit()<CR>', "Quit" },
|
||||
V = { "<cmd>vsplit<cr>", "vsplit" },
|
||||
w = { "<cmd>w<CR>", "Write" },
|
||||
z = { "<cmd>ZenMode<cr>", "Zen" },
|
||||
["/"] = { '<cmd>lua require("Comment.api").toggle.linewise.current()<CR>', "Comment" },
|
||||
["'"] = { "<cmd>close<CR>", "Close split" },
|
||||
u = { "<cmd>UndoTreeToggle", "Undo Tree" },
|
||||
|
||||
C = {
|
||||
name = "Compiler",
|
||||
c = { "<cmd>w! | !compiler %<cr>", "Compile File" },
|
||||
b = { "<cmd>w! | !pandoc % -t beamer -o presentation.pdf<cr>", "Beamer Presentation" },
|
||||
},
|
||||
|
||||
b = {
|
||||
name = "Buffer",
|
||||
b = { "<cmd>Telescope buffers<cr>", "Telescope" },
|
||||
c = { "<cmd>Bdelete!<cr>", "Close Buffer" },
|
||||
h = { "<cmd>BufferLineCyclePrev<cr>", "Cycle Previous" },
|
||||
l = { "<cmd>BufferLineCycleNext<cr>", "Cycle Next" },
|
||||
p = { "<cmd>BufferLinePickClose", "Pick Close" },
|
||||
},
|
||||
|
||||
p = {
|
||||
name = "Packer",
|
||||
c = { "<cmd>PackerCompile<cr>", "Compile" },
|
||||
i = { "<cmd>PackerInstall<cr>", "Install" },
|
||||
s = { "<cmd>PackerSync<cr>", "Sync" },
|
||||
S = { "<cmd>PackerStatus<cr>", "Status" },
|
||||
u = { "<cmd>PackerUpdate<cr>", "Update" },
|
||||
},
|
||||
|
||||
o = {
|
||||
name = "Options",
|
||||
c = { "<cmd>lua vim.g.cmp_active=false<cr>", "Completion off" },
|
||||
C = { "<cmd>lua vim.g.cmp_active=true<cr>", "Completion on" },
|
||||
w = { '<cmd>lua require("user.functions").toggle_option("wrap")<cr>', "Wrap" },
|
||||
r = { '<cmd>lua require("user.functions").toggle_option("relativenumber")<cr>', "Relative" },
|
||||
l = { '<cmd>lua require("user.functions").toggle_option("cursorline")<cr>', "Cursorline" },
|
||||
s = { '<cmd>lua require("user.functions").toggle_option("spell")<cr>', "Spell" },
|
||||
t = { '<cmd>lua require("user.functions").toggle_tabline()<cr>', "Tabline" },
|
||||
},
|
||||
|
||||
r = {
|
||||
name = "Replace",
|
||||
r = { "<cmd>lua require('spectre').open()<cr>", "Replace" },
|
||||
w = { "<cmd>lua require('spectre').open_visual({select_word=true})<cr>", "Replace Word" },
|
||||
f = { "<cmd>lua require('spectre').open_file_search()<cr>", "Replace Buffer" },
|
||||
},
|
||||
|
||||
d = {
|
||||
name = "Debug",
|
||||
b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", "Breakpoint" },
|
||||
c = { "<cmd>lua require'dap'.continue()<cr>", "Continue" },
|
||||
i = { "<cmd>lua require'dap'.step_into()<cr>", "Into" },
|
||||
o = { "<cmd>lua require'dap'.step_over()<cr>", "Over" },
|
||||
O = { "<cmd>lua require'dap'.step_out()<cr>", "Out" },
|
||||
r = { "<cmd>lua require'dap'.repl.toggle()<cr>", "Repl" },
|
||||
l = { "<cmd>lua require'dap'.run_last()<cr>", "Last" },
|
||||
u = { "<cmd>lua require'dapui'.toggle()<cr>", "UI" },
|
||||
x = { "<cmd>lua require'dap'.terminate()<cr>", "Exit" },
|
||||
},
|
||||
|
||||
f = {
|
||||
name = "Find",
|
||||
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
|
||||
c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" },
|
||||
f = { "<cmd>Telescope find_files<cr>", "Find files" },
|
||||
t = { "<cmd>Telescope live_grep<cr>", "Find Text" },
|
||||
s = { "<cmd>Telescope grep_string<cr>", "Find String" },
|
||||
h = { "<cmd>Telescope help_tags<cr>", "Help" },
|
||||
H = { "<cmd>Telescope highlights<cr>", "Highlights" },
|
||||
l = { "<cmd>Telescope resume<cr>", "Last Search" },
|
||||
M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
|
||||
r = { "<cmd>Telescope oldfiles<cr>", "Recent File" },
|
||||
R = { "<cmd>Telescope registers<cr>", "Registers" },
|
||||
k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
|
||||
C = { "<cmd>Telescope commands<cr>", "Commands" },
|
||||
},
|
||||
|
||||
g = {
|
||||
name = "Git",
|
||||
g = { "<cmd>Git<CR>", "Git" },
|
||||
j = { "<cmd>lua require 'gitsigns'.next_hunk()<cr>", "Next Hunk" },
|
||||
k = { "<cmd>lua require 'gitsigns'.prev_hunk()<cr>", "Prev Hunk" },
|
||||
l = { "<cmd>GitBlameToggle<cr>", "Blame" },
|
||||
p = { "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", "Preview Hunk" },
|
||||
r = { "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", "Reset Hunk" },
|
||||
R = { "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", "Reset Buffer" },
|
||||
s = { "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", "Stage Hunk" },
|
||||
u = {
|
||||
"<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>",
|
||||
"Undo Stage Hunk",
|
||||
},
|
||||
o = { "<cmd>Telescope git_status<cr>", "Open changed file" },
|
||||
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
|
||||
c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" },
|
||||
d = {
|
||||
"<cmd>Gitsigns diffthis HEAD<cr>",
|
||||
"Diff",
|
||||
},
|
||||
},
|
||||
|
||||
l = {
|
||||
name = "LSP",
|
||||
a = { "<cmd>Lspsaga code_action<cr>", "Code Action" },
|
||||
t = { "<cmd>TroubleToggle document_diagnostics<cr>", "Diagnostics" },
|
||||
d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Definition" },
|
||||
w = {
|
||||
"<cmd>TroubleToggle workspace_diagnostics<cr>",
|
||||
"Workspace Diagnostics",
|
||||
},
|
||||
f = { "<cmd>lua vim.lsp.buf.format({ async = true })<cr>", "Format" },
|
||||
F = { "<cmd>LspToggleAutoFormat<cr>", "Toggle Autoformat" },
|
||||
h = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Hover" },
|
||||
i = { "<cmd>lua vim.lsp.buf.implementation()<cr>", "Implementation" },
|
||||
I = { "<cmd>LspInfo<cr>", "Info" },
|
||||
j = {
|
||||
"<cmd>lua vim.diagnostic.goto_next({buffer=0})<CR>",
|
||||
"Next Diagnostic",
|
||||
},
|
||||
k = {
|
||||
"<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>",
|
||||
"Prev Diagnostic",
|
||||
},
|
||||
v = { "<cmd>lua require('lsp_lines').toggle()<cr>", "Virtual Text" },
|
||||
l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
|
||||
o = { "<cmd>SymbolsOutline<cr>", "Outline" },
|
||||
r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
|
||||
R = { "<cmd>TroubleToggle lsp_references<cr>", "References" },
|
||||
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
|
||||
S = {
|
||||
"<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
|
||||
"Workspace Symbols",
|
||||
},
|
||||
T = { '<cmd>lua require("user.functions").toggle_diagnostics()<cr>', "Toggle Diagnostics" },
|
||||
u = { "<cmd>LuaSnipUnlinkCurrent<cr>", "Unlink Snippet" },
|
||||
M = { "<cmd>Mason<cr>", "Open Mason UI" },
|
||||
},
|
||||
}
|
||||
|
||||
-- whichkey.register(m_mappings, m_opts)
|
||||
|
||||
whichkey.register(mappings, opts)
|
||||
whichkey.register(leader_mappings, leader_opts)
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user