Skip to content

Commit

Permalink
Update vimrc and add Badwolf iterm colors
Browse files Browse the repository at this point in the history
  • Loading branch information
tvs committed May 29, 2019
1 parent b0d54b7 commit 0fb4ca9
Show file tree
Hide file tree
Showing 4 changed files with 381 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .gitconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[user]
name = Travis Hall
email = thall@vmware.com
email = trvs.hll@gmail.com
[color]
diff = auto
status = auto
Expand Down
5 changes: 4 additions & 1 deletion .profile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function title() {

### COLORS
export CLICOLOR='true'
PS1='\[\e[0;32m\]\u:\[\e[m\]\[\e[0;36m\]\w\[\e[m\]\[\e[0;32m\]$(parse_git_branch)\[\e[m\]\[\e[1;32m\]\$\[\e[m\] '
PS1='\[\e[0;32m\]\u:\[\e[m\]\[\e[0;36m\]\w\[\e[m\]\[\e[0;32m\]$(parse_git_branch)\[\e[m\]\[\e[0;32m\]\$\[\e[m\] '

### PERFORCE ALIASES
export P4CONFDIR="$HOME/.p4config"
Expand Down Expand Up @@ -108,3 +108,6 @@ if [ -d /usr/local/etc/bash_completion.d ]; then
fi
done
fi

### GIMME
source $HOME/.gimme/envs/latest.env 2&> /dev/null
61 changes: 32 additions & 29 deletions .vimrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,37 @@
" Travis Hall
" Vim Plug {{{
call plug#begin('~/.vim/plugged')
" Colors
Plug 'sjl/badwolf'
" Other Stuff
Plug 'bling/vim-airline'
Plug 'ddrscott/vim-side-search'
Plug 'derekwyatt/vim-scala'
Plug 'fatih/vim-go'
Plug 'janko-m/vim-test'
Plug 'keith/swift.vim'
Plug 'kien/ctrlp.vim'
Plug 'leafgarland/typescript-vim'
Plug 'moll/vim-node'
Plug 'nsf/gocode', { 'rtp': 'vim', 'do': '~/.vim/plugged/gocode/vim/symlink.sh '}
Plug 'scrooloose/nerdtree'
Plug 'scrooloose/syntastic'
Plug 'simnalamburt/vim-mundo'
Plug 'tpope/vim-abolish'
Plug 'tpope/vim-fugitive'
Plug 'vim-airline/vim-airline-themes'
" Snipmate
Plug 'MarcWeber/vim-addon-mw-utils'
Plug 'garbas/vim-snipmate'
Plug 'hashivim/vim-terraform'
Plug 'honza/vim-snippets'
Plug 'tomtom/tlib_vim'
" Vimwiki
Plug 'vimwiki/vimwiki'
call plug#end()
" }}}

" Look and Feel {{{
execute pathogen#infect()
syntax enable " enable syntax processing
colorscheme badwolf
set termguicolors
Expand Down Expand Up @@ -128,34 +159,6 @@ set directory=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
set writebackup
" }}}

" Vim Plug {{{
call plug#begin('~/.vim/plugged')
Plug 'bling/vim-airline'
Plug 'ddrscott/vim-side-search'
Plug 'derekwyatt/vim-scala'
Plug 'fatih/vim-go'
Plug 'janko-m/vim-test'
Plug 'keith/swift.vim'
Plug 'kien/ctrlp.vim'
Plug 'leafgarland/typescript-vim'
Plug 'moll/vim-node'
Plug 'nsf/gocode', { 'rtp': 'vim', 'do': '~/.vim/plugged/gocode/vim/symlink.sh '}
Plug 'scrooloose/nerdtree'
Plug 'scrooloose/syntastic'
Plug 'simnalamburt/vim-mundo'
Plug 'tpope/vim-abolish'
Plug 'tpope/vim-fugitive'
Plug 'vim-airline/vim-airline-themes'
" Snipmate
Plug 'MarcWeber/vim-addon-mw-utils'
Plug 'garbas/vim-snipmate'
Plug 'hashivim/vim-terraform'
Plug 'honza/vim-snippets'
Plug 'tomtom/tlib_vim'
" Vimwiki
Plug 'vimwiki/vimwiki'
call plug#end()
" }}}

" airline {{{
set laststatus=2
Expand Down
Loading

0 comments on commit 0fb4ca9

Please sign in to comment.