Permalink
Browse files

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

  • Loading branch information...
2 parents 08f9440 + 7582e43 commit ed4fddc0b139977360876143228af4a2f0405fb0 @vladimiroff committed Jun 11, 2012
Showing with 26 additions and 7 deletions.
  1. +0 −3 bash/aliases
  2. +7 −0 bash/config
  3. +19 −4 tmux.conf
View
@@ -1,8 +1,5 @@
#!/bin/bash
-# I don't always run tmux
-# But when I do, I want it in 256 colors and with UTF-8 support
-[ -n "$TMUX" ] && export TERM=screen-256color
alias tmux='tmux -u -2'
alias t='tmux'
View
@@ -1,5 +1,12 @@
#!/bin/bash
+if [[ -n "$TMUX" ]]; then
+ export TERM=screen-256color
+else
+ tmux new-session -s "main_`date +%s`"
+fi
+
+
# sudo bash-comletion
complete -cf please
View
@@ -12,6 +12,11 @@ set -g pane-border-bg black
set -g pane-active-border-fg black
set -g pane-active-border-bg cyan
+setw -g mode-mouse on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
+set -g mouse-select-window on
+
set-window-option -g window-status-current-bg red
set-window-option -g mode-keys vi
set-window-option -g utf8 on
@@ -35,9 +40,19 @@ bind -r J resize-pane -D 5
bind -r K resize-pane -U 5
bind -r L resize-pane -R 5
-setw -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-resize-pane on
-set -g mouse-select-window on
+bind -r C-h select-window -t :-
+bind -r C-l select-window -t :+
+unbind p
+bind p paste-buffer
+bind -t vi-copy 'v' begin-selection
+bind -t vi-copy 'y' copy-selection
+
+unbind Up
+unbind Down
+bind Up new-window -d -n maximized \; swap-pane -s maximized.1 \; select-window -t maximized
+bind Down last-window \; swap-pane -s maximized.1 \; kill-window -t maximized
+
+bind P pipe-pane -o "cat >> ~/#W.log" \; display "Toggle logging to ~/#W.log"
bind r source-file ~/.tmux.conf \; display "Configuration Reloaded!"
+

0 comments on commit ed4fddc

Please sign in to comment.