aboutsummaryrefslogtreecommitdiff
path: root/vim/.vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/.vimrc')
-rw-r--r--vim/.vimrc34
1 files changed, 19 insertions, 15 deletions
diff --git a/vim/.vimrc b/vim/.vimrc
index 8f3fc8c..fc3b3ab 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,20 +1,22 @@
call plug#begin('~/.vim/plugins')
-Plug 'ctrlpvim/ctrlp.vim' " fuzzy file, ctag search
-Plug 'scrooloose/nerdtree' " nicer file browser with sidebar support
-Plug 'simnalamburt/vim-mundo' " visualize undo tree
-Plug 'vim-airline/vim-airline' " better status bar
-Plug 'vim-airline/vim-airline-themes' " airline themes
-Plug 'tpope/vim-unimpaired' " bracket mappings
-Plug 'airblade/vim-gitgutter' " display git diffs alongside line numbers
-Plug 'qpkorr/vim-renamer' " file renaming utility
-Plug 'vim-pandoc/vim-pandoc' " `pandoc` integration
-Plug 'vim-pandoc/vim-pandoc-syntax' " `pandoc` syntax module
-Plug 'junegunn/goyo.vim' " distraction free writing mode
-Plug 'elmanuelito/vim-matlab-behave' " add basic matlab support
-Plug 'vim-latex/vim-latex' " latex integration, main usecase for me is the concealment of math expressions
-Plug 'Chiel92/vim-autoformat' " autoformatting integration
-Plug 'majutsushi/tagbar' " display ctag tree in sidebar
+Plug 'ctrlpvim/ctrlp.vim' " fuzzy file, ctag search
+Plug 'scrooloose/nerdtree' " nicer file browser with sidebar support
+Plug 'simnalamburt/vim-mundo' " visualize undo tree
+Plug 'vim-airline/vim-airline' " better status bar
+Plug 'vim-airline/vim-airline-themes' " airline themes
+Plug 'tpope/vim-unimpaired' " bracket mappings
+Plug 'airblade/vim-gitgutter' " display git diffs alongside line numbers
+Plug 'qpkorr/vim-renamer' " file renaming utility
+Plug 'vim-pandoc/vim-pandoc' " `pandoc` integration
+Plug 'vim-pandoc/vim-pandoc-syntax' " `pandoc` syntax module
+Plug 'junegunn/goyo.vim' " distraction free writing mode
+Plug 'elmanuelito/vim-matlab-behave' " add basic matlab support
+Plug 'vim-latex/vim-latex' " latex integration, main usecase for me is the concealment of math expressions
+Plug 'Chiel92/vim-autoformat' " autoformatting integration
+Plug 'majutsushi/tagbar' " display ctag tree in sidebar
+Plug 'godlygeek/tabular' " text alignment helper
+Plug 'MarcWeber/vim-addon-local-vimrc' " folder specific vim configuration
call plug#end()
@@ -32,6 +34,7 @@ set mouse=a
set t_Co=256
set background=dark
set shell=/bin/sh
+set sessionoptions-=options
colorscheme jellybeans
@@ -68,6 +71,7 @@ autocmd InsertLeave * :setlocal hlsearch
" redraw wiki instance when managed via e.g. _i3wm scratch buffer_
autocmd FocusGained *.wiki :redraw!
autocmd BufRead,BufNewFile *.wiki set filetype=pandoc
+autocmd BufReadPre,FileReadPre * :SourceLocalVimrc
autocmd FileType scheme setlocal shiftwidth=2 tabstop=2 expandtab
autocmd FileType lisp setlocal shiftwidth=2 tabstop=2 expandtab