notification and screen resize helps
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
39628e8f2f
commit
1f6dce4665
4 changed files with 109 additions and 86 deletions
|
|
@ -30,6 +30,7 @@
|
||||||
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
|
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
|
"nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" },
|
"nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" },
|
||||||
|
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "f7bb866405530e863135596900781e73cbf6f4ed" },
|
"nvim-treesitter": { "branch": "master", "commit": "f7bb866405530e863135596900781e73cbf6f4ed" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
|
||||||
|
|
|
||||||
174
lua/keymaps.lua
174
lua/keymaps.lua
|
|
@ -12,89 +12,93 @@ 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>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
|
["<leader>q"] = { "<cmd>confirm q<cr>", 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" },
|
||||||
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
["J"] = { "mzJ`z", desc = "Move line below onto this line" },
|
||||||
["<S-Tab>"] = { "<C-o>", desc = "Go back <C-o>" },
|
["<S-Tab>"] = { "<C-o>", desc = "Go back <C-o>" },
|
||||||
-- window navigation
|
-- window navigation
|
||||||
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
["<C-h>"] = { "<C-w>h", desc = "Move window left current" },
|
||||||
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
|
||||||
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
|
||||||
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
|
||||||
-- tab navigation
|
-- tab navigation
|
||||||
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
["H"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
|
||||||
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
["L"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
|
||||||
-- reformat LSP
|
-- reformat LSP
|
||||||
["<leader>lf"] = {
|
["<leader>lf"] = {
|
||||||
function()
|
function()
|
||||||
-- vim.cmd "SqlxFormat"
|
-- vim.cmd "SqlxFormat"
|
||||||
vim.lsp.buf.format()
|
vim.lsp.buf.format()
|
||||||
end,
|
end,
|
||||||
desc = "Reformat file",
|
desc = "Reformat file",
|
||||||
},
|
},
|
||||||
["<leader>lsf"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
["<leader>lsf"] = { "<cmd>SqlxFormat<cr>", desc = "Format sqlx queries in rust raw string literals." },
|
||||||
["<leader>ld"] = {
|
["<leader>ld"] = {
|
||||||
function()
|
function()
|
||||||
vim.diagnostic.open_float()
|
vim.diagnostic.open_float()
|
||||||
end,
|
end,
|
||||||
desc = "Show diagnostic message",
|
desc = "Show diagnostic message",
|
||||||
},
|
},
|
||||||
["<leader>ll"] = {
|
["<leader>ll"] = {
|
||||||
function()
|
function()
|
||||||
vim.diagnostic.setloclist()
|
vim.diagnostic.setloclist()
|
||||||
end,
|
end,
|
||||||
desc = "Show diagnostic list",
|
desc = "Show diagnostic list",
|
||||||
},
|
},
|
||||||
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
|
["<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" },
|
["<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" },
|
["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
|
||||||
},
|
["<leader>S"] = {
|
||||||
v = {
|
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
|
||||||
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
desc = "Equalize/resize screens evenly",
|
||||||
["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',
|
v = {
|
||||||
desc = "Generate and replace UUID",
|
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },
|
||||||
},
|
["K"] = { ":m '<-2<CR>gv=gv", desc = "Visually move block up" },
|
||||||
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
["<leader>,uu"] = {
|
||||||
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
'd:let @u = trim(tolower(system("uuidgen")))<cr>i<C-r>u',
|
||||||
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
desc = "Generate and replace UUID",
|
||||||
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
},
|
||||||
},
|
["<leader>y"] = { '"*y', desc = "Copy to system clipboard" },
|
||||||
i = {
|
["<leader>p"] = { '"*p', desc = "Paste from system clipboard" },
|
||||||
["<C-k>"] = { "<Up>", desc = "Up" },
|
["p"] = { '"_dP', desc = "Paste without yanking replaced content" },
|
||||||
["<C-j>"] = { "<Down>", desc = "Down" },
|
["<C-r>"] = { '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection" },
|
||||||
["<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" },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,12 @@ vim.opt.splitright = true
|
||||||
-- Set completeopt to have a better completion experience
|
-- Set completeopt to have a better completion experience
|
||||||
vim.o.completeopt = "menuone,noselect"
|
vim.o.completeopt = "menuone,noselect"
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
float = { border = "single" },
|
float = { border = "single" },
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Turn on new diff
|
-- Turn on new diff
|
||||||
vim.opt.diffopt:append("linematch:20")
|
vim.opt.diffopt:append("linematch:20")
|
||||||
|
|
||||||
|
-- Set screen mode
|
||||||
|
vim.o.noequalalways = true
|
||||||
|
vim.o.equalalways = false
|
||||||
|
|
|
||||||
14
lua/plugins/vim-notify.lua
Normal file
14
lua/plugins/vim-notify.lua
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
return {
|
||||||
|
"rcarriga/nvim-notify",
|
||||||
|
opts = {
|
||||||
|
top_down = false,
|
||||||
|
},
|
||||||
|
config = function(_, opts)
|
||||||
|
require("notify").setup(opts)
|
||||||
|
|
||||||
|
vim.notify = require("notify")
|
||||||
|
end,
|
||||||
|
keys = {
|
||||||
|
{ "<leader>fn", "<cmd>Telescope notify<cr>", desc = "Telescope search notifications" },
|
||||||
|
},
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue