formatting

This commit is contained in:
RingOfStorms (Joshua Bell) 2023-11-03 00:55:23 -05:00
parent d51fec7eb9
commit 7adc3a8bf9
2 changed files with 114 additions and 183 deletions

View file

@ -12,114 +12,118 @@ 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>qq"] = {
function()
-- Use to have this which always closed and quit ont he last screen: "<cmd>confirm q<cr>"
-- Instead I want this behavior:
-- if only 1 screen is open then close all buffers, resulting in a blank unamed buffer window similar to fresh session
-- else if more than 1 screen, confirm q to close that screen
-- Check the number of screens
if vim.fn.winnr("$") == 1 then
-- If only 1 screen is open then close all buffers, resulting in a blank unnamed buffer window similar to fresh session
vim.cmd("bufdo bd")
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>qq"] = {
function()
-- Use to have this which always closed and quit ont he last screen: "<cmd>confirm q<cr>"
-- Instead I want this behavior:
-- if only 1 screen is open then close all buffers, resulting in a blank unamed buffer window similar to fresh session
-- else if more than 1 screen, confirm q to close that screen
-- Check the number of screens
if vim.fn.winnr("$") == 1 then
-- If only 1 screen is open then close all buffers, resulting in a blank unnamed buffer window similar to fresh session
vim.cmd("bufdo bd")
vim.cmd("SessionDelete")
else
-- If more than 1 screen, confirm q to close that screen
vim.cmd("confirm q")
end
end,
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"] = { "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all" },
["<leader><leader>sq"] = { "<cmd>Neotree close<cr><cmd>SessionDelete<cr><cmd>qa<CR>", desc = "Quit all, no session saved" },
["<leader><leader>q"] = { "<cmd>Neotree close<cr><cmd>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>l<leader>"] = {
function()
-- vim.cmd "SqlxFormat"
vim.lsp.buf.format()
end,
desc = "Reformat file",
},
["<leader>ls<leader>"] = { "<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" },
["<leader>S"] = {
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
desc = "Equalize/resize screens evenly",
},
},
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" },
[">"] = { "> gv", desc = "Indent selection" },
["<"] = { "< gv", desc = "Outdent 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" },
},
else
-- If more than 1 screen, confirm q to close that screen
vim.cmd("confirm q")
end
end,
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"] = { "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all" },
["<leader><leader>sq"] = {
"<cmd>Neotree close<cr><cmd>SessionDelete<cr><cmd>qa<CR>",
desc = "Quit all, no session saved",
},
["<leader><leader>q"] = { "<cmd>Neotree close<cr><cmd>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>l<leader>"] = {
function()
-- vim.cmd "SqlxFormat"
vim.lsp.buf.format()
end,
desc = "Reformat file",
},
["<leader>ls<leader>"] = { "<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" },
["<leader>S"] = {
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
desc = "Equalize/resize screens evenly",
},
},
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" },
[">"] = { "> gv", desc = "Indent selection" },
["<"] = { "< gv", desc = "Outdent 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" },
},
})