diff --git a/.gitignore b/.gitignore index 55273366..c40b6f34 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,5 @@ temp_dirs/yankring_history_v2.txt sources_forked/yankring/doc/tags sources_non_forked/tlib/doc/tags sources_non_forked/ctrlp.vim/doc/tags* -my_plugins/ -my_configs.vim tags .DS_Store diff --git a/my_plugins/emmet-vim b/my_plugins/emmet-vim new file mode 160000 index 00000000..7a4bf346 --- /dev/null +++ b/my_plugins/emmet-vim @@ -0,0 +1 @@ +Subproject commit 7a4bf3463ef1e2c08393218fc67a8729c00948a5 diff --git a/my_plugins/html5.vim b/my_plugins/html5.vim new file mode 160000 index 00000000..3db896ba --- /dev/null +++ b/my_plugins/html5.vim @@ -0,0 +1 @@ +Subproject commit 3db896baa26839b866db3db5d8997cc830874a24 diff --git a/my_plugins/vim-javascript b/my_plugins/vim-javascript new file mode 160000 index 00000000..dd84369d --- /dev/null +++ b/my_plugins/vim-javascript @@ -0,0 +1 @@ +Subproject commit dd84369d731bcb8feee0901cbb9b63a2b219bf28 diff --git a/my_plugins/vim-nerdtree-tabs b/my_plugins/vim-nerdtree-tabs new file mode 160000 index 00000000..5fc6c685 --- /dev/null +++ b/my_plugins/vim-nerdtree-tabs @@ -0,0 +1 @@ +Subproject commit 5fc6c6857028a07e8fe50f0adef28fb20218776b diff --git a/my_plugins/vim-vue b/my_plugins/vim-vue new file mode 160000 index 00000000..720ca48e --- /dev/null +++ b/my_plugins/vim-vue @@ -0,0 +1 @@ +Subproject commit 720ca48e0207f2aca331b9d949ce9d4ff5702737 diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 11d1ed81..57ffb817 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -111,6 +111,12 @@ set showmatch " How many tenths of a second to blink when matching brackets set mat=2 +set number + +" emmet-vim的快速闭合标签 +let g:user_emmet_leader_key='' +autocmd FileType html,css,vue,ejs,wxml,wxss EmmetInstall + " No annoying sound on errors set noerrorbells set novisualbell @@ -179,8 +185,8 @@ set expandtab set smarttab " 1 tab == 4 spaces -set shiftwidth=4 -set tabstop=4 +set shiftwidth=2 +set tabstop=2 " Linebreak on 500 characters set lbr @@ -380,3 +386,27 @@ function! VisualSelection(direction, extra_filter) range let @/ = l:pattern let @" = l:saved_reg endfunction + + + + + + + + + + + +" 我的自定义配置 +autocmd BufRead,BufNewFile *.vue setlocal filetype=vue.html.javascript.css +autocmd FileType vue syntax sync fromstart + + + + + + + + + + diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index a4f0c9b9..d2d8000b 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -10,7 +10,7 @@ """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Set font according to system if has("mac") || has("macunix") - set gfn=IBM\ Plex\ Mono:h14,Hack:h14,Source\ Code\ Pro:h15,Menlo:h15 + set gfn=IBM\ Plex\ Mono:h16,Hack:h16,Source\ Code\ Pro:h16,Menlo:h16 elseif has("win16") || has("win32") set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11 elseif has("gui_gtk2") diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index 6842b632..aaf1d087 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -77,8 +77,11 @@ set grepprg=/bin/grep\ -nH """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Nerd Tree """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:NERDTreeWinPos = "right" -let NERDTreeShowHidden=0 +let g:NERDTreeWinPos = "left" +let NERDTreeShowHidden=1 +" 在终端启动vim时,共享NERDTree +let g:nerdtree_tabs_open_on_console_startup=1 +let NERDTreeIgnore=['\.pyc','\~$','\.swp','.DS_Store'] let NERDTreeIgnore = ['\.pyc$', '__pycache__'] let g:NERDTreeWinSize=35 map nn :NERDTreeToggle