fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

vim: minor vimrc formatting change

Browse source
This commit is contained in:
Fernando Schauenburg 2020-12-15 17:21:48 +01:00
parent 3a168c72a0
commit 36582437f4
1 changed files with 127 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
roles/vim/files/vimrc
View file

@ -83,7 +83,7 @@ endif
" }}} " }}}
" Plugins {{{ " Plugins {{{
call plug#begin('$XDG_CONFIG_HOME/vim/bundle') call plug#begin('$XDG_CONFIG_HOME/vim/bundle')
Plug 'altercation/vim-colors-solarized' Plug 'altercation/vim-colors-solarized'
Plug 'bronson/vim-trailing-whitespace' Plug 'bronson/vim-trailing-whitespace'
Plug 'elzr/vim-json' Plug 'elzr/vim-json'
@ -130,28 +130,28 @@ endif
highlight link srecChecksum Type highlight link srecChecksum Type
Plug 'keith/swift.vim' Plug 'keith/swift.vim'
Plug 'chr4/nginx.vim' Plug 'chr4/nginx.vim'
call plug#end() call plug#end()
" This has to be here (as opposed to right after the Plug call) because the " 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 " function airline#section#create doesn't exist before plug#end() is
" called. THe exists() call is still needed so no errors are generated on " 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. " the very first time vim is run, as no plugins are installed yet.
if exists("airline#section#create") if exists("airline#section#create")
if has('multi_byte') && &encoding ==# 'utf-8' if has('multi_byte') && &encoding ==# 'utf-8'
let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v'])
else " line / total : col else " line / total : col
let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) let g:airline_section_z = airline#section#create(['L%4l/%L c%3v'])
endif endif
endif endif
silent! colorscheme solarized silent! colorscheme solarized
filetype plugin indent on filetype plugin indent on
syntax enable syntax enable
" }}} " }}}
" Functions {{{ " Functions {{{
" Cycle through relativenumber + number, number (only), and no numbering. " Cycle through relativenumber + number, number (only), and no numbering.
function! VimrcCycleNumbers() abort function! VimrcCycleNumbers() abort
if exists('+relativenumber') if exists('+relativenumber')
execute { execute {
\ '00': 'set relativenumber | set number', \ '00': 'set relativenumber | set number',
@ -161,77 +161,76 @@ endif
else else
set number! " No relative numbering, just toggle numbers on and off. set number! " No relative numbering, just toggle numbers on and off.
endif endif
endfunction endfunction
" Turn fold text from this: " Turn fold text from this:
" "
" +--- 2 lines: text of first line in fold -------------------------- " +--- 2 lines: text of first line in fold --------------------------
" "
" into this: " into this:
" "
" ··· 2ℓ: text of first line in fold ······························ " ··· 2ℓ: text of first line in fold ······························
function! VimrcFoldText() abort function! VimrcFoldText() abort
let l:level=substitute(v:folddashes, '-', '·', 'g') let l:level=substitute(v:folddashes, '-', '·', 'g')
let l:count=(v:foldend - v:foldstart + 1) let l:count=(v:foldend - v:foldstart + 1)
let l:title=substitute(getline(v:foldstart), '\v *', '', '') let l:title=substitute(getline(v:foldstart), '\v *', '', '')
return l:level . ' ' . l:count . 'ℓ: ' . l:title . ' ' return l:level . ' ' . l:count . 'ℓ: ' . l:title . ' '
endfunction endfunction
" }}}" " }}}"
" Mappings {{{ " Mappings {{{
let mapleader = "\<space>" let mapleader = "\<space>"
let maplocalleader = "," let maplocalleader = ","
" better navigation for wrapped lines " better navigation for wrapped lines
noremap j gj noremap j gj
noremap k gk noremap k gk
" quickly exit insert mode " quickly exit insert mode
inoremap jk <esc> inoremap jk <esc>
" retain selection when indenting/unindenting in visual mode " retain selection when indenting/unindenting in visual mode
vnoremap > ><cr>gv vnoremap > ><cr>gv
vnoremap < <<cr>gv vnoremap < <<cr>gv
" better searching (case insensitive & expand on previous) " better searching (case insensitive & expand on previous)
nnoremap // /\c nnoremap // /\c
nnoremap /// /<C-R>/ nnoremap /// /<C-R>/
" window resizing similar to the way I have tmux set up " window resizing similar to the way I have tmux set up
nnoremap <c-w><c-k> 5<c-w>+ nnoremap <c-w><c-k> 5<c-w>+
nnoremap <c-w><c-j> 5<c-w>- nnoremap <c-w><c-j> 5<c-w>-
nnoremap <c-w><c-h> 5<c-w>< nnoremap <c-w><c-h> 5<c-w><
nnoremap <c-w><c-l> 5<c-w>> nnoremap <c-w><c-l> 5<c-w>>
" easier window navigation " easier window navigation
nnoremap <c-j> <c-w>j nnoremap <c-j> <c-w>j
nnoremap <c-k> <c-w>k nnoremap <c-k> <c-w>k
nnoremap <c-h> <c-w>h nnoremap <c-h> <c-w>h
nnoremap <c-l> <c-w>l nnoremap <c-l> <c-w>l
" easier tab navigation " easier tab navigation
nnoremap <c-n> :tabprevious<cr> nnoremap <c-n> :tabprevious<cr>
nnoremap <c-m> :tabnext<cr> nnoremap <c-m> :tabnext<cr>
" quickly change background " quickly change background
nnoremap <leader>bg nnoremap <leader>bg
\ :let &background = &background ==# 'light' ? 'dark' : 'light'<cr> \ :let &background = &background ==# 'light' ? 'dark' : 'light'<cr>
" turn off search highlight " turn off search highlight
nnoremap <leader>h :nohlsearch<cr> nnoremap <leader>h :nohlsearch<cr>
" toggle NERDTree " toggle NERDTree
nnoremap <leader>n :NERDTreeToggle<cr> nnoremap <leader>n :NERDTreeToggle<cr>
" toggle rainbow parens " toggle rainbow parens
nnoremap <leader>p :RainbowParentheses!!<cr> nnoremap <leader>p :RainbowParentheses!!<cr>
" fix whitespace " fix whitespace
nnoremap <leader>w :FixWhitespace<cr> nnoremap <leader>w :FixWhitespace<cr>
" cycle through line numbering modes
nnoremap <silent> <leader>l :call VimrcCycleNumbers()<CR>
" cycle through line numbering modes
nnoremap <silent> <leader>l :call VimrcCycleNumbers()<CR>
" }}}" " }}}"
augroup vimrc " {{{ augroup vimrc " {{{