vim: minor vimrc formatting change
This commit is contained in:
parent
3a168c72a0
commit
36582437f4
1 changed files with 127 additions and 128 deletions
|
|
@ -66,7 +66,7 @@ set ttyfast " indicate a fast terminal for smoother redrawing
|
|||
" | | | | | |
|
||||
" v v v v v v
|
||||
set viminfo=h,'500,<10000,s1000,/1000,:1000
|
||||
set viminfofile=$XDG_CACHE_HOME/vim/viminfo
|
||||
set viminfofile=$XDG_CACHE_HOME/vim/viminfo
|
||||
set virtualedit=block " position the cursor anywhere in Visual Block mode
|
||||
set wildignore=*.o,*.obj,*.pyc,*.exe,*.so,*.dll
|
||||
set wildmenu " use the menu for commandline completion
|
||||
|
|
@ -83,155 +83,154 @@ endif
|
|||
" }}}
|
||||
|
||||
" Plugins {{{
|
||||
call plug#begin('$XDG_CONFIG_HOME/vim/bundle')
|
||||
Plug 'altercation/vim-colors-solarized'
|
||||
Plug 'bronson/vim-trailing-whitespace'
|
||||
Plug 'elzr/vim-json'
|
||||
" Make numbers and booleans stand out, important because of the
|
||||
" concealment used by vim-json.
|
||||
highlight link jsonBraces Text
|
||||
highlight link jsonNumber Identifier
|
||||
highlight link jsonBoolean Identifier
|
||||
highlight link jsonNull Identifier
|
||||
Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown'
|
||||
let g:vim_markdown_conceal_code_blocks = 0
|
||||
Plug 'junegunn/rainbow_parentheses.vim'
|
||||
let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']]
|
||||
Plug 'kien/ctrlp.vim'
|
||||
let g:ctrlp_match_window = 'bottom,order:ttb'
|
||||
let g:ctrlp_switch_buffer = 0 " open files in new buffer
|
||||
let g:ctrlp_show_hidden = 1 " show hidden files
|
||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
Plug 'tpope/vim-commentary'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
if !exists('g:airline_symbols')
|
||||
let g:airline_symbols = {}
|
||||
endif
|
||||
let g:airline_left_sep = ' '
|
||||
let g:airline_left_alt_sep = ''
|
||||
let g:airline_right_sep = ' '
|
||||
let g:airline_right_alt_sep = ''
|
||||
let g:airline_symbols.crypt = '🔒'
|
||||
let g:airline_symbols.branch = '⎇'
|
||||
let g:airline_symbols.paste = 'Ⓟ'
|
||||
let g:airline_symbols.spell = '✔'
|
||||
let g:airline_symbols.readonly = ' ⃠'
|
||||
let g:airline_symbols.notexists = '∄'
|
||||
let g:airline_symbols.whitespace = '✗'
|
||||
Plug 'vim-scripts/srec.vim'
|
||||
highlight link srecStart Comment
|
||||
highlight link srecType Comment
|
||||
highlight link srecLength WarningMsg
|
||||
highlight link srec16BitAddress Constant
|
||||
highlight link srec24BitAddress Constant
|
||||
highlight link srec32BitAddress Constant
|
||||
highlight link srecChecksum Type
|
||||
Plug 'keith/swift.vim'
|
||||
Plug 'chr4/nginx.vim'
|
||||
call plug#end()
|
||||
|
||||
" This has to be here (as opposed to right after the Plug call) because the
|
||||
" function airline#section#create doesn't exist before plug#end() is
|
||||
" called. THe exists() call is still needed so no errors are generated on
|
||||
" the very first time vim is run, as no plugins are installed yet.
|
||||
if exists("airline#section#create")
|
||||
if has('multi_byte') && &encoding ==# 'utf-8'
|
||||
let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v'])
|
||||
else " line / total : col
|
||||
let g:airline_section_z = airline#section#create(['L%4l/%L c%3v'])
|
||||
call plug#begin('$XDG_CONFIG_HOME/vim/bundle')
|
||||
Plug 'altercation/vim-colors-solarized'
|
||||
Plug 'bronson/vim-trailing-whitespace'
|
||||
Plug 'elzr/vim-json'
|
||||
" Make numbers and booleans stand out, important because of the
|
||||
" concealment used by vim-json.
|
||||
highlight link jsonBraces Text
|
||||
highlight link jsonNumber Identifier
|
||||
highlight link jsonBoolean Identifier
|
||||
highlight link jsonNull Identifier
|
||||
Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown'
|
||||
let g:vim_markdown_conceal_code_blocks = 0
|
||||
Plug 'junegunn/rainbow_parentheses.vim'
|
||||
let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']]
|
||||
Plug 'kien/ctrlp.vim'
|
||||
let g:ctrlp_match_window = 'bottom,order:ttb'
|
||||
let g:ctrlp_switch_buffer = 0 " open files in new buffer
|
||||
let g:ctrlp_show_hidden = 1 " show hidden files
|
||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
Plug 'tpope/vim-commentary'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
if !exists('g:airline_symbols')
|
||||
let g:airline_symbols = {}
|
||||
endif
|
||||
endif
|
||||
let g:airline_left_sep = ' '
|
||||
let g:airline_left_alt_sep = ''
|
||||
let g:airline_right_sep = ' '
|
||||
let g:airline_right_alt_sep = ''
|
||||
let g:airline_symbols.crypt = '🔒'
|
||||
let g:airline_symbols.branch = '⎇'
|
||||
let g:airline_symbols.paste = 'Ⓟ'
|
||||
let g:airline_symbols.spell = '✔'
|
||||
let g:airline_symbols.readonly = ' ⃠'
|
||||
let g:airline_symbols.notexists = '∄'
|
||||
let g:airline_symbols.whitespace = '✗'
|
||||
Plug 'vim-scripts/srec.vim'
|
||||
highlight link srecStart Comment
|
||||
highlight link srecType Comment
|
||||
highlight link srecLength WarningMsg
|
||||
highlight link srec16BitAddress Constant
|
||||
highlight link srec24BitAddress Constant
|
||||
highlight link srec32BitAddress Constant
|
||||
highlight link srecChecksum Type
|
||||
Plug 'keith/swift.vim'
|
||||
Plug 'chr4/nginx.vim'
|
||||
call plug#end()
|
||||
|
||||
silent! colorscheme solarized
|
||||
filetype plugin indent on
|
||||
syntax enable
|
||||
" This has to be here (as opposed to right after the Plug call) because the
|
||||
" function airline#section#create doesn't exist before plug#end() is
|
||||
" called. The exists() call is still needed so no errors are generated on
|
||||
" the very first time vim is run, as no plugins are installed yet.
|
||||
if exists("airline#section#create")
|
||||
if has('multi_byte') && &encoding ==# 'utf-8'
|
||||
let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v'])
|
||||
else " line / total : col
|
||||
let g:airline_section_z = airline#section#create(['L%4l/%L c%3v'])
|
||||
endif
|
||||
endif
|
||||
|
||||
silent! colorscheme solarized
|
||||
filetype plugin indent on
|
||||
syntax enable
|
||||
" }}}
|
||||
|
||||
" Functions {{{
|
||||
" Cycle through relativenumber + number, number (only), and no numbering.
|
||||
function! VimrcCycleNumbers() abort
|
||||
if exists('+relativenumber')
|
||||
execute {
|
||||
\ '00': 'set relativenumber | set number',
|
||||
\ '01': 'set norelativenumber | set number',
|
||||
\ '10': 'set norelativenumber | set nonumber',
|
||||
\ '11': 'set norelativenumber | set number' }[&number . &relativenumber]
|
||||
else
|
||||
set number! " No relative numbering, just toggle numbers on and off.
|
||||
endif
|
||||
endfunction
|
||||
" Cycle through relativenumber + number, number (only), and no numbering.
|
||||
function! VimrcCycleNumbers() abort
|
||||
if exists('+relativenumber')
|
||||
execute {
|
||||
\ '00': 'set relativenumber | set number',
|
||||
\ '01': 'set norelativenumber | set number',
|
||||
\ '10': 'set norelativenumber | set nonumber',
|
||||
\ '11': 'set norelativenumber | set number' }[&number . &relativenumber]
|
||||
else
|
||||
set number! " No relative numbering, just toggle numbers on and off.
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Turn fold text from this:
|
||||
"
|
||||
" +--- 2 lines: text of first line in fold --------------------------
|
||||
"
|
||||
" into this:
|
||||
"
|
||||
" ··· 2ℓ: text of first line in fold ······························
|
||||
function! VimrcFoldText() abort
|
||||
let l:level=substitute(v:folddashes, '-', '·', 'g')
|
||||
let l:count=(v:foldend - v:foldstart + 1)
|
||||
let l:title=substitute(getline(v:foldstart), '\v *', '', '')
|
||||
return l:level . ' ' . l:count . 'ℓ: ' . l:title . ' '
|
||||
endfunction
|
||||
" Turn fold text from this:
|
||||
"
|
||||
" +--- 2 lines: text of first line in fold --------------------------
|
||||
"
|
||||
" into this:
|
||||
"
|
||||
" ··· 2ℓ: text of first line in fold ······························
|
||||
function! VimrcFoldText() abort
|
||||
let l:level=substitute(v:folddashes, '-', '·', 'g')
|
||||
let l:count=(v:foldend - v:foldstart + 1)
|
||||
let l:title=substitute(getline(v:foldstart), '\v *', '', '')
|
||||
return l:level . ' ' . l:count . 'ℓ: ' . l:title . ' '
|
||||
endfunction
|
||||
" }}}"
|
||||
|
||||
" Mappings {{{
|
||||
let mapleader = "\<space>"
|
||||
let maplocalleader = ","
|
||||
let mapleader = "\<space>"
|
||||
let maplocalleader = ","
|
||||
|
||||
" better navigation for wrapped lines
|
||||
noremap j gj
|
||||
noremap k gk
|
||||
" better navigation for wrapped lines
|
||||
noremap j gj
|
||||
noremap k gk
|
||||
|
||||
" quickly exit insert mode
|
||||
inoremap jk <esc>
|
||||
" quickly exit insert mode
|
||||
inoremap jk <esc>
|
||||
|
||||
" retain selection when indenting/unindenting in visual mode
|
||||
vnoremap > ><cr>gv
|
||||
vnoremap < <<cr>gv
|
||||
" retain selection when indenting/unindenting in visual mode
|
||||
vnoremap > ><cr>gv
|
||||
vnoremap < <<cr>gv
|
||||
|
||||
" better searching (case insensitive & expand on previous)
|
||||
nnoremap // /\c
|
||||
nnoremap /// /<C-R>/
|
||||
" better searching (case insensitive & expand on previous)
|
||||
nnoremap // /\c
|
||||
nnoremap /// /<C-R>/
|
||||
|
||||
" window resizing similar to the way I have tmux set up
|
||||
nnoremap <c-w><c-k> 5<c-w>+
|
||||
nnoremap <c-w><c-j> 5<c-w>-
|
||||
nnoremap <c-w><c-h> 5<c-w><
|
||||
nnoremap <c-w><c-l> 5<c-w>>
|
||||
" window resizing similar to the way I have tmux set up
|
||||
nnoremap <c-w><c-k> 5<c-w>+
|
||||
nnoremap <c-w><c-j> 5<c-w>-
|
||||
nnoremap <c-w><c-h> 5<c-w><
|
||||
nnoremap <c-w><c-l> 5<c-w>>
|
||||
|
||||
" easier window navigation
|
||||
nnoremap <c-j> <c-w>j
|
||||
nnoremap <c-k> <c-w>k
|
||||
nnoremap <c-h> <c-w>h
|
||||
nnoremap <c-l> <c-w>l
|
||||
" easier window navigation
|
||||
nnoremap <c-j> <c-w>j
|
||||
nnoremap <c-k> <c-w>k
|
||||
nnoremap <c-h> <c-w>h
|
||||
nnoremap <c-l> <c-w>l
|
||||
|
||||
" easier tab navigation
|
||||
nnoremap <c-n> :tabprevious<cr>
|
||||
nnoremap <c-m> :tabnext<cr>
|
||||
" easier tab navigation
|
||||
nnoremap <c-n> :tabprevious<cr>
|
||||
nnoremap <c-m> :tabnext<cr>
|
||||
|
||||
" quickly change background
|
||||
nnoremap <leader>bg
|
||||
\ :let &background = &background ==# 'light' ? 'dark' : 'light'<cr>
|
||||
" quickly change background
|
||||
nnoremap <leader>bg
|
||||
\ :let &background = &background ==# 'light' ? 'dark' : 'light'<cr>
|
||||
|
||||
" turn off search highlight
|
||||
nnoremap <leader>h :nohlsearch<cr>
|
||||
" turn off search highlight
|
||||
nnoremap <leader>h :nohlsearch<cr>
|
||||
|
||||
" toggle NERDTree
|
||||
nnoremap <leader>n :NERDTreeToggle<cr>
|
||||
" toggle NERDTree
|
||||
nnoremap <leader>n :NERDTreeToggle<cr>
|
||||
|
||||
" toggle rainbow parens
|
||||
nnoremap <leader>p :RainbowParentheses!!<cr>
|
||||
" toggle rainbow parens
|
||||
nnoremap <leader>p :RainbowParentheses!!<cr>
|
||||
|
||||
" fix whitespace
|
||||
nnoremap <leader>w :FixWhitespace<cr>
|
||||
|
||||
" cycle through line numbering modes
|
||||
nnoremap <silent> <leader>l :call VimrcCycleNumbers()<CR>
|
||||
" fix whitespace
|
||||
nnoremap <leader>w :FixWhitespace<cr>
|
||||
|
||||
" cycle through line numbering modes
|
||||
nnoremap <silent> <leader>l :call VimrcCycleNumbers()<CR>
|
||||
" }}}"
|
||||
|
||||
augroup vimrc " {{{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue