mirror of
https://github.com/amix/vimrc
synced 2025-02-28 14:12:51 +08:00
Merge 43734f4d3b
into 44dca49794
This commit is contained in:
commit
1dd7e6923b
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,7 +4,5 @@ temp_dirs/yankring_history_v2.txt
|
|||||||
sources_forked/yankring/doc/tags
|
sources_forked/yankring/doc/tags
|
||||||
sources_non_forked/tlib/doc/tags
|
sources_non_forked/tlib/doc/tags
|
||||||
sources_non_forked/ctrlp.vim/doc/tags*
|
sources_non_forked/ctrlp.vim/doc/tags*
|
||||||
my_plugins/
|
|
||||||
my_configs.vim
|
|
||||||
tags
|
tags
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
1
my_plugins/emmet-vim
Submodule
1
my_plugins/emmet-vim
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 7a4bf3463ef1e2c08393218fc67a8729c00948a5
|
1
my_plugins/html5.vim
Submodule
1
my_plugins/html5.vim
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 3db896baa26839b866db3db5d8997cc830874a24
|
1
my_plugins/vim-javascript
Submodule
1
my_plugins/vim-javascript
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit dd84369d731bcb8feee0901cbb9b63a2b219bf28
|
1
my_plugins/vim-nerdtree-tabs
Submodule
1
my_plugins/vim-nerdtree-tabs
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 5fc6c6857028a07e8fe50f0adef28fb20218776b
|
1
my_plugins/vim-vue
Submodule
1
my_plugins/vim-vue
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 720ca48e0207f2aca331b9d949ce9d4ff5702737
|
@ -111,6 +111,12 @@ set showmatch
|
|||||||
" How many tenths of a second to blink when matching brackets
|
" How many tenths of a second to blink when matching brackets
|
||||||
set mat=2
|
set mat=2
|
||||||
|
|
||||||
|
set number
|
||||||
|
|
||||||
|
" emmet-vim的快速闭合标签
|
||||||
|
let g:user_emmet_leader_key='<C-Z>'
|
||||||
|
autocmd FileType html,css,vue,ejs,wxml,wxss EmmetInstall
|
||||||
|
|
||||||
" No annoying sound on errors
|
" No annoying sound on errors
|
||||||
set noerrorbells
|
set noerrorbells
|
||||||
set novisualbell
|
set novisualbell
|
||||||
@ -179,8 +185,8 @@ set expandtab
|
|||||||
set smarttab
|
set smarttab
|
||||||
|
|
||||||
" 1 tab == 4 spaces
|
" 1 tab == 4 spaces
|
||||||
set shiftwidth=4
|
set shiftwidth=2
|
||||||
set tabstop=4
|
set tabstop=2
|
||||||
|
|
||||||
" Linebreak on 500 characters
|
" Linebreak on 500 characters
|
||||||
set lbr
|
set lbr
|
||||||
@ -380,3 +386,27 @@ function! VisualSelection(direction, extra_filter) range
|
|||||||
let @/ = l:pattern
|
let @/ = l:pattern
|
||||||
let @" = l:saved_reg
|
let @" = l:saved_reg
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
" 我的自定义配置
|
||||||
|
autocmd BufRead,BufNewFile *.vue setlocal filetype=vue.html.javascript.css
|
||||||
|
autocmd FileType vue syntax sync fromstart
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" Set font according to system
|
" Set font according to system
|
||||||
if has("mac") || has("macunix")
|
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")
|
elseif has("win16") || has("win32")
|
||||||
set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
|
set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
|
||||||
elseif has("gui_gtk2")
|
elseif has("gui_gtk2")
|
||||||
|
@ -77,8 +77,11 @@ set grepprg=/bin/grep\ -nH
|
|||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" => Nerd Tree
|
" => Nerd Tree
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
let g:NERDTreeWinPos = "right"
|
let g:NERDTreeWinPos = "left"
|
||||||
let NERDTreeShowHidden=0
|
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 NERDTreeIgnore = ['\.pyc$', '__pycache__']
|
||||||
let g:NERDTreeWinSize=35
|
let g:NERDTreeWinSize=35
|
||||||
map <leader>nn :NERDTreeToggle<cr>
|
map <leader>nn :NERDTreeToggle<cr>
|
||||||
|
Loading…
Reference in New Issue
Block a user