From 3f4839290ac99321f608e21839c9a8011a306325 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Fri, 23 Sep 2022 00:54:59 -0400 Subject: [PATCH 1/6] remove gitmodules file --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 From 2a15c3b315bcb9f5aa4094d52569f67cb6c57dae Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Sat, 24 Sep 2022 12:58:10 -0400 Subject: [PATCH 2/6] fix coc float color --- .vimrc.bundles | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.vimrc.bundles b/.vimrc.bundles index 92d4e11..77359c8 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -368,11 +368,12 @@ endif highlight CocInfoSign ctermbg=none highlight CocHintSign ctermbg=none if g:theme_color == 'dark' - highlight! link CocFloating PmenuThumb - highlight! link CocErrorFloat PmenuThumb - highlight! link CocWarningFloat PmenuThumb - highlight! link CocInfoFloat PmenuThumb - highlight! link CocHintFloat PmenuThumb + highlight! link TempColor Pmenu + highlight! link CocFloating TempColor + highlight! link CocErrorFloat TempColor + highlight! link CocWarningFloat TempColor + highlight! link CocInfoFloat TempColor + highlight! link CocHintFloat TempColor endif endif endfunction From ef5e361568c6c1daaedf250a8f4b9e1c87fa5cf5 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Fri, 14 Oct 2022 00:46:01 -0400 Subject: [PATCH 3/6] add new plugins and remove some useless stuff --- .vimrc | 8 +------- .vimrc.bundles | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.vimrc b/.vimrc index 60b0dc4..76d035e 100644 --- a/.vimrc +++ b/.vimrc @@ -199,7 +199,7 @@ " Map ff to display all lines with keyword under cursor " and ask which one to jump to - nmap ff [I:let nr = input("Which one: ")exe "normal " . nr ."[\t" + nmap j [I:let nr = input("Which one: ")exe "normal " . nr ."[\t" " Easier horizontal scrolling map zl zL @@ -216,12 +216,6 @@ nmap ac ToggleAutoCloseMappings " } - " JSON { - nmap jt :%!python -m json.tool:set filetype=json - let g:vim_json_syntax_conceal = 0 - " } - - " } " Functions { diff --git a/.vimrc.bundles b/.vimrc.bundles index 77359c8..ea26f3c 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -9,6 +9,7 @@ " Plugin_Preferences " Theme_Appearance " Key_Mappings +" Useful_Info " Environment { set nocompatible " Must be first line @@ -29,7 +30,6 @@ endif Plug 'rust-lang/rust.vim' - Plug 'leafgarland/typescript-vim' " { Plug 'alvan/vim-closetag' @@ -76,6 +76,9 @@ Plug 'mbbill/undotree' Plug 'tpope/vim-commentary' + " put text in neibouring tmux pane into auto complete + Plug 'wellle/tmux-complete.vim' + " only work with nvim > 0.5 " For other versions, just loading the plugin may " cause error @@ -129,6 +132,25 @@ if g:vim_type == 'nvim' endif " } + " easymotion/vim-easymotion { + + " f{char} to move to {char} + map f (easymotion-bd-f) + nmap f (easymotion-overwin-f) + + " s{char}{char} to move to {char}{char} + nmap s (easymotion-overwin-f2) + + " Move to line + map L (easymotion-bd-jk) + nmap L (easymotion-overwin-line) + + " Move to word + map w (easymotion-bd-w) + nmap w (easymotion-overwin-w) + + " } + " antoinemadec/coc-fzf { if isdirectory(expand(plugin_dir . "/coc-fzf")) nnoremap :CocFzfList @@ -155,7 +177,8 @@ endif " airblade/vim-rooter { if isdirectory(expand(plugin_dir . "/vim-rooter")) - let g:rooter_patterns = ['.vscode', '.git'] + let g:rooter_patterns = ['.vscode', '.git', '*.sln'] + let g:rooter_change_directory_for_non_project_files = 'current' endif " } @@ -561,3 +584,8 @@ endif nnoremap % :vsplit nnoremap " :split " } +" +" Useful_Info{ +" show mapping info +" :verbose map ,cf +" } From 7f76f05215abd41d38eb9c05bdb25fb9c5fc0586 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Fri, 14 Oct 2022 15:25:26 -0400 Subject: [PATCH 4/6] . --- .vimrc.bundles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc.bundles b/.vimrc.bundles index 77359c8..fd2faf3 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -368,7 +368,7 @@ endif highlight CocInfoSign ctermbg=none highlight CocHintSign ctermbg=none if g:theme_color == 'dark' - highlight! link TempColor Pmenu + highlight! link TempColor Visual highlight! link CocFloating TempColor highlight! link CocErrorFloat TempColor highlight! link CocWarningFloat TempColor From 93f5a7985dad2dfc4289ff02686a5138a0fe1a3c Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Tue, 25 Oct 2022 22:30:53 -0400 Subject: [PATCH 5/6] add plugins --- .gitignore | 1 + .vimrc.bundles | 22 +++++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ef3c6c4..cfb5e0e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .vim/ autoload/ node_modules/ +tags diff --git a/.vimrc.bundles b/.vimrc.bundles index 70a8fa0..08e7723 100644 --- a/.vimrc.bundles +++ b/.vimrc.bundles @@ -38,7 +38,6 @@ Plug 'scrooloose/nerdtree' - Plug 'godlygeek/tabular' " for markdown{ Plug 'preservim/vim-markdown' "} @@ -79,6 +78,8 @@ " put text in neibouring tmux pane into auto complete Plug 'wellle/tmux-complete.vim' + Plug 'ludovicchabant/vim-gutentags' + " only work with nvim > 0.5 " For other versions, just loading the plugin may " cause error @@ -132,6 +133,11 @@ if g:vim_type == 'nvim' endif " } + " ludovicchabant/vim-gutentags { + set statusline+=%{gutentags#statusline()} + let g:gutentags_cache_dir=g:vim_dir . '/.vimtags/' + "} + " easymotion/vim-easymotion { " f{char} to move to {char} @@ -182,20 +188,6 @@ endif endif " } - " godlygeek/tabular { - if isdirectory(expand(plugin_dir . "/tabular")) - nmap t= :Tabularize /= - vmap t= :Tabularize /= - - nmap t\| :Tab /\| - vmap t\| :Tab /\| - - nmap t: :Tab /:\zs - vmap t: :Tab /:\zs - endif - - " } - " NerdTree { if isdirectory(expand(plugin_dir . "/nerdtree")) let g:NERDShutUp=1 From 1e7127f6923211888450bb1407ee344b2c30e26f Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Wed, 26 Oct 2022 00:11:48 -0400 Subject: [PATCH 6/6] add rtp --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 76d035e..2027b0c 100644 --- a/.vimrc +++ b/.vimrc @@ -12,6 +12,9 @@ let g:vim_version = str2float(g:vim_version) let g:dotfile_path = '~/.dotfiles/' + set runtimepath^=~/.vim runtimepath+=~/.vim/after + let &packpath=&runtimepath + " The default leader is '\', but many people prefer ',' as it's in a standard let mapleader = ',' let maplocalleader = '_'