Permalink
Browse files

Merge branch 'master' of github.com:tylerball/dotfiles

  • Loading branch information...
2 parents fac4b9b + 361e5b6 commit 552fb480e942658e25cfe05def674a5ec854c019 Tyler Ball committed Jun 6, 2012
Showing with 15 additions and 32 deletions.
  1. +0 −27 _bin/stats.sh
  2. +1 −0 _gitignore
  3. +1 −1 _tmux.conf
  4. +10 −1 _vim/plugin/settings/plugins.vim
  5. +1 −1 _vim/plugin/settings/vundle.vim
  6. +2 −2 _zsh/zsh_paths
View
@@ -1,27 +0,0 @@
-#!/bin/bash
-NUM_LINES=10
-
- if [[ "$(uname)" = "Darwin" ]]; then
- TOP=`top -l 1 | head -n 4 | tail -n 1| awk '{printf "%3d%%\n", $3}'`
- W=`w | head -n1 | cut -d":" -f4`
- FREE=`vm_stat | grep free | awk '{ print $3 }' | sed 's/\\.//'`
- TOTAL=`vm_stat | grep " active" | awk '{ print $3 }' | sed 's/\\.//'`
- else
- TOP=`top | head -n 3 | tail -n 1| awk '{printf "%3d%%\n", $3}'`
- W=`w | head -n1 | cut -d":" -f5`
- fi
-
- CPU=${TOP%\%*}
- ACTIVE_LINES=$(($CPU/$NUM_LINES))
- LINES=""
- for (( i = 0; i < $NUM_LINES; i++ )); do
- if [[ $i < $ACTIVE_LINES ]]; then
- LINES="$LINES|"
- else
- LINES="$LINES "
- fi
- done
- #FREE_MEM=$(( $TOTAL-$FREE ))
- #USED_MEM=$(( $FREE_MEM/100 ))
- #TOTAL_MEM=$(( $TOTAL/100 ))
- echo "[${LINES}] ${TOP}"
View
@@ -4,3 +4,4 @@
settings_local.py
*.swp
*.un~
+*.ropeproject/
View
@@ -85,7 +85,7 @@ set -g status-left-length 32
set -g status-right-length 150
set -g status-interval 5
-set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour238,nobold]⮀#[fg=colour15,bg=colour238,bold] #(stats.sh) #[fg=colour238,bg=colour234,nobold]⮀'
+set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold]⮀'
set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(itunes-current-song)⮂#[fg=colour16,bg=colour254,bold] #h '
@@ -118,7 +118,7 @@ let g:pymode_run = 0
let g:pymode_lint = 0
let g:pymode_breakpoint = 0
let g:pymode_utils_whitespaces = 0
-let g:pymode_virtualenv = 0
+let g:pymode_virtualenv = 1
let g:pymode_folding = 0
let g:pymode_options_indent = 0
@@ -140,6 +140,8 @@ let g:pymode_rope_vim_completion = 1
let g:pymode_rope_guess_project = 1
let g:pymode_rope_goto_def_newwin = 0
+exe "inoremap <silent> <buffer> <M-space> <C-R>=RopeCodeAssistInsertMode()<CR>"
+
" threesome
let g:threesome_initial_mode = "grid"
@@ -154,3 +156,10 @@ let g:notes_title_sync = 'no'
" Clam
nnoremap ! :Clam<space>
vnoremap ! :ClamVisual<space>
+
+" Tabularize
+nnoremap <localleader>u :Tabularize /
+vnoremap <localleader>u :Tabularize /
+
+" Extradite
+nnoremap <localleader>e :Extradite!<cr>
@@ -19,7 +19,7 @@ Bundle 'garbas/vim-snipmate.git'
Bundle 'honza/snipmate-snippets.git'
Bundle 'ervandew/supertab'
Bundle 'kana/vim-smartinput.git'
-Bundle 'klen/python-mode.git'
+Bundle 'tylerball/python-mode.git'
" Undo/paste
Bundle 'sjl/gundo.vim.git'
View
@@ -29,9 +29,9 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH
[[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc
# Source virtualenvwrapper on pythonbrew
- if [ -f $PATH_PYTHONBREW_CURRENT/virtualenvwrapper.sh ]; then
+ if [ -f $PATH_PYTHONBREW_CURRENT/virtualenvwrapper_lazy.sh ]; then
export WORKON_HOME=$HOME/envs
- source $HOME/.virtualenvwrapper
+ source $PATH_PYTHONBREW_CURRENT/virtualenvwrapper_lazy.sh
fi
# Source virtualenvwrapper on Linux

0 comments on commit 552fb48

Please sign in to comment.