X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=vim%2F.vimrc;h=42d87df669705e92785adc2cc05c60a40cb3055b;hb=28c1433fda0144c1dbdf6f2793054d923ead9de4;hp=3e1569d22d250a9a5ca9ee47967fbdcf56858d3d;hpb=29f4acd0ae2d23db79e33cc0d4d064b53771d1f6;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 3e1569d..42d87df 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,7 +1,5 @@
 " Automaticly source some files after writing
 autocmd! bufwritepost .vimrc source %
-autocmd! bufwritepost .bashrc !source %
-autocmd! bufwritepost .Xresources !xrdb -merge %
 
 " Some general options
 syntax enable
@@ -33,9 +31,11 @@ set list
 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
 
@@ -43,8 +43,18 @@ map <TAB>k <C-W>k
 nnoremap n nzzzv
 nnoremap N Nzzzv
 
+" 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=syntax
+set foldmethod=marker
 set foldlevelstart=99
 
 " Unbind arrow keys, who has them anyways on the keyboard...