tiyn
/
dotfiles
mirror of https://github.com/tiyn/dotfiles
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvim: update plugins

Browse Source
master
tiyn 1 year ago
parent 50bf778d2b
commit b0495096b7
2 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
.config/nvim/lazy-lock.json
Unescape View File

@ -9,6 +9,7 @@
"comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"conform.nvim": { "branch": "master", "commit": "8b407bb6175846cdc4c499e2a8d28109615a2089" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
"dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" },
"fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
"fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" },
"git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" },
@ -16,10 +17,12 @@
"indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
"knap": { "branch": "main", "commit": "503010f541696e99ed5c62f658620e546cebf8b0" },
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
"legendary.nvim": { "branch": "master", "commit": "234e2ef8dec65db153c63a8b310c74155bb93ee7" },
"lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" },
"lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
"luasnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
"mapx.nvim": { "branch": "main", "commit": "c3dd43474a5fc2f266309bc04a69b74eb2524671" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
"mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" },
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
@ -54,5 +57,6 @@
"vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
"vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" },
"vim-renamer": { "branch": "master", "commit": "9c6346eb4556cf2d8ca55de6969247ab14fe2383" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
}

80
.config/nvim/lua/keymap.lua
Unescape View File

@ -7,9 +7,21 @@ vim.api.nvim_create_autocmd('TextYankPost', {
group = highlight_group,
})
-- setup keymap function
local m = require 'mapx'.setup { global = true, whichkey = true }
-- setup keymap groups
m.nname("g", "LSP: goto")
m.cname("w", "Write")
m.cname("w!", "Write: overwrite")
m.nname("<leader>g", "Git")
m.nname("<leader>gd", "Git: diff")
m.nname("<leader>s", "Substitute")
m.nname("<leader>t", "Terminal")
-- unmap unwanted commands
m.nnoremap("Zt", '<NOP>')
m.nnoremap("ZT", '<NOP>')
m.nnoremap("<Space>", '<NOP>')
m.inoremap("<F1>", '<NOP>')
m.nnoremap("<F1>", '<NOP>')
@ -27,67 +39,57 @@ m.inoremap("<F11>", '<NOP>')
m.nnoremap("<F11>", '<NOP>')
m.inoremap("<F12>", '<NOP>')
m.nnoremap("<F12>", '<NOP>')
m.nnoremap("ZT", '<NOP>')
m.nnoremap("Zt", '<NOP>')
-- shortcut for split navigation
m.nnoremap("<C-h>", '<C-w>h', 'splits: go to left split')
m.nnoremap("<C-j>", '<C-w>j', 'splits: go to lower split')
m.nnoremap("<C-k>", '<C-w>k', 'splits: go to upper split')
m.nnoremap("<C-l>", '<C-w>l', 'splits: go to right split')
m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left split')
m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower split')
m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper split')
m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right split')
-- remap for dealing with word wrap
m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'Navigation: go up in wrapped lines')
-- compiler for languages
m.nnoremap("<leader>c", ':w! | !compiler <c-r>%<CR>', 'Compile current file')
m.nnoremap("<leader>c", ':w! | !compiler <c-r>%<CR>', 'Compile: current file')
-- save file as sudo on files that require root permission
m.cname("w", "Write")
m.cname("w!", "Write with sudo")
m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write file over with sudo')
m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write: overwrite file over with sudo')
-- easy substitution for whole file and line, visual mode
m.nname("<leader>s", "Substitute")
m.nnoremap("<leader>ss", ':%s/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
m.nnoremap("<leader>sa", ':%s//g<Left><Left>', 'Substitute: free form')
-- remap for dealing with word wrap
m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'go up in wrapped lines')
m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'go down in wrapped lines')
m.nnoremap("<leader>ss", ':%s/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
-- stevearc/aerial.nvim
m.nmap('<F3>', ':AerialToggle!<CR>', 'Aerial: Open side window')
m.nmap('<F3>', ':AerialToggle!<CR>', 'CTags: toggle')
-- nvim-tree/nvim-tree.lua
m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'NvimTree: toggle')
m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'File tree: toggle')
-- numtostr/fterm.nvim
m.nname("<leader>t", "FTerm")
m.nnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: toggle')
m.tnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: toggle')
-- sindrets/diffview.nvim
m.nname("<leader>g", "Git")
m.nnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
m.tnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
local lazygit = require("FTerm"):new({
cmd = 'lazygit',
})
m.nnoremap("<leader>tg", function() lazygit:toggle() end, 'Lazygit: toggle')
m.tnoremap("<leader>tg", function() lazygit:toggle() end, 'Lazygit: toggle')
m.nnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
m.tnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
m.nnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
m.tnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
m.nname("<leader>gd", "Git Diff")
m.nmap("<leader>gdo", ":DiffviewOpen<CR>", "Git Diff: open")
m.nmap("<leader>gdc", ":DiffviewClose<CR>", "Git Diff: close")
-- sindrets/diffview.nvim
m.nmap("<leader>gdo", ":DiffviewOpen<CR>", "Git: open diff")
m.nmap("<leader>gdc", ":DiffviewClose<CR>", "Git: close diff")
-- folke/trouble.nvim
m.nmap("<leader>x", ":TroubleToggle<CR>", "Trouble: toggle")
m.nmap("<leader>x", ":TroubleToggle<CR>", "LSP: toggle error list")
-- hrsh7th/nvim-cmp
m.nname("g", "LSP: goto")
m.nnoremap("gD", vim.lsp.buf.declaration, "LSP: goto declaration")
m.nnoremap("gd", vim.lsp.buf.definition, "LSP: goto definition")
m.nnoremap("gy", vim.lsp.buf.type_definition, "LSP: goto type definition")
m.nnoremap("gD", vim.lsp.buf.declaration, "LSP: goto declaration")
m.nnoremap("gi", vim.lsp.buf.implementation, "LSP: list implementation")
m.nnoremap("gr", vim.lsp.buf.references, "LSP: list references")
m.nnoremap("gy", vim.lsp.buf.type_definition, "LSP: goto type definition")
m.nnoremap("K", vim.lsp.buf.hover, "LSP: show documentation")
m.nnoremap("<F8>", function() require("conform").format({ async = true, lsp_fallback = true }) end, "LSP: format")
@ -98,7 +100,7 @@ m.nnoremap("<F5>", require("renamer").rename, "LSP: rename")
m.nnoremap("<F4>", ':Telescope find_files<CR>', "Telescope: find files")
-- kamykn/spelunker.vim
m.nnoremap("<F6>", ':call spelunker#toggle()<CR>', "Spelunker: toggle")
m.nnoremap("<F6>", ':call spelunker#toggle()<CR>', "Spelling: toggle spell check")
-- kevinhwang91/nvim-ufo
m.nnoremap("K", function()
@ -106,10 +108,10 @@ m.nnoremap("K", function()
if not winid then
vim.lsp.buf.hover()
end
end, "UFO: peek folded section")
end, "LSP: peek folded section")
-- kevinhwang91/nvim-hlslens
m.nnoremap("n", [[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>]],
'silent', "HLSens: search forward")
'silent', "Search: search forward")
m.nnoremap("N", [[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
'silent', "HLSens: search backwards")
'silent', "Search: search backwards")

Write Preview
Loading…
Cancel
Save