Browse Source

add back which key

Chris 4 years ago
parent
commit
3fd4e13bf7
6 changed files with 257 additions and 6 deletions
  1. 3 0
      init.lua
  2. 4 4
      lua/nv-gitsigns/init.lua
  3. 12 0
      lua/nv-kommentary/init.lua
  4. 1 1
      lua/nv-rnvimr/init.lua
  5. 236 0
      lua/nv-whichkey/init.vim
  6. 1 1
      lua/settings.lua

+ 3 - 0
init.lua

@@ -17,6 +17,9 @@ require('nv-quickscope')
 require('nv-rnvimr')
 require('nv-startify')
 
+-- Which Key (Hope to replace with Lua plugin someday)
+vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
+
 -- LSP
 require('lsp')
 require('utils')

+ 4 - 4
lua/nv-gitsigns/init.lua

@@ -14,18 +14,18 @@ require('gitsigns').setup {
     noremap = true,
     buffer = true,
 
-    ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'"},
+    --[[ ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'"},
     ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'"},
 
     ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
     ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
     ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
     ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-    ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line()<CR>',
+    ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line()<CR>', ]]
 
     -- Text objects
-    ['o ih'] = ':<C-U>lua require"gitsigns".text_object()<CR>',
-    ['x ih'] = ':<C-U>lua require"gitsigns".text_object()<CR>'
+    --[[ ['o ih'] = ':<C-U>lua require"gitsigns".text_object()<CR>',
+    ['x ih'] = ':<C-U>lua require"gitsigns".text_object()<CR>' ]]
   },
   watch_index = {
     interval = 1000

+ 12 - 0
lua/nv-kommentary/init.lua

@@ -2,3 +2,15 @@ vim.g.kommentary_create_default_mappings = false
 vim.api.nvim_set_keymap("n", "<leader>/", "<Plug>kommentary_line_default", {})
 --vim.api.nvim_set_keymap("n", "<leader>c", "<Plug>kommentary_motion_default", {})
 vim.api.nvim_set_keymap("v", "<leader>/", "<Plug>kommentary_visual_default", {})
+--[[vim.cmd([[
+function! Comment()
+  if (mode() == "n" )
+    execute "Commentary"
+  else    
+    execute "'<,'>Commentary"
+  endif
+ endfunction
+vnoremap <silent> <space>/ :call Comment()
+autocmd! BufRead,BufNewFile *.{jsx,jx,js} setlocal filetype=javascript.jsx
+autocmd FileType javascript.jsx setlocal commentstring={/*\ %s\ */}
+]]

+ 1 - 1
lua/nv-rnvimr/init.lua

@@ -8,7 +8,7 @@ vim.g.rnvimr_pick_enable = 1
 -- Make Neovim to wipe the buffers corresponding to the files deleted by Ranger
 vim.g.rnvimr_bw_enable = 1
 
-vim.cmd('nmap <leader>r :RnvimrToggle<CR>')
+-- vim.cmd('nmap <leader>r :RnvimrToggle<CR>')
 
 --[[ let g:rnvimr_ranger_cmd = 'ranger --cmd="set column_ratios 1,1"'
             " \ --cmd="set draw_borders separators"'

+ 236 - 0
lua/nv-whichkey/init.vim

@@ -0,0 +1,236 @@
+" Leader Key Maps
+
+" Timeout
+let g:which_key_timeout = 100
+
+let g:which_key_display_names = {'<CR>': '↵', '<TAB>': '⇆'}
+
+" 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
+
+
+" Single mappings
+" let g:which_key_map['/'] = [ ':call Comment()'                                 , 'comment' ]
+" let g:which_key_map['/'] = { 'name' : 'comment' }
+let g:which_key_map['/'] = 'which_key_ignore'
+let g:which_key_map['?'] = [ ':NvimTreeFindFile'                               , 'find current file' ]
+let g:which_key_map['e'] = [ ':NvimTreeToggle'                                 , 'explorer' ]
+let g:which_key_map['h'] = [ '<C-W>s'                                          , 'split below']
+let g:which_key_map['n'] = [ ':let @/ = ""'                                    , 'no highlight' ]
+let g:which_key_map['r'] = [ ':RnvimrToggle'                                   , 'ranger' ]
+let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor'                 , 'treesitter highlight' ]
+let g:which_key_map['v'] = [ '<C-W>v'                                          , 'split right']
+let g:which_key_map['z'] = [ 'Goyo'                                            , 'zen' ]
+
+" Group mappings
+
+" a is for actions
+let g:which_key_map.a = {
+      \ 'name' : '+actions' ,
+      \ 'c' : [':ColorizerToggle'        , 'colorizer'],
+      \ 'e' : [':CocCommand explorer'    , 'explorer'],
+      \ 'h' : [':let @/ = ""'            , 'remove search highlight'],
+      \ 'l' : [':Bracey'                 , 'start live server'],
+      \ 'L' : [':BraceyStop'             , 'stop live server'],
+      \ 'm' : [':MarkdownPreview'        , 'markdown preview'],
+      \ 'M' : [':MarkdownPreviewStop'    , 'markdown preview stop'],
+      \ 'n' : [':set nonumber!'          , 'line-numbers'],
+      \ 's' : [':s/\%V\(.*\)\%V/"\1"/'   , 'surround'],
+      \ 'r' : [':set norelativenumber!'  , 'relative line nums'],
+      \ 't' : [':FloatermToggle'         , 'terminal'],
+      \ 'v' : [':Codi'                   , 'virtual repl on'],
+      \ 'V' : [':Codi!'                  , 'virtual repl off'],
+      \ 'w' : [':StripWhitespace'        , 'strip whitespace'],
+      \ }
+
+" b is for buffer
+" let g:which_key_map.b = {
+"       \ 'name' : '+buffer' ,
+"       \ '>' : [':BufferMoveNext'        , 'move next'],
+"       \ '<' : [':BufferMovePrevious'    , 'move prev'],
+"       \ 'b' : [':BufferPick'            , 'pick buffer'],
+"       \ 'd' : [':Bdelete'               , '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' : ['<Plug>VimspectorToggleBreakpoint'              , 'breakpoint'],
+"       \ 'B' : ['<Plug>VimspectorToggleConditionalBreakpoint'   , 'conditional breakpoint'],
+"       \ 'c' : ['<Plug>VimspectorRunToCursor'                   , 'run to cursor'],
+"       \ 'd' : ['<Plug>VimspectorContinue'                      , 'continue'],
+"       \ 'f' : ['<Plug>VimspectorAddFunctionBreakpoint'         , 'function breakpoint'],
+"       \ 'm' : [':MaximizerToggle'                              , 'maximize window'],
+"       \ 'o' : ['<Plug>VimspectorStepOver'                      , 'step over'],
+"       \ 'O' : ['<Plug>VimspectorStepOut'                       , 'step out'],
+"       \ 'i' : ['<Plug>VimspectorStepInto'                      , 'step into'],
+"       \ 'p' : ['<Plug>VimspectorPause'                         , 'pause'],
+"       \ 'r' : ['<Plug>VimspectorRestart'                       , 'restart'],
+"       \ 's' : ['<Plug>VimspectorStop'                          , 'stop'],
+"       \ }
+
+" 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'],
+      \ ';' : [':Telescope commands'                    , 'commands'],
+      \ 'a' : [':Telescope lsp_code_actions'            , 'code_actions'],
+      \ 'A' : [':Telescope builtin'                     , 'all'],
+      \ 'b' : [':Telescope buffers'                     , 'buffers'],
+      \ 'B' : [':Telescope git_branches'                , 'git branches'],
+      \ 'd' : [':Telescope lsp_document_diagnostics'    , 'document_diagnostics'],
+      \ 'D' : [':Telescope lsp_workspace_diagnostics'   , 'workspace_diagnostics'],
+      \ 'c' : [':Telescope git_commits'                 , 'git_commits'],
+      \ 'C' : [':Telescope git_bcommits'                , 'git_bcommits'],
+      \ 'f' : [':Telescope find_files'                  , 'files'],
+      \ 'F' : [':Telescope git_files'                   , 'git_files'],
+      \ 'g' : [':Telescope tags'                        , 'tags'],
+      \ 'G' : [':Telescope current_buffer_tags'         , 'buffer_tags'],
+      \ 'h' : [':Telescope command_history'             , 'history'],
+      \ 'H' : [':Telescope help_tags'                   , 'help_tags'],
+      \ 'i' : [':Telescope media_files'                 , 'media files'],
+      \ 'k' : [':Telescope keymaps'                     , 'keymaps'],
+      \ 'l' : [':Telescope loclist'                     , 'loclist'],
+      \ 'm' : [':Telescope marks'                       , 'marks'],
+      \ 'M' : [':Telescope man_pages'                   , 'man_pages'],
+      \ 'o' : [':Telescope vim_options'                 , 'vim_options'],
+      \ 'O' : [':Telescope oldfiles'                    , 'oldfiles'],
+      \ 'p' : [':Telescope fd'                          , 'fd'],
+      \ 'P' : [':Telescope spell_suggest'               , 'spell_suggest'],
+      \ 's' : [':Telescope git_status'                  , 'git_status'],
+      \ 'S' : [':Telescope grep_string'                 , 'grep_string'],
+      \ 't' : [':Telescope live_grep'                   , 'text'],
+      \ 'y' : [':Telescope symbols'                     , 'symbols'],
+      \ 'Y' : [':Telescope lsp_workspace_symbols'       , 'lsp_workspace_symbols'],
+      \ 'r' : [':Telescope registers'                   , 'registers'],
+      \ 'R' : [':Telescope reloader'                    , 'reloader'],
+      \ 'w' : [':Telescope file_browser'                , 'buf_fuz_find'],
+      \ 'u' : [':Telescope colorscheme'                 , 'colorschemes'],
+      \ 'z' : [':Telescope current_buffer_fuzzy_find'   , 'buf_fuz_find'],
+      \ }
+
+let g:which_key_map.S = {
+      \ 'name' : '+Session' ,
+      \ 'c' : [':SClose'          , 'Close Session']  ,
+      \ 'd' : [':SDelete'         , 'Delete Session'] ,
+      \ 'l' : [':SLoad'           , 'Load Session']     ,
+      \ 's' : [':Startify'        , 'Start Page']     ,
+      \ 'S' : [':SSave'           , 'Save Session']   ,
+      \ }
+
+" g is for git
+" let g:which_key_map.g = {
+"       \ 'name' : '+git' ,
+"       \ 'a' : [':Git add .'                        , 'add all'],
+"       \ 'A' : [':CocCommand fzf-preview.GitStatus' , 'actions'],
+"       \ 'b' : [':Git blame'                        , 'blame'],
+"       \ 'B' : [':GBrowse'                          , 'browse'],
+"       \ 'c' : [':Git commit'                       , 'commit'],
+"       \ 'd' : [':Git diff'                         , 'diff'],
+"       \ 'D' : [':Gdiffsplit'                       , 'diff split'],
+"       \ 'g' : [':GGrep'                            , 'git grep'],
+"       \ 'G' : [':Gstatus'                          , 'status'],
+"       \ 'h' : [':GitGutterLineHighlightsToggle'    , 'highlight hunks'],
+"       \ 'H' : ['<Plug>(GitGutterPreviewHunk)'      , 'preview hunk'],
+"       \ 'i' : [':Gist -b'                          , 'post gist'],
+"       \ 'j' : ['<Plug>(GitGutterNextHunk)'         , 'next hunk'],
+"       \ 'k' : ['<Plug>(GitGutterPrevHunk)'         , 'prev hunk'],
+"       \ 'l' : [':Git log'                          , 'log'],
+"       \ 'm' : ['<Plug>(git-messenger)'             , 'message'],
+"       \ 'p' : [':Git push'                         , 'push'],
+"       \ 'P' : [':Git pull'                         , 'pull'],
+"       \ 'r' : [':GRemove'                          , 'remove'],
+"       \ 's' : ['<Plug>(GitGutterStageHunk)'        , 'stage hunk'],
+"       \ 'S' : [':CocCommand fzf-preview.GitStatus' , 'status'],
+"       \ 't' : [':GitGutterSignsToggle'             , 'toggle signs'],
+"       \ 'u' : ['<Plug>(GitGutterUndoHunk)'         , 'undo hunk'],
+"       \ 'v' : [':GV'                               , 'view commits'],
+"       \ 'V' : [':GV!'                              , 'view buffer commits'],
+"       \ }
+      " \ 'A' : [':Git add %'                        , 'add current'],
+      " \ 'S' : [':!git status'                      , 'status'],
+
+" let g:which_key_map.G = {
+"       \ 'name' : '+gist' ,
+"       \ 'a' : [':Gist -a'                          , 'post gist anon'],
+"       \ 'b' : [':Gist -b'                          , 'post gist browser'],
+"       \ 'd' : [':Gist -d'                          , 'delete gist'],
+"       \ 'e' : [':Gist -e'                          , 'edit gist'],
+"       \ 'l' : [':Gist -l'                          , 'list public gists'],
+"       \ 's' : [':Gist -ls'                         , 'list starred gists'],
+"       \ 'm' : [':Gist -m'                          , 'post gist all buffers'],
+"       \ 'p' : [':Gist -P'                          , 'post public gist '],
+"       \ 'P' : [':Gist -p'                          , 'post private gist '],
+"       \ }
+
+" l is for language server protocol
+let g:which_key_map.l = {
+      \ 'name' : '+lsp' ,
+      \ 'a' : [':Lspsaga code_action'                , 'quickfix'],
+      \ 'A' : [':Lspsaga range_code_action'          , 'selected action'],
+      \ 'd' : [':Telescope lsp_document_diagnostics' , 'document diagnostics'],
+      \ 'D' : [':Telescope lsp_workspace_diagnostics', 'workspace diagnostics'],
+      \ 'f' : [':LspFormatting'                      , 'format'],
+      \ 'H' : [':Lspsaga signature_help'             , 'signature_help'],
+      \ 'I' : [':LspInfo'                            , 'lsp_info'],
+      \ 'l' : [':Lspsaga lsp_finder'                 , 'lsp_finder'],
+      \ 'L' : [':Lspsaga show_line_diagnostics'      , 'line_diagnostics'],
+      \ 'o' : [':Vista!!'                            , 'outline'],
+      \ 'p' : [':Lspsaga preview_definition'         , 'preview definition'],
+      \ 'q' : [':Telescope quickfix'                 , 'quickfix'],
+      \ 'r' : [':LspRename'                          , 'rename'],
+      \ 'T' : [':LspTypeDefinition'                  , 'type defintion'],
+      \ 'x' : [':cclose'                             , 'close quickfix'],
+      \ 's' : [':Telescope lsp_document_symbols'     , 'document symbols'],
+      \ 'S' : [':Telescope lsp_workspace_symbols'    , 'workspace symbols'],
+      \ }
+
+" t is for terminal
+" let g:which_key_map.t = {
+"       \ 'name' : '+terminal' ,
+"       \ ';' : [':FloatermNew --wintype=normal --height=6'       , 'terminal'],
+"       \ 'f' : [':FloatermNew fzf'                               , 'fzf'],
+"       \ 'g' : [':FloatermNew lazygit'                           , 'git'],
+"       \ 'd' : [':FloatermNew lazydocker'                        , 'docker'],
+"       \ 'n' : [':FloatermNew node'                              , 'node'],
+"       \ 'N' : [':FloatermNew nnn'                               , 'nnn'],
+"       \ 'p' : [':FloatermNew python'                            , 'python'],
+"       \ 'm' : [':FloatermNew lazynpm'                           , 'npm'],
+"       \ 'r' : [':FloatermNew ranger'                            , 'ranger'],
+"       \ 't' : [':FloatermToggle'                                , 'toggle'],
+"       \ 'y' : [':FloatermNew ytop'                              , 'ytop'],
+"       \ 'u' : [':FloatermNew ncdu'                              , 'ncdu'],
+"       \ }
+
+call which_key#register('<Space>', "g:which_key_map")

+ 1 - 1
lua/settings.lua

@@ -33,7 +33,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=1000                      --By default timeoutlen is 1000 ms
+vim.o.timeoutlen=100                      --By default timeoutlen is 1000 ms
 vim.o.clipboard="unnamedplus"               --Copy paste between vim and everything else
 vim.o.incsearch=true
 vim.o.guifont="JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"