Bernhard Leiner avatar Bernhard Leiner committed 5fcdfae Merge

merge

Comments (0)

Files changed (1)

 Bundle 'gmarik/vundle'
 Bundle 'Raimondi/delimitMate'
 Bundle 'majutsushi/tagbar'
-Bundle 'mileszs/ack.vim'
+Bundle 'bernh/pss.vim'
+Bundle 'Raimondi/delimitMate'
 Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'kana/vim-scratch'
 " Brief Help
 " :BundleInstall  - install bundles (won't update installed)
 " :BundleInstall! - update if installed
+" :BundleClean    - uninstall bundles
 
 filetype plugin indent on
 syntax on
 set relativenumber
 " set default encoding
 set encoding=utf-8
-" start scrolling 3 lines earlier
-set scrolloff=3
 " show mode (INSERT, VISUAL, etc.)
 set showmode
 set showcmd
 " better completion for command line
 set wildmenu
-" highlight current line
-set cursorline
 " smother redraw"
 set ttyfast
 " set terminal title
 set title
 
 " --- GUI specific settings----------------------------------------------------
-" away with the toolbar and the menu
-set guioptions-=T
-set guioptions-=m
 
 if has("gui_running")
-    " set window size
-    "set lines=55
-    "set columns=90
+    " away with the toolbar and the menu
+    set guioptions-=T
+    set guioptions-=m
+    colorscheme solarized
+    " highlight current line
+    set cursorline
 else
     set t_Co=256
 endif
 
-colorscheme solarized
 set guitablabel=%N
 
 " --- settings for searching --------------------------------------------------
 
 nnoremap <leader>l  :edit $HOME\log.rst<CR>
 
-" keep Ctrl pressed to move around between windows
+" keep Ctrl pressed to move around between window
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 
 nnoremap <F5> :nohlsearch<CR>:MarkClear<CR>
 nnoremap <F6> :set invspell<CR>
+nnoremap <F8> :%s/\s\+$//e<CR>
 
-" --- autocommands ------------------------------------------------------
-" remove trailing whitespace from some file formats upon saving
-augroup whitespace
-    autocmd!
-    autocmd BufWrite *.py %s/\s\+$//e
-    autocmd BufWrite *.rst %s/\s\+$//e
-    autocmd BufWrite *.txt %s/\s\+$//e
-    autocmd BufWrite *.c %s/\s\+$//e
-    autocmd BufWrite *.h %s/\s\+$//e
-augroup END
 " always save all files when editor looses focus
 " au FocusLost * :wa
 
 
 " --- configure Plugins -------------------------------------------------
 " Ack
-nnoremap <F2> :Ack <C-R><C-w> <CR>
+nnoremap <F2> :Pss <CR>
 nnoremap <leader>a :Ack<Space>
+nnoremap <leader>p :Pss<Space>
+
 " tagbar
 nnoremap <F3> :TagbarToggle<CR>
 " special settings for rst2ctags usage
 let NERDTreeIgnore=['\.vim$', '\~$']
 " Scratch
 nnoremap <leader><tab> :ScratchOpen<CR>
-" Snippets
-let g:snippets_dir='~/.vim/bundle/snipmate.vim/snippets'
-let g:snips_author = 'Bernhard Leiner'
 " ToggleBg (comes with solarized)
 call togglebg#map("<F7>")
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.