Permalink
Browse files

update plugins and colors

  • Loading branch information...
1 parent 836aa2c commit 449f28ff25d34224a85fd097d0a1c0f07b8b6651 @dqminh committed May 13, 2012
Showing with 31 additions and 19 deletions.
  1. +12 −9 tmux.conf
  2. +13 −9 vim/keymaps.vim
  3. +3 −0 vim/plugins.vim
  4. +2 −1 vimrc
  5. +1 −0 zshrc
View
@@ -4,6 +4,15 @@ unbind l
set -g prefix C-a
bind-key C-a last-window
+# acts like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
# number windows from 1
set -g base-index 1
@@ -22,11 +31,11 @@ set -g visual-activity on
# set correct term
set -g default-terminal screen-256color
+# enable mouse-mode for scrolling and selecting text
+setw -g mode-mouse on
+
# set status pane
set -g status-fg white
-set -g status-left ‘#[fg=green]#H’
-set -g status-left '#[fg=red]#H#[fg=green]:#[fg=white]#S #[fg=green]][#[default]'']'
-set -g status-right ''
# default window title colors
setw -g window-status-bg black
@@ -47,12 +56,6 @@ bind Left resize-pane -L 20
bind Down resize-pane -D 20
bind Right resize-pane -R 20
-# VI for switching between
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
# split windows
unbind % # Remove default binding since we’re replacing
bind | split-window -h
View
@@ -46,15 +46,12 @@ inoremap <silent> <F3> <ESC>:YRShow<cr>
" NERDTree
nnoremap <silent><F1> :NERDTreeToggle<CR>
-" CtrlP
-map <leader>t :CtrlP<CR>
-
" CTags
map <Leader>rt :!ctags --extra=+f -R *<CR><CR>
map <C-\> :tnext<CR>
" Ack
-map <leader>f :Ack<space>
+map <leader>a :Ack<space>
" NERDCommenter
map <leader>/ <plug>NERDCommenterToggle<CR>
@@ -71,13 +68,20 @@ if exists(":Tabularize")
noremap :T :Tabularize /}}
endif
-" Unimpaired configuration
" Bubble single lines
-nmap <C-1> [e
-nmap <C-2> ]e
+"nmap <C-S-q> [e
+"nmap <C-S-w> ]e
" Bubble multiple lines
-vmap <C-1> [egv
-vmap <C-2> ]egv
+"vmap <C-S-q> [egv
+"vmap <C-S-w> ]egv
" Insert hashrocket
imap <C-L> <Space>=><Space>
+
+" If in tmux, run test with style
+if exists('$TMUX')
+ autocmd FileType ruby map <buffer> <leader>r :RunRubyFocusedTest<CR>
+ autocmd FileType ruby map <buffer> <leader>R :RunAllRubyTests<CR>
+ autocmd FileType cucumber map <leader>r :RunFocusedCuke<CR>
+ autocmd FileType cucumber map <leader>R :RunAllCukes<CR>
+endif
View
@@ -17,6 +17,9 @@ Bundle 'tpope/vim-repeat'
Bundle 'tpope/vim-bundler'
Bundle 'tpope/vim-unimpaired'
Bundle 'tpope/vim-endwise'
+Bundle 'cloud8421/vimux-cucumber'
+Bundle 'benmills/vimux'
+Bundle 'pgr0ss/vimux-ruby-test'
" Filetypes
Bundle 'tpope/vim-markdown'
View
3 vimrc
@@ -57,6 +57,7 @@ if has("folding")
set foldmethod=syntax
set foldlevel=1
set foldnestmax=2
+ set foldlevelstart=20
set foldtext=strpart(getline(v:foldstart),0,50).'\ ...\ '.substitute(getline(v:foldend),'^[\ #]*','','g').'\ '
endif
@@ -119,7 +120,7 @@ let NERDTreeChDirMode = 2
" Theme
set background=dark
-colorscheme vividchalk
+colorscheme molokai
if filereadable(expand("~/.vim/filetypes.vim"))
source ~/.vim/filetypes.vim
View
1 zshrc
@@ -11,6 +11,7 @@ ZSH_THEME="steeef"
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
alias rake="noglob rake"
+alias vim="mvim -v"
# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"

0 comments on commit 449f28f

Please sign in to comment.