updates
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
d7d4d85972
commit
b3fbab2b47
4 changed files with 120 additions and 118 deletions
169
lua/keymaps.lua
169
lua/keymaps.lua
|
|
@ -12,88 +12,89 @@ vim.g.maplocalleader = " "
|
|||
-- command_mode = "c",
|
||||
|
||||
require("util").keymaps({
|
||||
n = {
|
||||
[";"] = { ":", desc = "No shift command mode" },
|
||||
["n"] = { "nzzzv", desc = "Next search result centered" },
|
||||
["N"] = { "Nzzzv", desc = "Previous search result centered" },
|
||||
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
|
||||
["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
|
||||
["<leader>a"] = { "ggVG", desc = "Select all" },
|
||||
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
|
||||
["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
|
||||
["<leader>bq"] = { "<cmd>bp|bd #<cr>", desc = "Close current buffer only" },
|
||||
["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "Create new tab" },
|
||||
["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
|
||||
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
||||
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
|
||||
["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
|
||||
["<C-u>"] = { "<C-u>zz", desc = "Vertical half page up and center cursor" },
|
||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||
["<leader>Q"] = { ":qa<CR>", desc = "Quit all" },
|
||||
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
||||
-- window navigation
|
||||
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
||||
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
||||
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
||||
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
||||
-- tab navigation
|
||||
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||
-- reformat LSP
|
||||
["<leader>lf"] = {
|
||||
function()
|
||||
-- vim.cmd "SqlxFormat"
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
desc = "Reformat file",
|
||||
},
|
||||
["<leader>lsf"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
||||
["<leader>ld"] = {
|
||||
function()
|
||||
vim.diagnostic.open_float()
|
||||
end,
|
||||
desc = "Show diagnostic message",
|
||||
},
|
||||
["<leader>ll"] = {
|
||||
function()
|
||||
vim.diagnostic.setloclist()
|
||||
end,
|
||||
desc = "Show diagnostic list",
|
||||
},
|
||||
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
|
||||
["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" },
|
||||
["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
|
||||
},
|
||||
v = {
|
||||
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
||||
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
|
||||
["<leader>,uu"] = {
|
||||
'd:let @u = trim(tolower(system("uuidgen")))<cr>i<C-r>u',
|
||||
desc = "Generate and replace UUID",
|
||||
},
|
||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
||||
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
||||
},
|
||||
i = {
|
||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||
["<C-4>"] = { "<End>", desc = "End" },
|
||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||
},
|
||||
c = {
|
||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||
["<C-4>"] = { "<End>", desc = "End" },
|
||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||
},
|
||||
t = {
|
||||
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
|
||||
},
|
||||
n = {
|
||||
[";"] = { ":", desc = "No shift command mode" },
|
||||
["n"] = { "nzzzv", desc = "Next search result centered" },
|
||||
["N"] = { "Nzzzv", desc = "Previous search result centered" },
|
||||
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
|
||||
["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
|
||||
["<leader>a"] = { "ggVG", desc = "Select all" },
|
||||
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
|
||||
["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
|
||||
["<leader>bq"] = { "<cmd>bp|bd #<cr>", desc = "Close current buffer only" },
|
||||
["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "Create new tab" },
|
||||
["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
|
||||
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
||||
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
|
||||
["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
|
||||
["<C-u>"] = { "<C-u>zz", desc = "Vertical half page up and center cursor" },
|
||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||
["<leader>Q"] = { ":qa<CR>", desc = "Quit all" },
|
||||
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
||||
["<S-Tab>"] = { "<C-o>", desc = "Go back <C-o>" },
|
||||
-- window navigation
|
||||
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
||||
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
||||
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
||||
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
||||
-- tab navigation
|
||||
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||
-- reformat LSP
|
||||
["<leader>lf"] = {
|
||||
function()
|
||||
-- vim.cmd "SqlxFormat"
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
desc = "Reformat file",
|
||||
},
|
||||
["<leader>lsf"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
||||
["<leader>ld"] = {
|
||||
function()
|
||||
vim.diagnostic.open_float()
|
||||
end,
|
||||
desc = "Show diagnostic message",
|
||||
},
|
||||
["<leader>ll"] = {
|
||||
function()
|
||||
vim.diagnostic.setloclist()
|
||||
end,
|
||||
desc = "Show diagnostic list",
|
||||
},
|
||||
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
|
||||
["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" },
|
||||
["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
|
||||
},
|
||||
v = {
|
||||
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
||||
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
|
||||
["<leader>,uu"] = {
|
||||
'd:let @u = trim(tolower(system("uuidgen")))<cr>i<C-r>u',
|
||||
desc = "Generate and replace UUID",
|
||||
},
|
||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
||||
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
||||
},
|
||||
i = {
|
||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||
["<C-4>"] = { "<End>", desc = "End" },
|
||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||
},
|
||||
c = {
|
||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||
["<C-4>"] = { "<End>", desc = "End" },
|
||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||
},
|
||||
t = {
|
||||
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,17 +12,18 @@ return {
|
|||
close_if_last_window = true,
|
||||
sources = { "filesystem" },
|
||||
filesystem = {
|
||||
follow_current_file = true,
|
||||
follow_current_file = false,
|
||||
group_empty_dirs = true,
|
||||
filtered_items = {
|
||||
visible = true,
|
||||
hide_dotfiles = false,
|
||||
hide_gitignored = false,
|
||||
hide_by_name = {
|
||||
never_show = {
|
||||
".DS_Store",
|
||||
},
|
||||
},
|
||||
},
|
||||
use_libuv_file_watcher = true,
|
||||
nesting_rules = {
|
||||
["ts"] = { ".cjs", ".cjs.map", ".d.ts", ".d.ts.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.ts" },
|
||||
["js"] = { ".cjs", ".cjs.map", ".d.js", ".d.js.map", ".js", ".js.map", ".mjs", ".mjs.map", ".test.js" },
|
||||
|
|
@ -38,7 +39,7 @@ return {
|
|||
if vim.bo.filetype == "neo-tree" then
|
||||
vim.cmd.wincmd("p")
|
||||
else
|
||||
vim.cmd.Neotree("focus")
|
||||
vim.cmd.Neotree("reveal")
|
||||
end
|
||||
end,
|
||||
desc = "Toggle Explorer Focus",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
return {
|
||||
"Almo7aya/openingh.nvim",
|
||||
event = "BufEnter",
|
||||
keys = {
|
||||
{ "<leader>gf", "<cmd>OpenInGHFile<CR>", desc = "Open in git" },
|
||||
},
|
||||
"Almo7aya/openingh.nvim",
|
||||
event = "BufEnter",
|
||||
keys = {
|
||||
{ "<leader>gf", "<cmd>OpenInGHFile<CR>", desc = "Open in git" },
|
||||
{ "<leader>gf", "<cmd>OpenInGHFileLines<CR>", desc = "Open in git", mode = { "v" } },
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue