WIP on new config
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
c86f67f0f7
commit
c42f197307
13 changed files with 354 additions and 85 deletions
135
lua/keymaps.lua
135
lua/keymaps.lua
|
|
@ -1,3 +1,4 @@
|
|||
local util = require("util")
|
||||
-- Remap space as leader key
|
||||
vim.keymap.set("", "<Space>", "<Nop>", { silent = true })
|
||||
vim.g.mapleader = " "
|
||||
|
|
@ -13,50 +14,54 @@ vim.g.maplocalleader = " "
|
|||
|
||||
local nvx = { "n", "v", "x" }
|
||||
|
||||
require("util").keymaps({
|
||||
-- =============
|
||||
-- n/v/x (normal + visual modes)
|
||||
-- =============
|
||||
util.keymaps({
|
||||
-- ===========
|
||||
-- Basic
|
||||
-- ===========
|
||||
{ "<left>", '<cmd>echo "use h/j/k/l to move!"<cr>', mode = nvx },
|
||||
{ "<right>", '<cmd>echo "use h/j/k/l to move!"<cr>', mode = nvx },
|
||||
{ "<up>", '<cmd>echo "use h/j/k/l to move!"<cr>', mode = nvx },
|
||||
{ "<down>", '<cmd>echo "use h/j/k/l to move!"<cr>', mode = nvx },
|
||||
{ ";", ":", desc = "No shift to enter command mode with semicolon. Alias ; to :", mode = nvx },
|
||||
{ "<leader>a", "<esc>ggVG", desc = "Select all", mode = nvx },
|
||||
{ "<leader>w", "<cmd>w<cr>", desc = "Save", mode = nvx },
|
||||
{
|
||||
"<leader>q",
|
||||
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 unnamed 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",
|
||||
mode = nvx,
|
||||
},
|
||||
{ "Q", "<cmd>qa<CR>", desc = "Quit all", mode = nvx },
|
||||
-- { "Q", "<cmd>qa<CR>", desc = "Quit all", mode = nvx },
|
||||
{ "<leader>Q", "<nop>", mode = nvx }, -- don't do normal Q quit
|
||||
{ "<leader>a", "<esc>ggVG", desc = "Select all", mode = nvx },
|
||||
{ "Q", "<cmd>qa<CR>", desc = "Quit all", mode = nvx },
|
||||
{
|
||||
"<leader>QQ",
|
||||
-- TODO REVISIT is this session stuff still relevant?
|
||||
"<cmd>NvimTreeClose<cr><cmd>SessionDelete<cr><cmd>qa<CR>",
|
||||
desc = "Quit all, no session saved",
|
||||
mode = nvx,
|
||||
},
|
||||
{ "<leader>y", '"+y', desc = "Copy to system clipboard", mode = nvx },
|
||||
{ "<leader>p", '"+p', desc = "Paste from system clipboard", mode = nvx },
|
||||
{ "<leader>bq", "<cmd>bp|bd #<cr>", desc = "Close current buffer only", mode = nvx },
|
||||
{ "<leader>bn", "<cmd>enew<cr>", desc = "Open a new buffer in current screen", mode = nvx },
|
||||
{ "<leader>bt", "<cmd>terminal<cr>i", desc = "Open a terminal in current screen", mode = nvx },
|
||||
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Create new tab", mode = nvx },
|
||||
{ "<leader>tq", "<cmd>tabclose<cr>", desc = "Close current tab", mode = nvx },
|
||||
{ "<esc>", "<cmd>nohlsearch<CR><esc>", desc = "Clear search on escape" },
|
||||
{ "<return>", "<cmd>nohlsearch<CR><return>", desc = "Clear search on return" },
|
||||
{ "|", "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
||||
{ "\\", "<cmd>split<cr>", desc = "Horizontal Split" },
|
||||
|
||||
-- Buffers
|
||||
{ "<leader>b", "<cmd>b#<cr>", desc = "Switch to last buffer", mode = nvx },
|
||||
{
|
||||
"<leader>q",
|
||||
function()
|
||||
-- Custom close/quit
|
||||
-- * if non empty buffer, we will simply open a new empty buffer unless
|
||||
-- it is in the close always list
|
||||
-- * if empty buffer, then we will quit this buffer
|
||||
local close_always = { "quickfix", "help", "nofile" }
|
||||
if
|
||||
util.table_contains(close_always, vim.bo.buftype)
|
||||
or (vim.api.nvim_buf_line_count(0) == 1 and vim.api.nvim_buf_get_lines(0, 0, 1, -1)[1] == "")
|
||||
then
|
||||
vim.cmd("silent confirm q")
|
||||
else
|
||||
vim.cmd("enew")
|
||||
end
|
||||
end,
|
||||
desc = "Quit/Close current",
|
||||
mode = nvx,
|
||||
},
|
||||
{
|
||||
"<leader>S",
|
||||
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
|
||||
|
|
@ -67,68 +72,60 @@ require("util").keymaps({
|
|||
{ "<C-j>", "<C-W>j", desc = "Move window below current", mode = nvx },
|
||||
{ "<C-k>", "<C-W>k", desc = "Move window above current", mode = nvx },
|
||||
{ "<C-l>", "<C-W>l", desc = "Move window right current", mode = nvx },
|
||||
{ "B", "<cmd>b#<cr>", desc = "Switch to last buffer", mode = nvx },
|
||||
|
||||
-- Tabs
|
||||
-- TODO revisit, do I even need these tab things?
|
||||
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Create new tab", mode = nvx },
|
||||
{ "<leader>tq", "<cmd>tabclose<cr>", desc = "Close current tab", mode = nvx },
|
||||
{ "H", "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||
{ "L", "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||
|
||||
-- LSP/IDE/etc
|
||||
{
|
||||
"<leader>l<leader>",
|
||||
function()
|
||||
-- vim.cmd "SqlxFormat"
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
vim.lsp.buf.format,
|
||||
desc = "Reformat file",
|
||||
mode = nvx,
|
||||
},
|
||||
{
|
||||
"<leader>ls<leader>",
|
||||
"<cmd>SqlxFormat<cr>",
|
||||
desc = "Format sqlx queries in rust raw string literals.",
|
||||
mode = nvx,
|
||||
},
|
||||
{
|
||||
"<leader>ld",
|
||||
function()
|
||||
vim.diagnostic.open_float()
|
||||
end,
|
||||
vim.diagnostic.open_float,
|
||||
desc = "Show diagnostic message",
|
||||
mode = nvx,
|
||||
},
|
||||
{
|
||||
"<leader>ll",
|
||||
function()
|
||||
vim.diagnostic.setloclist()
|
||||
end,
|
||||
desc = "Show diagnostic list",
|
||||
vim.diagnostic.setloclist,
|
||||
desc = "Show diagnostics in quickfix list",
|
||||
mode = nvx,
|
||||
},
|
||||
|
||||
-- =============
|
||||
-- =============
|
||||
-- =============
|
||||
-- =============
|
||||
-- =============
|
||||
-- =============
|
||||
-- =============
|
||||
-- normal mode
|
||||
-- =============
|
||||
-- { "", "", desc = "" },
|
||||
{ "H", "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||
{ "L", "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||
{ "|", "<cmd>vsplit<cr>", desc = "Vertical Split" },
|
||||
{ "\\", "<cmd>split<cr>", desc = "Horizontal Split" },
|
||||
{ "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" },
|
||||
{ "<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" },
|
||||
|
||||
-- { "n", "nzzzv", desc = "Next search result centered" },
|
||||
-- { "N", "Nzzzv", desc = "Previous search result centered" },
|
||||
-- { "<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" },
|
||||
{ "J", "mzJ`z", desc = "Move line below onto this line" },
|
||||
{ "<S-Tab>", "<C-o>", desc = "Go back <C-o>" },
|
||||
{
|
||||
"]d",
|
||||
function()
|
||||
vim.diagnostic.goto_next()
|
||||
end,
|
||||
desc = "Go to next diagnostic",
|
||||
vim.diagnostic.goto_next,
|
||||
desc = "Go to next diagnostic message",
|
||||
},
|
||||
{
|
||||
"[d",
|
||||
function()
|
||||
vim.diagnostic.goto_prev()
|
||||
end,
|
||||
desc = "Go to next diagnostic",
|
||||
vim.diagnostic.goto_prev,
|
||||
desc = "Go to previous diagnostic message",
|
||||
},
|
||||
|
||||
-- =============
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue