Permalink
Browse files

Merge branch 'master' into major

  • Loading branch information...
2 parents d629d2b + 71b183a commit 8acf817575a8088c65f508e98da21d4b2734de18 @MichaelXavier committed Mar 29, 2012
Showing with 12 additions and 0 deletions.
  1. +8 −0 .tmux.conf
  2. +4 −0 .zshrc
View
@@ -160,3 +160,11 @@ setw -g monitor-activity on
# on is a bit annoying
set -g visual-activity off
+
+# copy/paste
+#unbind p
+#bind p paste-buffer
+bind -t vi-copy 'v' begin-selection
+bind -t vi-copy 'y' copy-selection
+bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
+bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
View
4 .zshrc
@@ -86,4 +86,8 @@ unsetopt correct_all
##### RVM #####
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+##### Tmuxinator #####
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+

0 comments on commit 8acf817

Please sign in to comment.