formatting
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
d51fec7eb9
commit
7adc3a8bf9
2 changed files with 114 additions and 183 deletions
75
cspell.json
75
cspell.json
|
|
@ -1,74 +1 @@
|
||||||
{
|
{"flagWords":[],"version":"0.2","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer"],"language":"en"}
|
||||||
"language": "en",
|
|
||||||
"version": "0.2",
|
|
||||||
"flagWords": [],
|
|
||||||
"words": [
|
|
||||||
"nvim",
|
|
||||||
"builtins",
|
|
||||||
"stylua",
|
|
||||||
"rustfmt",
|
|
||||||
"pendo",
|
|
||||||
"tanstack",
|
|
||||||
"ripgrep",
|
|
||||||
"Typeahead",
|
|
||||||
"overscan",
|
|
||||||
"autorun",
|
|
||||||
"mediatype",
|
|
||||||
"BIOINF",
|
|
||||||
"Transitioner",
|
|
||||||
"pkce",
|
|
||||||
"ilike",
|
|
||||||
"arrayify",
|
|
||||||
"arrayified",
|
|
||||||
"komodo",
|
|
||||||
"wezterm",
|
|
||||||
"gcloud",
|
|
||||||
"pbpaste",
|
|
||||||
"Hasher",
|
|
||||||
"semvers",
|
|
||||||
"upserted",
|
|
||||||
"dtos",
|
|
||||||
"Yeatts",
|
|
||||||
"Mahon",
|
|
||||||
"Beaubier",
|
|
||||||
"Taussing",
|
|
||||||
"chakra",
|
|
||||||
"langchain",
|
|
||||||
"openai",
|
|
||||||
"getattr",
|
|
||||||
"llms",
|
|
||||||
"docstore",
|
|
||||||
"kwargs",
|
|
||||||
"svgr",
|
|
||||||
"healthcheck",
|
|
||||||
"venv",
|
|
||||||
"virtualenv",
|
|
||||||
"ringofstorms",
|
|
||||||
"nestjs",
|
|
||||||
"oneshot",
|
|
||||||
"templating",
|
|
||||||
"tiktoken",
|
|
||||||
"pydantic",
|
|
||||||
"NCCN",
|
|
||||||
"clsx",
|
|
||||||
"reactflow",
|
|
||||||
"Convo",
|
|
||||||
"DSAB",
|
|
||||||
"pgvector",
|
|
||||||
"postprocess",
|
|
||||||
"stylelua",
|
|
||||||
"sqlx",
|
|
||||||
"genemichaels",
|
|
||||||
"williamboman",
|
|
||||||
"substr",
|
|
||||||
"findfile",
|
|
||||||
"Hammerspoon",
|
|
||||||
"eventtap",
|
|
||||||
"OSTYPE",
|
|
||||||
"sccache",
|
|
||||||
"binstall",
|
|
||||||
"elif",
|
|
||||||
"autofocus",
|
|
||||||
"colours"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
|
||||||
222
lua/keymaps.lua
222
lua/keymaps.lua
|
|
@ -12,114 +12,118 @@ vim.g.maplocalleader = " "
|
||||||
-- command_mode = "c",
|
-- command_mode = "c",
|
||||||
|
|
||||||
require("util").keymaps({
|
require("util").keymaps({
|
||||||
n = {
|
n = {
|
||||||
[";"] = { ":", desc = "No shift command mode" },
|
[";"] = { ":", desc = "No shift command mode" },
|
||||||
["n"] = { "nzzzv", desc = "Next search result centered" },
|
["n"] = { "nzzzv", desc = "Next search result centered" },
|
||||||
["N"] = { "Nzzzv", desc = "Previous search result centered" },
|
["N"] = { "Nzzzv", desc = "Previous search result centered" },
|
||||||
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
|
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
|
||||||
["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
|
["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
|
||||||
["<leader>a"] = { "ggVG", desc = "Select all" },
|
["<leader>a"] = { "ggVG", desc = "Select all" },
|
||||||
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
|
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
|
||||||
["<leader>qq"] = {
|
["<leader>qq"] = {
|
||||||
function()
|
function()
|
||||||
-- Use to have this which always closed and quit ont he last screen: "<cmd>confirm q<cr>"
|
-- Use to have this which always closed and quit ont he last screen: "<cmd>confirm q<cr>"
|
||||||
-- Instead I want this behavior:
|
-- 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
|
-- 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
|
-- else if more than 1 screen, confirm q to close that screen
|
||||||
-- Check the number of screens
|
-- Check the number of screens
|
||||||
if vim.fn.winnr("$") == 1 then
|
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
|
-- 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("bufdo bd")
|
||||||
vim.cmd("SessionDelete")
|
vim.cmd("SessionDelete")
|
||||||
else
|
else
|
||||||
-- If more than 1 screen, confirm q to close that screen
|
-- If more than 1 screen, confirm q to close that screen
|
||||||
vim.cmd("confirm q")
|
vim.cmd("confirm q")
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
desc = "Quit",
|
desc = "Quit",
|
||||||
},
|
},
|
||||||
["<leader>bq"] = { "<cmd>bp|bd #<cr>", desc = "Close current buffer only" },
|
["<leader>bq"] = { "<cmd>bp|bd #<cr>", desc = "Close current buffer only" },
|
||||||
["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "Create new tab" },
|
["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "Create new tab" },
|
||||||
["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
|
["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
|
||||||
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
||||||
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
|
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
|
||||||
["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
|
["<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" },
|
["<C-u>"] = { "<C-u>zz", desc = "Vertical half page up and center cursor" },
|
||||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||||
-- ["<leader>Q"] = { "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all" },
|
-- ["<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>sq"] = {
|
||||||
["<leader><leader>q"] = { "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all" },
|
"<cmd>Neotree close<cr><cmd>SessionDelete<cr><cmd>qa<CR>",
|
||||||
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
desc = "Quit all, no session saved",
|
||||||
["<S-Tab>"] = { "<C-o>", desc = "Go back <C-o>" },
|
},
|
||||||
-- window navigation
|
["<leader><leader>q"] = { "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all" },
|
||||||
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
||||||
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
["<S-Tab>"] = { "<C-o>", desc = "Go back <C-o>" },
|
||||||
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
-- window navigation
|
||||||
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
||||||
-- tab navigation
|
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
||||||
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
||||||
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
||||||
-- reformat LSP
|
-- tab navigation
|
||||||
["<leader>l<leader>"] = {
|
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||||
function()
|
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||||
-- vim.cmd "SqlxFormat"
|
-- reformat LSP
|
||||||
vim.lsp.buf.format()
|
["<leader>l<leader>"] = {
|
||||||
end,
|
function()
|
||||||
desc = "Reformat file",
|
-- vim.cmd "SqlxFormat"
|
||||||
},
|
vim.lsp.buf.format()
|
||||||
["<leader>ls<leader>"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
end,
|
||||||
["<leader>ld"] = {
|
desc = "Reformat file",
|
||||||
function()
|
},
|
||||||
vim.diagnostic.open_float()
|
["<leader>ls<leader>"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
||||||
end,
|
["<leader>ld"] = {
|
||||||
desc = "Show diagnostic message",
|
function()
|
||||||
},
|
vim.diagnostic.open_float()
|
||||||
["<leader>ll"] = {
|
end,
|
||||||
function()
|
desc = "Show diagnostic message",
|
||||||
vim.diagnostic.setloclist()
|
},
|
||||||
end,
|
["<leader>ll"] = {
|
||||||
desc = "Show diagnostic list",
|
function()
|
||||||
},
|
vim.diagnostic.setloclist()
|
||||||
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
|
end,
|
||||||
["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" },
|
desc = "Show diagnostic list",
|
||||||
["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
|
},
|
||||||
["<leader>S"] = {
|
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
|
||||||
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
|
["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" },
|
||||||
desc = "Equalize/resize screens evenly",
|
["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
|
||||||
},
|
["<leader>S"] = {
|
||||||
},
|
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
|
||||||
v = {
|
desc = "Equalize/resize screens evenly",
|
||||||
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
},
|
||||||
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
|
},
|
||||||
["<leader>,uu"] = {
|
v = {
|
||||||
'd:let @u = trim(tolower(system("uuidgen")))<cr>i<C-r>u',
|
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
||||||
desc = "Generate and replace UUID",
|
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
|
||||||
},
|
["<leader>,uu"] = {
|
||||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
'd:let @u = trim(tolower(system("uuidgen")))<cr>i<C-r>u',
|
||||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
desc = "Generate and replace UUID",
|
||||||
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
},
|
||||||
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||||
[">"] = { "> gv", desc = "Indent selection" },
|
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||||
["<"] = { "< gv", desc = "Outdent selection" },
|
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
||||||
},
|
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
||||||
i = {
|
[">"] = { "> gv", desc = "Indent selection" },
|
||||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
["<"] = { "< gv", desc = "Outdent selection" },
|
||||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
|
||||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
},
|
||||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
i = {
|
||||||
["<C-4>"] = { "<End>", desc = "End" },
|
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||||
},
|
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||||
c = {
|
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||||
["<C-h>"] = { "<Left>", desc = "Left" },
|
["<C-4>"] = { "<End>", desc = "End" },
|
||||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
},
|
||||||
["<C-l>"] = { "<Right>", desc = "Right" },
|
c = {
|
||||||
["<C-4>"] = { "<End>", desc = "End" },
|
["<C-h>"] = { "<Left>", desc = "Left" },
|
||||||
["<C-6>"] = { "<Home>", desc = "Home" },
|
["<C-j>"] = { "<Down>", desc = "Down" },
|
||||||
},
|
["<C-k>"] = { "<Up>", desc = "Up" },
|
||||||
t = {
|
["<C-l>"] = { "<Right>", desc = "Right" },
|
||||||
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
|
["<C-4>"] = { "<End>", desc = "End" },
|
||||||
},
|
["<C-6>"] = { "<Home>", desc = "Home" },
|
||||||
|
},
|
||||||
|
t = {
|
||||||
|
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue