Permalink
Browse files

stuff

  • Loading branch information...
1 parent 6c722f8 commit 447442baae88b4f31051acefaa56e0cef56e3d8b @jtaby committed Dec 26, 2011
Showing with 9 additions and 5 deletions.
  1. +6 −3 vimrc
  2. +2 −2 zsh.conf/lib/prompt.zsh
  3. +1 −0 zshrc
View
9 vimrc
@@ -20,7 +20,7 @@ endif
" Treat JSON files like JavaScript
au BufNewFile,BufRead *.json set ft=javascript
-au BufEnter * silent! lcd %:p:h
+"au BufEnter * silent! lcd %:p:h
set nocompatible
@@ -81,7 +81,7 @@ let g:CommandTMaxHeight=20
" IMPORTANT: Uncomment one of the following lines to force
" " using 256 colors (or 88 colors) if your terminal supports it,
" " but does not automatically use 256 colors by default.
-"set t_Co=256
+set t_Co=256
" "set t_Co=88
let g:CSApprox_attr_map = ( 'bold')
@@ -136,7 +136,7 @@ set smartcase
let delimitMate_expand_cr = 1
set background=dark
-color solarized
+color rdark
set nobackup
set nowritebackup
@@ -188,3 +188,6 @@ nnoremap <leader>gl :Shell git gl -18<cr>:wincmd \|<cr>
" while maintaining a sane text width.
nnoremap K h/[^ ]<cr>"zd$jyyP^v$h"zpJk:s/\v +$//<cr>:noh<cr>j^
" }}}}
+"
+" Auto save when we go elsewhere
+au FocusLost * :wa
View
@@ -22,8 +22,8 @@ function prompt_char {
# get the name of the branch we are on
function git_prompt_info() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
- #echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
- echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ #echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
}
# Checks if working tree is dirty
View
1 zshrc
@@ -18,3 +18,4 @@ compinit
export EDITOR=vim
+[[ -s "/Users/majd/.rvm/scripts/rvm" ]] && source "/Users/majd/.rvm/scripts/rvm"

0 comments on commit 447442b

Please sign in to comment.