updated ps1 without newline, vimrc for bashrc and xresources and better color scheme

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 7aab328..44c3fb1 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,12 @@
-filetype indent plugin on
+execute pathogen#infect()
 syntax enable
-color torte
-hi Normal ctermbg=NONE
+filetype indent plugin on
+
+autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
+
+set encoding=utf-8
 set history=1000
 set number
 set ruler
@@ -13,24 +18,24 @@ set novisualbell
 set nobackup
 set nowb
 set noswapfile
-set shiftwidth=4
-set tabstop=4
-set foldmethod=indent
-set foldnestmax=2
-set nofoldenable
+set shiftwidth=2
+set tabstop=2
+set cc=80
+set textwidth=79
+
+map <TAB>l <C-W>l
+map <TAB>h <C-W>h
+map <TAB>j <C-W>j
+map <TAB>k <C-W>k
+
+nnoremap n nzzzv
+nnoremap N Nzzzv
 
-" Unmap the arrow keys!!!
 for prefix in ['i', 'n', 'v']
-       for key in ['<Up>', '<Down>', '<Left>', '<Right>']
+       for key in ['<UP', '<DOWN>', '<LEFT>', '<RIGHT>']
                exe prefix . "noremap " . key . " <Nop>"
        endfor
 endfor
 
-" Macro for compiling and running a tex file
-au BufNewFile,BufRead *.tex let @a = '\e:w\r:!latex % && latex % && if [ -f %:r.bib ]; then bibtex %:r; fi; latex % && pdflatex %\r'
-
-" Load all the skeletons for newfiles
-for i in split(globpath('~/.vim/skel/', './*'), '\n')
-       let extension = split(i, "/")[-1]
-       exe "au BufNewFile *." . extension . " 0r ~/.vim/skel/" . extension
-endfor
+let g:GPGPreferArmor=1
+let g:GPGPreferSign=1