Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
updates until 2/11/2020
Browse files Browse the repository at this point in the history
  • Loading branch information
@haininhhoang94
haininhhoang94 committed Jan 7, 2021
1 parent 0f19360 commit 19e371a
Show file tree
Hide file tree
Showing 14 changed files with 487 additions and 118 deletions.
8 changes: 5 additions & 3 deletions coc-settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
// "diagnostic.displayByAle": true,
// "diagnostic.virtualText": true, // this won't work with codelens when error on same line

// codelens TODO what does this get me?
// "codeLens.enable": true,
// codelens
"codeLens.enable": true,
"java.referencesCodeLens.enabled": true,

// list
"list.indicator": ">",
Expand Down Expand Up @@ -64,7 +65,8 @@
"explorer.icon.enableNerdfont": true,
"explorer.previewAction.onHover": false,
"explorer.icon.enableVimDevicons": false,
"explorer.keyMappings": {
"explorer.file.showHiddenFiles": false,
"explorer.keyMappings.global": {
"<cr>": ["expandable?", "expand", "open"],
"v": "open:vsplit",
"l": ["expandable?", "expand", "preview:labeling"]
Expand Down
12 changes: 0 additions & 12 deletions general/functions.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@ if executable(s:clip)
augroup END
endif

" function! OpenLiveServer()
" echo 'live server is on'
" silent !live-server % &
" endfunction

command Serve :call OpenLiveServer()
nnoremap <silent>bs :call OpenLiveServer()<CR>
" augroup strip_ws
" autocmd BufWritePre * call utils#stripTrailingWhitespaces()
" augroup END

" If one has a particular extension that one uses for binary files (such as exe,
" bin, etc), you may find it helpful to automate the process with the following
" bit of autocmds for your <.vimrc>. Change that "*.bin" to whatever
Expand Down
21 changes: 11 additions & 10 deletions init.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source $HOME/.config/nvim/vim-plug/plugins.vim
source $HOME/.config/nvim/general/settings.vim
source $HOME/.config/nvim/general/functions.vim
source $HOME/.config/nvim/keys/mappings.vim
source $HOME/.config/nvim/plug-config/quickscope.vim

" Source depending on if VSCode is our client
if exists('g:vscode')
Expand All @@ -25,40 +24,36 @@ else
" Themes
source $HOME/.config/nvim/themes/syntax.vim
source $HOME/.config/nvim/themes/nvcode.vim
" source $HOME/.config/nvim/themes/papercolor.vim
" source $HOME/.config/nvim/themes/material.vim
source $HOME/.config/nvim/themes/airline.vim
" source $HOME/.config/nvim/themes/nord.vim


" Plugin configuration
source $HOME/.config/nvim/keys/which-key.vim
source $HOME/.config/nvim/plug-config/vim-commentary.vim
" source $HOME/.config/nvim/plug-config/rainbow.vim
source $HOME/.config/nvim/plug-config/rnvimr.vim
source $HOME/.config/nvim/plug-config/better-whitespace.vim
source $HOME/.config/nvim/plug-config/fzf.vim
source $HOME/.config/nvim/plug-config/sneak.vim
source $HOME/.config/nvim/plug-config/codi.vim
luafile $HOME/.config/nvim/lua/nvcodeline.lua
luafile $HOME/.config/nvim/lua/treesitter.lua
source $HOME/.config/nvim/plug-config/coc.vim
source $HOME/.config/nvim/plug-config/easymotion.vim
source $HOME/.config/nvim/plug-config/goyo.vim
source $HOME/.config/nvim/plug-config/vim-rooter.vim
source $HOME/.config/nvim/plug-config/start-screen.vim
source $HOME/.config/nvim/plug-config/gitgutter.vim
source $HOME/.config/nvim/plug-config/git-messenger.vim
source $HOME/.config/nvim/plug-config/closetags.vim
source $HOME/.config/nvim/plug-config/floaterm.vim
source $HOME/.config/nvim/plug-config/xtabline.vim
source $HOME/.config/nvim/plug-config/barbar.vim
source $HOME/.config/nvim/plug-config/far.vim
source $HOME/.config/nvim/plug-config/tagalong.vim
" source $HOME/.config/nvim/plug-config/illuminate.vim
source $HOME/.config/nvim/plug-config/bracey.vim
source $HOME/.config/nvim/plug-config/asynctask.vim
source $HOME/.config/nvim/plug-config/window-swap.vim
source $HOME/.config/nvim/plug-config/markdown-preview.vim
source $HOME/.config/nvim/plug-config/neovide.vim
luafile $HOME/.config/nvim/lua/plug-colorizer.lua
source $HOME/.config/nvim/plug-config/semshi.vim
" source $HOME/.config/nvim/plug-config/semshi.vim
" source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector
" source $HOME/.config/nvim/plug-config/ale.vim
" source $HOME/.config/nvim/plug-config/jupytext.vim
Expand All @@ -68,7 +63,12 @@ else
" source $HOME/.config/nvim/plug-config/leetcode.vim
" source $HOME/.config/nvim/plug-config/vim-wiki.vim
" source $HOME/.config/nvim/plug-config/vista.vim
" source $HOME/.config/nvim/plug-config/rainbow.vim
" source $HOME/.config/nvim/plug-config/xtabline.vim
" source $HOME/.config/nvim/plug-config/illuminate.vim
" source $HOME/.config/nvim/plug-config/sneak.vim
endif
source $HOME/.config/nvim/plug-config/quickscope.vim

" Add paths to node and python here
if !empty(glob("~/.config/nvim/paths.vim"))
Expand All @@ -78,3 +78,4 @@ endif
" Better nav for omnicomplete TODO figure out why this is being overridden
inoremap <expr> <c-j> ("\<C-n>")
inoremap <expr> <c-k> ("\<C-p>")
69 changes: 41 additions & 28 deletions keys/which-key.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ let g:which_key_map['='] = [ '<C-W>=' , 'balance windows'
let g:which_key_map['e'] = [ ':CocCommand explorer' , 'explorer' ]
let g:which_key_map['h'] = [ '<C-W>s' , 'split below']
let g:which_key_map['m'] = [ ':call WindowSwap#EasyWindowSwap()' , 'move window' ]
" let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ]
let g:which_key_map['n'] = [ ':enew' , 'new file' ]
let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ]
let g:which_key_map['N'] = [ ':enew' , 'new file' ]
" let g:which_key_map['p'] = [ ':Files' , 'search files' ]
let g:which_key_map['q'] = [ 'q' , 'quit' ]
let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ]
let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor' , 'treesitter highlight' ]
let g:which_key_map['u'] = [ ':UndotreeToggle' , 'undo tree']
let g:which_key_map['v'] = [ '<C-W>v' , 'split right']
let g:which_key_map['W'] = [ 'w' , 'write' ]
Expand Down Expand Up @@ -82,7 +83,7 @@ let g:which_key_map.a = {
\ 'p' : [':set paste!' , 'toggle paste mode'],
\ 'w' : [':StripWhitespace' , 'strip whitespace'],
\ '.' : [':set nospell!' , 'toggle spell check'],
\ 'h' : [':cd %:h' , 'set current path'],
\ 'P' : [':cd %:h' , 'set current path'],
\ 'q' : [':set list!' , 'toggle dot space'],
\ }
" \ 'r' : [ ':Semshi rename' , 'Semshi Rename'],
Expand All @@ -97,15 +98,27 @@ let g:which_key_map.p = {
" b is for buffer
let g:which_key_map.b = {
\ 'name' : 'buffer' ,
\ '1' : ['b1' , 'buffer 1'],
\ '2' : ['b2' , 'buffer 2'],
\ 'd' : [':Bdelete' , 'delete-buffer'],
\ 'f' : ['bfirst' , 'first-buffer'],
\ 'h' : ['Startify' , 'home-buffer'],
\ 'l' : ['blast' , 'last-buffer'],
\ 'n' : ['bnext' , 'next-buffer'],
\ 'p' : ['bprevious' , 'previous-buffer'],
\ '?' : ['Buffers' , 'fzf-buffer'],
\ '>' : [':BufferMoveNext' , 'move next'],
\ '<' : [':BufferMovePrevious' , 'move prev'],
\ '1' : [':BufferGoto 1' , 'buffer 1'],
\ '2' : [':BufferGoto 2' , 'buffer 2'],
\ '3' : [':BufferGoto 3' , 'buffer 3'],
\ '4' : [':BufferGoto 4' , 'buffer 4'],
\ '5' : [':BufferGoto 5' , 'buffer 5'],
\ '6' : [':BufferGoto 6' , 'buffer 6'],
\ '7' : [':BufferGoto 7' , 'buffer 7'],
\ '8' : [':BufferGoto 8' , 'buffer 8'],
\ '9' : [':BufferGoto 9' , 'buffer 9'],
\ '0' : [':BufferGoto 0' , 'buffer 0'],
\ 'b' : [':BufferPick' , 'pick buffer'],
\ 'd' : [':Bdelete' , 'delete-buffer'],
\ 'D' : [':BufferOrderByDirectory', 'order by directory'],
\ 'f' : ['bfirst' , 'first-buffer'],
\ 'l' : ['blast' , 'last buffer'],
\ 'L' : [':BufferOrderByLanguage' , 'order by language'],
\ 'n' : ['bnext' , 'next-buffer'],
\ 'p' : ['bprevious' , 'previous-buffer'],
\ '?' : ['Buffers' , 'fzf-buffer'],
\ }

let g:which_key_map.f = {
Expand Down Expand Up @@ -274,22 +287,22 @@ let g:which_key_map.t = {
\ }

" T is for terminal
let g:which_key_map.T = {
\ 'name' : '+tabline' ,
\ 'b' : [':XTabListBuffers' , 'list buffers'],
\ 'd' : [':XTabCloseBuffer' , 'close buffer'],
\ 'D' : [':XTabDeleteTab' , 'close tab'],
\ 'h' : [':XTabHideBuffer' , 'hide buffer'],
\ 'i' : [':XTabInfo' , 'info'],
\ 'l' : [':XTabLock' , 'lock tab'],
\ 'm' : [':XTabMode' , 'toggle mode'],
\ 'n' : [':tabNext' , 'next tab'],
\ 'N' : [':XTabMoveBufferNext' , 'buffer->'],
\ 't' : [':tabnew' , 'new tab'],
\ 'p' : [':tabprevious' , 'prev tab'],
\ 'P' : [':XTabMoveBufferPrev' , '<-buffer'],
\ 'x' : [':XTabPinBuffer' , 'pin buffer'],
\ }
" let g:which_key_map.T = {
" \ 'name' : '+tabline' ,
" \ 'b' : [':XTabListBuffers' , 'list buffers'],
" \ 'd' : [':XTabCloseBuffer' , 'close buffer'],
" \ 'D' : [':XTabDeleteTab' , 'close tab'],
" \ 'h' : [':XTabHideBuffer' , 'hide buffer'],
" \ 'i' : [':XTabInfo' , 'info'],
" \ 'l' : [':XTabLock' , 'lock tab'],
" \ 'm' : [':XTabMode' , 'toggle mode'],
" \ 'n' : [':tabNext' , 'next tab'],
" \ 'N' : [':XTabMoveBufferNext' , 'buffer->'],
" \ 't' : [':tabnew' , 'new tab'],
" \ 'p' : [':tabprevious' , 'prev tab'],
" \ 'P' : [':XTabMoveBufferPrev' , '<-buffer'],
" \ 'x' : [':XTabPinBuffer' , 'pin buffer'],
" \ }

" w is for wiki
let g:which_key_map.w = {
Expand Down
Loading

0 comments on commit 19e371a

Please sign in to comment.