Merge branch 'master' of github.com:hunner/hunners-homedir-configs

This commit is contained in:
Hunter Haugen 2012-05-21 15:25:02 +02:00
commit cc1a591021
3 changed files with 7 additions and 3 deletions

View file

@ -73,8 +73,8 @@ hi Cursor guifg=black guibg=white gui=NONE ctermfg=bl
hi LineNr guifg=#3D3D3D guibg=black gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE
hi VertSplit guifg=#202020 guibg=#202020 gui=NONE ctermfg=darkgray ctermbg=darkgray cterm=NONE
hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=white ctermbg=darkgray cterm=NONE
hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE
hi StatusLine guifg=#202020 guibg=#CCCCCC gui=italic ctermfg=white ctermbg=darkgray cterm=NONE
hi StatusLineNC guifg=#CCCCCC guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE
hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi FoldColumn guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE

3
.vimrc
View file

@ -1127,6 +1127,8 @@ set rtp+=~/.vim/bundle/vundle
call vundle#rc()
Bundle 'gmarik/vundle'
Bundle 'vim-scripts/ShowMarks'
Bundle 'Align'
Bundle 'Gundo'
filetype plugin indent on
" Brief help
@ -1259,6 +1261,7 @@ noremap <Leader>F :FufFile<CR>
noremap <Leader>v :FufCoverageFile<CR>
noremap <Leader>b :FufBuffer<CR>
noremap <Leader>c :FufDirWithFullCwd<CR>
noremap <Leader>u :FufRenewCache<CR>
noremap <Leader>w :bdelete<CR>
noremap <F1> :FufHelp<CR>
noremap <F12> <Esc>:syntax sync fromstart<CR>

View file

@ -93,7 +93,7 @@ SAVEHIST=1000
HISTFILE=~/.history
export GPGKEY="48C7AF0C"
export NETHACKOPTIONS='autopickup,color,!cmdassist,!number_pad,hilite_pet,boulder:0,pickup_types:$"=/!?+,menustyle:partial,!legacy,suppress_alert:3.3.1'
export ENVPUPPET_BASEDIR="/Users/hunner/Documents/work/git"
export ENVPUPPET_BASEDIR="/Users/hunner/git"
export OVFTOOL='/Applications/VMware OVF Tool/ovftool'
# Prompt
@ -247,6 +247,7 @@ alias gb="git branch"
alias gc="git commit"
alias gca="git commit --amend"
alias gd="git diff"
alias gdc="git diff --cached"
alias gdw="git diff --color-words"
alias gdt="git difftool"
alias go="git checkout"