From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 25 Apr 2016 12:07:44 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=494fd1d52e812b56a7f0f5c37cf3055d55041b0b;hp=9d962e72f42cc491eb650291891605912d040ba3;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

diff --git a/makelinks.sh b/makelinks.sh
index 1a37bd6..5f34e6f 100755
--- a/makelinks.sh
+++ b/makelinks.sh
@@ -8,7 +8,7 @@
 
 dir=~/etc/dotfiles                    
 olddir=~/etc/dotfiles.bak             
-files="vimrc bashrc bash_profile bash_aliases dir_colors Xresources gitconfig gitignore xinitrc inputrc"
+files="octaverc vimrc bashrc bash_profile bash_aliases dir_colors Xresources gitconfig gitignore xinitrc inputrc"
 directories="mutt"
 
 ##########
diff --git a/octaverc b/octaverc
new file mode 100644
index 0000000..5444617
--- /dev/null
+++ b/octaverc
@@ -0,0 +1,4 @@
+edit mode async
+edit home .
+EDITOR('vim > /dev/tty 2>&1 < /dev/tty %s')
+
diff --git a/vimrc b/vimrc
index ee9534f..51f96d0 100644
--- a/vimrc
+++ b/vimrc
@@ -27,6 +27,9 @@ Plugin 'kien/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
 Plugin 'ajh17/VimCompletesMe'
+Plugin 'hynek/vim-python-pep8-indent'
+Plugin 'vim-scripts/octave.vim--'
+Plugin 'vim-scripts/MatlabFilesEdition'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -53,8 +56,10 @@ set statusline+=%*
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 2
 let g:syntastic_check_on_open = 0
-let g:syntastic_check_on_wq = 0
+let g:syntastic_check_on_wq = 1
 let g:syntastic_javascript_checkers = ['eslint']
+"let g:syntastic_python_python_exec = '/usr/bin/python3'
+"let g:syntastic_python_checkers = ['flake8']
 
 " Syntastic C++11
 let g:syntastic_cpp_compiler = 'g++'
@@ -86,3 +91,8 @@ let g:clang_user_options='|| exit0'
 " Color 80th column
 highlight ColorColumn ctermbg=237
 set colorcolumn=80
+
+" Octave Syntax
+" augroup filetypedetect
+"   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
+" augroup END