diff options
| -rw-r--r-- | init.lua | 3 | ||||
| -rw-r--r-- | lua/keymappings.lua | 14 | ||||
| -rw-r--r-- | lua/lv-comment/init.lua | 2 | ||||
| -rw-r--r-- | lua/lv-nvimtree/init.lua | 6 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 137 | ||||
| -rw-r--r-- | lua/plugins.lua | 5 | ||||
| -rw-r--r-- | lua/settings.lua | 2 | ||||
| -rw-r--r-- | vimscript/lv-whichkey/init.vim | 140 |
8 files changed, 149 insertions, 160 deletions
@@ -17,9 +17,10 @@ require('lv-nvimtree') require('lv-treesitter') require('lv-autopairs') require('lv-rnvimr') +require('lv-which-key') -- Which Key (Hope to replace with Lua plugin someday) -vim.cmd('source ~/.config/nvim/vimscript/lv-whichkey/init.vim') +-- vim.cmd('source ~/.config/nvim/vimscript/lv-whichkey/init.vim') vim.cmd('source ~/.config/nvim/vimscript/functions.vim') -- LSP diff --git a/lua/keymappings.lua b/lua/keymappings.lua index fd1f3085..a942924f 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -1,11 +1,3 @@ -vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true}) -vim.g.mapleader = ' ' - --- no hl -vim.api.nvim_set_keymap('n', '<Leader>h', ':set hlsearch!<CR>', {noremap = true, silent = true}) - --- explorer -vim.api.nvim_set_keymap('n', '<Leader>e', ':NvimTreeToggle<CR>', {noremap = true, silent = true}) vim.api.nvim_set_keymap('n', '-', ':RnvimrToggle<CR>', {noremap = true, silent = true}) -- better window movement @@ -42,9 +34,9 @@ vim.api.nvim_set_keymap('v', '<', '<gv', {noremap = true, silent = true}) vim.api.nvim_set_keymap('v', '>', '>gv', {noremap = true, silent = true}) -- I hate escape -vim.api.nvim_set_keymap('i', 'jk', '<ESC>', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('i', 'kj', '<ESC>', {noremap = true, silent = true}) -vim.api.nvim_set_keymap('i', 'jj', '<ESC>', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('i', 'jk', '<ESC>', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('i', 'kj', '<ESC>', {noremap = true, silent = true}) +-- vim.api.nvim_set_keymap('i', 'jj', '<ESC>', {noremap = true, silent = true}) -- Tab switch buffer vim.api.nvim_set_keymap('n', '<TAB>', ':bnext<CR>', {noremap = true, silent = true}) diff --git a/lua/lv-comment/init.lua b/lua/lv-comment/init.lua index df794386..e1f13586 100644 --- a/lua/lv-comment/init.lua +++ b/lua/lv-comment/init.lua @@ -1,3 +1 @@ require('nvim_comment').setup() -vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", {noremap=true, silent = true}) -vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", {noremap=true, silent = true}) diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua index f493be85..da513985 100644 --- a/lua/lv-nvimtree/init.lua +++ b/lua/lv-nvimtree/init.lua @@ -32,13 +32,13 @@ local tree_cb = require'nvim-tree.config'.nvim_tree_callback ["<2-LeftMouse>"] = tree_cb("edit"), ["<2-RightMouse>"] = tree_cb("cd"), ["<C-]>"] = tree_cb("cd"), - ["<C-v>"] = tree_cb("vsplit"), - ["<C-x>"] = tree_cb("split"), + ["v"] = tree_cb("vsplit"), + ["s"] = tree_cb("split"), ["<C-t>"] = tree_cb("tabnew"), ["<"] = tree_cb("prev_sibling"), [">"] = tree_cb("next_sibling"), ["<BS>"] = tree_cb("close_node"), - ["h"] = tree_cb("close_node"), + ["h"] = tree_cb("close_node"), ["<S-CR>"] = tree_cb("close_node"), ["<Tab>"] = tree_cb("preview"), ["I"] = tree_cb("toggle_ignored"), diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua new file mode 100644 index 00000000..00fdce2e --- /dev/null +++ b/lua/lv-which-key/init.lua @@ -0,0 +1,137 @@ +require("which-key").setup { + plugins = { + marks = true, -- shows a list of your marks on ' and ` + registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode + -- the presets plugin, adds help for a bunch of default keybindings in Neovim + -- No actual key bindings are created + presets = { + operators = true, -- adds help for operators like d, y, ... + motions = true, -- adds help for motions + text_objects = true, -- help for text objects triggered after entering an operator + windows = true, -- default bindings on <c-w> + nav = true, -- misc bindings to work with windows + z = true, -- bindings for folds, spelling and others prefixed with z + g = true -- bindings for prefixed with g + } + }, + icons = { + breadcrumb = "ยป", -- symbol used in the command line area that shows your active key combo + separator = "โ", -- symbol used between a key and it's label + group = "+" -- symbol prepended to a group + }, + window = { + border = "single", -- none, single, double, shadow + position = "bottom", -- bottom, top + margin = {1, 0, 1, 0}, -- extra window margin [top, right, bottom, left] + padding = {2, 2, 2, 2} -- extra window padding [top, right, bottom, left] + }, + layout = { + height = {min = 4, max = 25}, -- min and max height of the columns + width = {min = 20, max = 50}, -- min and max width of the columns + spacing = 3 -- spacing between columns + }, + hidden = {"<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ "}, -- hide mapping boilerplate + show_help = true -- show help message on the command line when the popup is visible +} + +local opts = { + mode = "n", -- NORMAL mode + -- prefix: use "<leader>f" for example for mapping everything related to finding files + -- the prefix is prepended to every mapping part of `mappings` + prefix = "<leader>", + buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings + silent = true, -- use `silent` when creating keymaps + noremap = true, -- use `noremap` when creating keymaps + nowait = false -- use `nowait` when creating keymaps +} + +-- Set leader +vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true}) +vim.g.mapleader = ' ' + +-- no hl +vim.api.nvim_set_keymap('n', '<Leader>h', ':set hlsearch!<CR>', {noremap = true, silent = true}) + +-- explorer +vim.api.nvim_set_keymap('n', '<Leader>e', ':NvimTreeToggle<CR>', {noremap = true, silent = true}) + +-- telescope +vim.api.nvim_set_keymap('n', '<Leader>f', ':Telescope find_files<CR>', {noremap = true, silent = true}) + +-- dashboard +vim.api.nvim_set_keymap('n', '<Leader>;', ':Dashboard<CR>', {noremap = true, silent = true}) + +-- Comments +vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", {noremap = true, silent = true}) +vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", {noremap = true, silent = true}) + +-- close buffer +vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", {noremap = true, silent = true}) + +-- TODO create entire treesitter section + +local mappings = { + ["/"] = "Comment", + ["c"] = "Close Buffer", + ["e"] = "Explorer", + ["f"] = "Find File", + d = { + name = "+Debug", + b = {"<cmd>DebugToggleBreakpoint<cr>", "Toggle Breakpoint"}, + c = {"<cmd>DebugContinue<cr>", "Continue"}, + i = {"<cmd>DebugStepInto<cr>", "Step Into"}, + o = {"<cmd>DebugStepOver<cr>", "Step Over"}, + r = {"<cmd>DebugToggleRepl<cr>", "Toggle Repl"}, + s = {"<cmd>DebugStart<cr>", "Start"}, + }, + g = { + name = "+Git", + j = {"<cmd>NextHunk<cr>", "Next Hunk"}, + k = {"<cmd>PrevHunk<cr>", "Prev Hunk"}, + p = {"<cmd>PreviewHunk<cr>", "Preview Hunk"}, + r = {"<cmd>ResetHunk<cr>", "Reset Hunk"}, + R = {"<cmd>ResetBuffer<cr>", "Reset Buffer"}, + s = {"<cmd>StageHunk<cr>", "Stage Hunk"}, + u = {"<cmd>UndoStageHunk<cr>", "Undo Stage Hunk"}, + }, + l = { + name = "+LSP", + a = {"<cmd>Lspsaga code_action<cr>", "Code Action"}, + A = {"<cmd>Lspsaga range_code_action<cr>", "Selected Action"}, + d = {"<cmd>Telescope lsp_document_diagnostics<cr>", "Document Diagnostics"}, + D = {"<cmd>Telescope lsp_workspace_diagnostics<cr>", "Workspace Diagnostics"}, + f = {"<cmd>LspFormatting<cr>", "Format"}, + i = {"<cmd>LspInfo<cr>", "Info"}, + l = {"<cmd>Lspsaga lsp_finder<cr>", "LSP Finder"}, + L = {"<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics"}, + p = {"<cmd>Lspsaga preview_definition<cr>", "Preview Definition"}, + q = {"<cmd>Telescope quickfix<cr>", "Quickfix"}, + r = {"<cmd>Lspsaga rename<cr>", "Rename"}, + t = {"<cmd>LspTypeDefinition<cr>", "Type Definition"}, + x = {"<cmd>cclose<cr>", "Close Quickfix"}, + s = {"<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols"}, + S = {"<cmd>Telescope lsp_workspace_symbols<cr>", "Workspace Symbols"}, + }, + + s = { + name = "+Search", + b = {"<cmd>Telescope git_branches<cr>", "File"}, + c = {"<cmd>Telescope colorscheme<cr>", "Colorscheme"}, + d = {"<cmd>Telescope lsp_document_diagnostics<cr>", "Document Diagnostics"}, + D = {"<cmd>Telescope lsp_workspace_diagnostics<cr>", "Workspace Diagnostics"}, + f = {"<cmd>Telescope find_files<cr>", "Find File"}, + m = {"<cmd>Telescope marks<cr>", "Marks"}, + M = {"<cmd>Telescope man_pages<cr>", "Man Pages"}, + r = {"<cmd>Telescope oldfiles<cr>", "Open Recent File"}, + R = {"<cmd>Telescope registers<cr>", "Registers"}, + t = {"<cmd>Telescope live_grep<cr>", "Text"}, + }, + S = { + name = "+Session", + s = {"<cmd>SessionSave<cr>", "Save Session"}, + l = {"<cmd>SessionLoad<cr>", "Load Session"}, + }, +} + +local wk = require("which-key") +wk.register(mappings, opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index 967a9d1d..0bf74511 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -64,7 +64,8 @@ return require("packer").startup( -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'} use {"lewis6991/gitsigns.nvim", opt = true} - use {"liuchengxu/vim-which-key", opt = true} + -- use {"liuchengxu/vim-which-key", opt = true} + use {"folke/which-key.nvim", opt = true} use {"ChristianChiarulli/dashboard-nvim", opt = true} use {"windwp/nvim-autopairs", opt = true} use {"terrortylor/nvim-comment", opt = true} @@ -94,7 +95,7 @@ return require("packer").startup( require_plugin("nvim-ts-autotag") require_plugin("nvim-tree.lua") require_plugin("gitsigns.nvim") - require_plugin("vim-which-key") + require_plugin("which-key.nvim") require_plugin("dashboard-nvim") require_plugin("nvim-autopairs") require_plugin("nvim-comment") diff --git a/lua/settings.lua b/lua/settings.lua index 17483362..82262dd5 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -32,7 +32,7 @@ vim.o.backup = false -- This is recommended by coc vim.o.writebackup = false -- This is recommended by coc vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time vim.o.updatetime = 300 -- Faster completion -vim.o.timeoutlen = 100 -- By default timeoutlen is 1000 ms +vim.o.timeoutlen = 500 -- By default timeoutlen is 1000 ms vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else -- vim.o.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18" -- vim.o.guifont = "Hack\\ Nerd\\ Font\\ Mono" diff --git a/vimscript/lv-whichkey/init.vim b/vimscript/lv-whichkey/init.vim deleted file mode 100644 index 2d2b4441..00000000 --- a/vimscript/lv-whichkey/init.vim +++ /dev/null @@ -1,140 +0,0 @@ -" Leader Key Maps - -" Timeout -let g:which_key_timeout = 100 - -let g:which_key_display_names = {'<CR>': 'โต', '<TAB>': 'โ', " ": 'SPC'} - -" Map leader to which_key -nnoremap <silent> <leader> :silent <c-u> :silent WhichKey '<Space>'<CR> -vnoremap <silent> <leader> :silent <c-u> :silent WhichKeyVisual '<Space>'<CR> - -let g:which_key_map = {} -let g:which_key_sep = 'โ' - -" Not a fan of floating windows for this -let g:which_key_use_floating_win = 0 -let g:which_key_max_size = 0 - -" Hide status line -autocmd! FileType which_key -autocmd FileType which_key set laststatus=0 noshowmode noruler - \| autocmd BufLeave <buffer> set laststatus=2 noshowmode ruler - -let g:which_key_map['/'] = 'comment toggle' -let g:which_key_map[';'] = [ ':Dashboard' , 'home screen' ] -let g:which_key_map['?'] = [ ':NvimTreeFindFile' , 'find current file' ] -let g:which_key_map['e'] = [ ':NvimTreeToggle' , 'explorer' ] -let g:which_key_map['f'] = [ ':Telescope find_files' , 'find files' ] -let g:which_key_map['h'] = [ '<C-W>s' , 'split below'] -let g:which_key_map['H'] = [ ':let @/ = ""' , 'no highlight' ] -let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ] -" TODO create entire treesitter section -let g:which_key_map['v'] = [ '<C-W>v' , 'split right'] -" TODO play nice with status line - -" Group mappings - -" b is for buffer -let g:which_key_map.b = { - \ 'name' : '+buffer' , - \ '>' : [':BufferMoveNext' , 'move next'], - \ '<' : [':BufferMovePrevious' , 'move prev'], - \ 'b' : [':BufferPick' , 'pick buffer'], - \ 'd' : [':BufferClose' , 'delete-buffer'], - \ 'n' : ['bnext' , 'next-buffer'], - \ 'p' : ['bprevious' , 'previous-buffer'], - \ '?' : ['Buffers' , 'fzf-buffer'], - \ } - -" d is for debug -let g:which_key_map.d = { - \ 'name' : '+debug' , - \ 'b' : ['DebugToggleBreakpoint ' , 'toggle breakpoint'], - \ 'c' : ['DebugContinue' , 'continue'], - \ 'i' : ['DebugStepInto' , 'step into'], - \ 'o' : ['DebugStepOver' , 'step over'], - \ 'r' : ['DebugToggleRepl' , 'toggle repl'], - \ 's' : ['DebugStart' , 'start'], - \ } - -" F is for fold -let g:which_key_map.F = { - \ 'name': '+fold', - \ 'O' : [':set foldlevel=20' , 'open all'], - \ 'C' : [':set foldlevel=0' , 'close all'], - \ 'c' : [':foldclose' , 'close'], - \ 'o' : [':foldopen' , 'open'], - \ '1' : [':set foldlevel=1' , 'level1'], - \ '2' : [':set foldlevel=2' , 'level2'], - \ '3' : [':set foldlevel=3' , 'level3'], - \ '4' : [':set foldlevel=4' , 'level4'], - \ '5' : [':set foldlevel=5' , 'level5'], - \ '6' : [':set foldlevel=6' , 'level6'] - \ } - -" s is for search powered by telescope -let g:which_key_map.s = { - \ 'name' : '+search' , - \ '.' : [':Telescope filetypes' , 'filetypes'], - \ 'B' : [':Telescope git_branches' , 'git branches'], - \ 'd' : [':Telescope lsp_document_diagnostics' , 'document_diagnostics'], - \ 'D' : [':Telescope lsp_workspace_diagnostics' , 'workspace_diagnostics'], - \ 'f' : [':Telescope find_files' , 'files'], - \ 'h' : [':Telescope command_history' , 'history'], - \ 'i' : [':Telescope media_files' , 'media files'], - \ 'm' : [':Telescope marks' , 'marks'], - \ 'M' : [':Telescope man_pages' , 'man_pages'], - \ 'o' : [':Telescope vim_options' , 'vim_options'], - \ 't' : [':Telescope live_grep' , 'text'], - \ 'r' : [':Telescope registers' , 'registers'], - \ 'w' : [':Telescope file_browser' , 'buf_fuz_find'], - \ 'u' : [':Telescope colorscheme' , 'colorschemes'], - \ } - -" S is for Session -let g:which_key_map.S = { - \ 'name' : '+Session' , - \ 's' : [':SessionSave' , 'save session'], - \ 'l' : [':SessionLoad' , 'load Session'], - \ } - -" g is for git -let g:which_key_map.g = { - \ 'name' : '+git' , - \ 'b' : [':GitBlameToggle' , 'blame'], - \ 'B' : [':GBrowse' , 'browse'], - \ 'd' : [':Git diff' , 'diff'], - \ 'j' : [':NextHunk' , 'next hunk'], - \ 'k' : [':PrevHunk' , 'prev hunk'], - \ 'l' : [':Git log' , 'log'], - \ 'p' : [':PreviewHunk' , 'preview hunk'], - \ 'r' : [':ResetHunk' , 'reset hunk'], - \ 'R' : [':ResetBuffer' , 'reset buffer'], - \ 's' : [':StageHunk' , 'stage hunk'], - \ 'S' : [':Gstatus' , 'status'], - \ 'u' : [':UndoStageHunk' , 'undo stage hunk'], - \ } - -" l is for language server protocol -let g:which_key_map.l = { - \ 'name' : '+lsp' , - \ 'a' : [':Lspsaga code_action' , 'code action'], - \ 'A' : [':Lspsaga range_code_action' , 'selected action'], - \ 'd' : [':Telescope lsp_document_diagnostics' , 'document diagnostics'], - \ 'D' : [':Telescope lsp_workspace_diagnostics', 'workspace diagnostics'], - \ 'f' : [':LspFormatting' , 'format'], - \ 'I' : [':LspInfo' , 'lsp info'], - \ 'v' : [':LspVirtualTextToggle' , 'lsp toggle virtual text'], - \ 'l' : [':Lspsaga lsp_finder' , 'lsp finder'], - \ 'L' : [':Lspsaga show_line_diagnostics' , 'line_diagnostics'], - \ 'p' : [':Lspsaga preview_definition' , 'preview definition'], - \ 'q' : [':Telescope quickfix' , 'quickfix'], - \ 'r' : [':Lspsaga rename' , 'rename'], - \ 'T' : [':LspTypeDefinition' , 'type defintion'], - \ 'x' : [':cclose' , 'close quickfix'], - \ 's' : [':Telescope lsp_document_symbols' , 'document symbols'], - \ 'S' : [':Telescope lsp_workspace_symbols' , 'workspace symbols'], - \ } - -call which_key#register('<Space>', "g:which_key_map") |