aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamil Staps2017-11-17 01:15:21 +0100
committerCamil Staps2017-11-17 01:15:21 +0100
commit91bc417c8c74e00db58606219fec7a09efa82f26 (patch)
treeb5360aba346fcbf1f4632a1c4eb0dabeab93dca7
parentMake i3status.py more robust (diff)
Vim: Clean statusline and fdm=manual; add diffchar plugin
-rw-r--r--vim/.vim/after/ftplugin/clean.vim3
-rw-r--r--vim/.vimrc14
2 files changed, 12 insertions, 5 deletions
diff --git a/vim/.vim/after/ftplugin/clean.vim b/vim/.vim/after/ftplugin/clean.vim
index 6cff87a..befef40 100644
--- a/vim/.vim/after/ftplugin/clean.vim
+++ b/vim/.vim/after/ftplugin/clean.vim
@@ -1,3 +1,4 @@
setlocal autoindent
-setlocal foldlevel=1
+setlocal foldmethod=manual
setlocal tags+=/opt/clean/lib/tags
+setlocal laststatus=2
diff --git a/vim/.vimrc b/vim/.vimrc
index 0249b3b..6221886 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -28,6 +28,7 @@ Plugin 'rust-lang/rust.vim' " Rust
Plugin 'terryma/vim-multiple-cursors' " Multiple cursors
Plugin 'scrooloose/syntastic' " Syntastic
Plugin 'tpope/vim-surround' " cs)] to replace parenthesis pairs, e.g.
+Plugin 'rickhowe/diffchar.vim' " diffing on character level
call vundle#end()
" End Vundle
@@ -47,7 +48,7 @@ set listchars=nbsp:¬,tab:▸\ ,extends:»,precedes:«,trail:•
set nolist
set tabpagemax=30
set fillchars+=fold:\
-nnoremap <C-]> <C-w><C-]><C-w>T
+set statusline=
filetype plugin indent on
syntax enable
@@ -82,6 +83,11 @@ command! -nargs=1 Silent
command! -nargs=0 Smake
\ | execute ':Silent make'
+" Clean
+let g:clean_load_cloogle_tags = 1
+
+set statusline+=%{&filetype=='clean'?cleanvim#tags#bestmatchdescription(expand('<cword>')):''}
+
" Syntastic
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
@@ -100,9 +106,6 @@ let g:syntastic_mode_map = {
\ "mode": "passive",
\ "passive_filetpyes": [] }
-" Clean
-let g:clean_load_cloogle_tags = 1
-
" VimTeX
let g:vimtex_compiler_latexmk = {
\ 'callback': 0,
@@ -147,3 +150,6 @@ cabbrev pv Pv
"endfunction
"set statusline+=%{SyntaxItem()}
"set laststatus=2
+
+" https://unix.stackexchange.com/a/243667/37050
+set statusline+=%=%(%l,%c%V\ %=\ %P%)