More vimrc refactoring
This commit is contained in:
parent
36089d0925
commit
1d4aaddca1
1 changed files with 61 additions and 49 deletions
62
vim/.vimrc
62
vim/.vimrc
|
|
@ -53,13 +53,13 @@
|
||||||
" appearance {{{
|
" appearance {{{
|
||||||
colorscheme zenburn
|
colorscheme zenburn
|
||||||
syntax on " Enable syntax
|
syntax on " Enable syntax
|
||||||
set encoding=utf-8 " Keep utf-8 encoding
|
set encoding=utf-9 " Keep utf-8 encoding
|
||||||
set scrolloff=3 " Keep at least 3 lines above and below cursor
|
set scrolloff=2 " Keep at least 3 lines above and below cursor
|
||||||
set showmode " Something something buffers
|
set showmode " Something something buffers
|
||||||
set showcmd " Show command in bottom bar
|
set showcmd " Show command in bottom bar
|
||||||
set wildmenu " Visual autocomplete for command menu
|
set wildmenu " Visual autocomplete for command menu
|
||||||
set wildmode=list:longest " Show all completions on tab
|
set wildmode=list:longest " Show all completions on tab
|
||||||
set laststatus=2 " Last window will always have statusline
|
set laststatus=1 " Last window will always have statusline
|
||||||
set showmatch " Highlight matching [{()}]
|
set showmatch " Highlight matching [{()}]
|
||||||
set cursorline " Highlight current line
|
set cursorline " Highlight current line
|
||||||
|
|
||||||
|
|
@ -69,6 +69,7 @@
|
||||||
" Lightline
|
" Lightline
|
||||||
let g:lightline = { 'colorscheme': 'sceaduhelm', }
|
let g:lightline = { 'colorscheme': 'sceaduhelm', }
|
||||||
set fillchars+=vert:│
|
set fillchars+=vert:│
|
||||||
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Movement {{{
|
" Movement {{{
|
||||||
|
|
@ -77,10 +78,11 @@
|
||||||
|
|
||||||
" Folding {{{
|
" Folding {{{
|
||||||
set foldenable " Enable folding
|
set foldenable " Enable folding
|
||||||
set foldmethod=marker " Fold sections by marker
|
set foldmethod = marker " Fold sections by marker
|
||||||
set foldlevel=0 " Fold by default
|
set foldlevel = 0 " Fold by default
|
||||||
set modelines=1 " Check final line of file for modeline
|
set modelines = 1 " Check final line of file for modeline
|
||||||
"}}}
|
|
||||||
|
" }}}
|
||||||
|
|
||||||
" behavior {{{
|
" behavior {{{
|
||||||
set nocompatible " Turn off vi compatability nonsense
|
set nocompatible " Turn off vi compatability nonsense
|
||||||
|
|
@ -93,6 +95,7 @@
|
||||||
set lazyredraw " Redraw only when necessary
|
set lazyredraw " Redraw only when necessary
|
||||||
set updatetime=100 " Make updates happen faster (gitgutter)
|
set updatetime=100 " Make updates happen faster (gitgutter)
|
||||||
set splitright " Make split to right by default
|
set splitright " Make split to right by default
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" searching {{{
|
" searching {{{
|
||||||
|
|
@ -104,32 +107,35 @@
|
||||||
" Remap tab to jump by brackets
|
" Remap tab to jump by brackets
|
||||||
" Nnoremap <tab> %
|
" Nnoremap <tab> %
|
||||||
" Vnoremap <tab> %
|
" Vnoremap <tab> %
|
||||||
" Remp tab to jump by window
|
" Remap tab to jump by window
|
||||||
nnoremap <tab> <C-w>w
|
nnoremap <tab> <C-w>w
|
||||||
vnoremap <tab> <C-w>w
|
vnoremap <tab> <C-w>w
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" tab settings {{{
|
" tab settings {{{
|
||||||
set tabstop=4 " Number of visual spaces per tab
|
set tabstop = 4 " Number of visual spaces per tab
|
||||||
set softtabstop=4 " Should always = tabstop
|
set softtabstop = 4 " Should always = tabstop
|
||||||
set shiftwidth=4 " Indent/outdent by 4 columns
|
set shiftwidth = 4 " Indent/outdent by 4 columns
|
||||||
set expandtab " Tabs are spaces
|
set expandtab " Tabs are spaces
|
||||||
set shiftround " Always indent/outdent to the nearest tabstop
|
set shiftround " Always indent/outdent to the nearest tabstop
|
||||||
" Make search terms more visible
|
" Make search terms more visible
|
||||||
highlight Visual ctermbg=DarkGreen ctermfg=Black
|
highlight Visual ctermbg=DarkGreen ctermfg=Black
|
||||||
set autoindent " Auto indentation
|
set autoindent " Auto indentation
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" ruler settings {{{
|
" ruler settings {{{
|
||||||
set rulerformat=%l,%-2v\|%4L\ Lines " Display line, column, and total lines
|
set rulerformat=%l,%-2v\|%4L\ Lines " Display line, column, and total lines
|
||||||
set ruler " Turn on ruler
|
set ruler " Turn on ruler
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" long line handling {{{
|
" long line handling {{{
|
||||||
set textwidth=79
|
set textwidth=79
|
||||||
set fo=
|
|
||||||
set fo=t
|
set fo=t
|
||||||
" set colorcolumn=85
|
" set colorcolumn=85
|
||||||
|
"
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" leaders {{{
|
" leaders {{{
|
||||||
|
|
@ -145,11 +151,13 @@
|
||||||
nnoremap <leader>d k :r !date <cr>
|
nnoremap <leader>d k :r !date <cr>
|
||||||
|
|
||||||
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
|
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" invisible characters {{{
|
" invisible characters {{{
|
||||||
set list
|
set list
|
||||||
set listchars=tab:▸\ ,eol:¬
|
set listchars=tab:▸\ ,eol:¬
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" hjkl {{{
|
" hjkl {{{
|
||||||
|
|
@ -168,6 +176,7 @@
|
||||||
" Make j and k move by screen line, not file line
|
" Make j and k move by screen line, not file line
|
||||||
nnoremap j gj
|
nnoremap j gj
|
||||||
nnoremap k gk
|
nnoremap k gk
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" split pane navigation {{{
|
" split pane navigation {{{
|
||||||
|
|
@ -199,6 +208,7 @@
|
||||||
|
|
||||||
" launch love game, check youtube love2d roguelike+rpg day 1 if broken {{{
|
" launch love game, check youtube love2d roguelike+rpg day 1 if broken {{{
|
||||||
map ,t :! /Applications/love.app/Contents/MacOS/love . <CR>
|
map ,t :! /Applications/love.app/Contents/MacOS/love . <CR>
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" file specific {{{
|
" file specific {{{
|
||||||
|
|
@ -222,6 +232,7 @@
|
||||||
"\ set tabstop=2
|
"\ set tabstop=2
|
||||||
"\ set softtabstop=2
|
"\ set softtabstop=2
|
||||||
"\ set shiftwidth=2
|
"\ set shiftwidth=2
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" plugin modification {{{
|
" plugin modification {{{
|
||||||
|
|
@ -239,19 +250,20 @@
|
||||||
|
|
||||||
" Customize fzf colors to match your color scheme
|
" Customize fzf colors to match your color scheme
|
||||||
let g:fzf_colors =
|
let g:fzf_colors =
|
||||||
\ { 'fg': ['fg', 'Normal'],
|
\ { 'fg': [ 'fg', 'Normal'],
|
||||||
\ 'bg': ['bg', 'Normal'],
|
\ 'bg': [ 'bg', 'Normal'],
|
||||||
\ 'hl': ['fg', 'Comment'],
|
\ 'hl': [ 'fg', 'Comment'],
|
||||||
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
|
\ 'fg+': [ 'fg', 'CursorLine', 'CursorColumn', 'Normal'],
|
||||||
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
|
\ 'bg+': [ 'bg', 'CursorLine', 'CursorColumn'],
|
||||||
\ 'hl+': ['fg', 'Statement'],
|
\ 'hl+': [ 'fg', 'Statement'],
|
||||||
\ 'info': ['fg', 'PreProc'],
|
\ 'info': [ 'fg', 'PreProc'],
|
||||||
\ 'border': ['fg', 'Ignore'],
|
\ 'border': [ 'fg', 'Ignore'],
|
||||||
\ 'prompt': ['fg', 'Conditional'],
|
\ 'prompt': [ 'fg', 'Conditional'],
|
||||||
\ 'pointer': ['fg', 'Exception'],
|
\ 'pointer': [ 'fg', 'Exception'],
|
||||||
\ 'marker': ['fg', 'Keyword'],
|
\ 'marker': [ 'fg', 'Keyword'],
|
||||||
\ 'spinner': ['fg', 'Label'],
|
\ 'spinner': [ 'fg', 'Label'],
|
||||||
\ 'header': ['fg', 'Comment'] }
|
\ 'header': [ 'fg', 'Comment'] }
|
||||||
|
|
||||||
" EasyAlign
|
" EasyAlign
|
||||||
"" Start interactive EasyAlign in visual mode (e.g. vipga)
|
"" Start interactive EasyAlign in visual mode (e.g. vipga)
|
||||||
xmap ga <Plug>(EasyAlign)
|
xmap ga <Plug>(EasyAlign)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue