Merge branch 'master' of github.com:dopefishh/dotfiles

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 7811221..3479ab3 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,15 +1,12 @@
-" Package manager
-execute pathogen#infect()
-
 " Automaticly source some files after writing
 autocmd! bufwritepost .vimrc source %
-autocmd! bufwritepost .bashrc !source %
-autocmd! bufwritepost .Xresources !xrdb -merge %
 
 " Some general options
 syntax enable
 filetype indent plugin on
-color elflord
+color torte
+
+" Settings
 set encoding=utf-8
 set history=1000
 set number
@@ -26,18 +23,24 @@ set colorcolumn=80
 set textwidth=79
 set shiftwidth=4
 set tabstop=4
-
-" List characters to mark trailing whitespace etc
+set nowrap
+set lazyredraw
+set smartcase
+set ignorecase
+set scrolloff=1
+set sidescrolloff=1
 set listchars=nbsp:¬,tab:▸\ ,eol:↩,extends:»,precedes:«,trail:•
-set nolist
+set list
 
 " Move through long lines as they were short multiple lines
 map j gj
 map k gk
 
-" Custom split switching using tab
-map <TAB>l <C-W>l
-map <TAB>h <C-W>h
+" Custom split and tabswitching using tab
+map <TAB>l <C-PageDown>
+map <TAB>h <C-PageUp>
+map <TAB><TAB>l <C-W>l
+map <TAB><TAB>h <C-W>h
 map <TAB>j <C-W>j
 map <TAB>k <C-W>k
 
@@ -45,7 +48,21 @@ map <TAB>k <C-W>k
 nnoremap n nzzzv
 nnoremap N Nzzzv
 
-" Unbind arrow keys, who has them anyways on the keyboard...
+" Allow yanking to the clipboards in visual mode
+vnoremap sy :w ! xclip<enter><enter>
+vnoremap cy :w ! xclip -sel clip<enter><enter>
+" Allow pasting from the clipboards in normal mode
+nnoremap sp :r ! xclip -o<enter>
+nnoremap cp :r ! xclip -sel clip -o<enter>
+
+" Disable ex mode
+map Q <Nop>
+
+" Fold settings
+set foldmethod=marker
+set foldlevelstart=99
+
+" Unbind arrow keys, who has them anyway on the keyboard...
 for prefix in ['i', 'n', 'v']
        for key in ['<UP>', '<DOWN>', '<LEFT>', '<RIGHT>']
                exe prefix . "noremap " . key . " <Nop>"
@@ -65,3 +82,6 @@ let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 0
 let g:syntastic_check_on_wq = 0
+
+" Vimtex options
+let g:vimtex_compiler_enabled = 0