From 9455432fcc7d1a28917ca438eab4c248f6422118 Mon Sep 17 00:00:00 2001
From: thomasba <git@thomasba.de>
Date: Sun, 19 Jul 2015 23:36:40 +0200
Subject: [PATCH] edited vimrc

---
 vim/vimrc      | 24 ++++++++++++++++++------
 vim/vundle.vim | 12 +++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index cea0aa5..c941b82 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,16 +1,14 @@
+" load plugins using vundle
 source ~/.vim/vundle.vim
 
 syntax on
-filetype plugin on
-filetype indent on
-filetype plugin on
 filetype plugin indent on
 
-set copyindent
 
 " delete always on backspace
 set backspace=indent,eol,start
 
+" set colorscheme
 if &term =~# '^\(screen\|xterm\)$'
     set t_Co=256
 endif
@@ -47,6 +45,7 @@ set title
 set ttyfast
 set hlsearch
 set spelllang=de_de,en
+set copyindent
 
 " move by screen lines, not by real lines - great for creative writing
 nnoremap j gj
@@ -134,6 +133,9 @@ command! CleanUpObfuscatedCode call CleanUpObfuscatedCode()
 let g:Powerline_symbols = 'unicode'
 set laststatus=2
 
+let mapleader = "-"
+let maplocalleader = "\\"
+
 noremap <leader>y "+y
 noremap <leader>Y "+Y
 noremap <leader>p "+
@@ -147,6 +149,7 @@ let g:indent_guides_auto_colors = 0
 
 " Hide latex output
 let NERDTreeIgnore=['\~$','\.\(aux\|nav\|out\|snm\|toc\|vrb\|o\)$']
+let g:nerdtree_plugin_open_cmd = "xdg-open"
 
 let g:tex_flavor = "latex"
 
@@ -156,8 +159,6 @@ let g:LargeFile = 200
 " Nooo, dont blink!!
 set guicursor=a:blinkon0
 
-let g:nerdtree_plugin_open_cmd = "xdg-open"
-let g:languagetool_jar = "/usr/share/java/languagetool/languagetool.jar"
 
 set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
 
@@ -167,6 +168,7 @@ if has('gui_running')
 	map! <S-Insert> <MiddleMouse>
 endif
 let g:languagetool_lang = "de"
+let g:languagetool_jar = "/usr/share/java/languagetool/languagetool.jar"
 
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
@@ -181,3 +183,13 @@ let g:syntastic_perl_checkers = ['perl']
 let g:syntastic_enable_perl_checker = 1
 let g:syntastic_python_checkers = ['pylint']
 let g:syntastic_php_checkers = ['php']
+" syntastic
+let g:syntastic_html_tidy_ignore_errors = ['warning: <div> proprietary attribute "data-role"', '<input> proprietary attribute "required"', '<input> proprietary attribute "pattern"', '<select> proprietary attribute "required"']
+
+" vimux
+" Set tmux pane percentage
+let g:VimuxHeight = "30"
+" Split tmux pane horizontally
+let g:VimuxOrientation = "h"
+" Prompt for a command to run
+noremap <leader>vp :VimuxPromptCommand<CR>
diff --git a/vim/vundle.vim b/vim/vundle.vim
index 41e74b4..df343bc 100644
--- a/vim/vundle.vim
+++ b/vim/vundle.vim
@@ -26,7 +26,6 @@ Plugin 'vim-scripts/JSON.vim'
 
 " Files
 Plugin 'scrooloose/nerdtree'
-"Plugin 'jistr/vim-nerdtree-tabs'
 Plugin 'kien/ctrlp.vim'
 if executable('ag')
 	Plugin 'rking/ag.vim'
@@ -43,23 +42,26 @@ Plugin 'vim-scripts/LanguageTool'
 Plugin 'thinca/vim-localrc'
 Plugin 'mtth/scratch.vim'
 Plugin 'scrooloose/syntastic'
-"Plugin 'jeetsukumaran/vim-buffergator'
 Plugin 'ntpeters/vim-airline-colornum'
 Plugin 'tpope/vim-surround'
 Plugin 'vim-scripts/tComment'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tmhedberg/matchit'
-Bundle 'chase/vim-ansible-yaml'
+Plugin 'chase/vim-ansible-yaml'
+Plugin 'jamessan/vim-gnupg'
+Plugin 'docunext/closetag.vim'
+Plugin 'lilydjwg/colorizer'
+Plugin 'Townk/vim-autoclose'
+" Interact with tmux from vim
+Plugin 'benmills/vimux'
 
 " test:
 "Plugin 'Yggdroot/indentLine'
 "Plugin 'honza/vim-snippets'
-Plugin 'lilydjwg/colorizer'
 "Plugin 'junegunn/vim-easy-align'
 "Plugin 'lervag/vimtex'
 "Plugin 'reedes/vim-pencil'
 "Plugin 'terryma/vim-multiple-cursors'
 "Plugin 'mbbill/undotree'
-Plugin 'Townk/vim-autoclose'
 
 call vundle#end()