Updatine tmux settings

1 files changed, 22 insertions, 27 deletions

diff --git a/stow/tmux/.tmux.conf b/stow/tmux/.tmux.conf
index 20f4c6e..ac6ca54 100644
--- a/stow/tmux/.tmux.conf
+++ b/stow/tmux/.tmux.conf
@@ -13,40 +13,38 @@ bind C-h select-pane -L
 bind C-j select-pane -D
 bind C-k select-pane -U
 bind C-l select-pane -R
-# Kill without prompting
-bind x kill-pane
-bind & kill-window
 # Easy resizing of the pane
-bind C-u resize-pane -D 3
-bind C-i resize-pane -U 3
-bind C-y resize-pane -L 3
-bind C-o resize-pane -R 3
-bind J run-shell "bash $HOME/.tmux/scripts/rolodex.sh next"
-bind K run-shell "bash $HOME/.tmux/scripts/rolodex.sh prev"
+bind H resize-pane -L 3
+bind J resize-pane -D 3
+bind K resize-pane -U 3
+bind L resize-pane -R 3
+# Rollodex commands
+bind n run-shell "bash $HOME/.tmux/scripts/rolodex.sh next"
+bind p run-shell "bash $HOME/.tmux/scripts/rolodex.sh prev"
 # Bind the last window/pane command
-bind C-b last-window
-bind C-g last-pane
-# Bind the last session command
-bind C-f switch-client -l
+bind C-b last-pane
+bind C-l last-window
 # Faster window switching
 bind C-n next-window
 bind C-p previous-window
-# Synchronize mode, how the fuck did I not know about this
+# Synchronize mode
 bind a set-window-option synchronize-panes
 # Remap zoom, sleeping tmux way too much
 bind C-v resize-pane -Z
-# Swapping panes shorcut
-bind C-e command-prompt -p destination 'swap-pane -s 1.2 -t 2.%1'
-# I constantly mix up copy/paste. Very annoying with scripts
+# I constantly mix up copy/paste. Very annoying/dangerous if cliboard has commands in it
 unbind [
-bind C-c copy-mode
+bind C-g copy-mode
+# Setup 'v' to begin selection as in Vim
+bind -Tcopy-mode-vi v send -X begin-selection
+# Tmux copy commands
+bind -Tcopy-mode-vi y send -X copy-pipe-and-cancel "tmux save-buffer - | xp"
+unbind -T copy-mode-vi Enter
+bind -Tcopy-mode-vi Enter send -X copy-pipe "tmux save-buffer - | xp"
 
 #####################################
 # Settings
 #####################################
 
-# Setup 'v' to begin selection as in Vim
-bind -Tcopy-mode-vi v send -X begin-selection
 # Help with the color problems
 set -g default-terminal "screen-256color"
 # Mouse Scrolling
@@ -57,13 +55,13 @@ setw -g mode-keys vi
 set-option -g display-panes-time 4000
 # Make the escape faster, faster command sequences
 set -s escape-time 0
-# Deal with screens having different
+# Deal with screens having different sizes
 set-window-option -g aggressive-resize
 # Use base 1 numbering, 0 base is a big stretch
 set -g base-index 1
 setw -g pane-base-index 1
 # Increase the history
-set -g history-limit 20000
+set -g history-limit 50000
 
 #####################################
 # Colors
@@ -75,7 +73,7 @@ set-option -g status-fg colour223 #yellow
 # pane border
 set-option -g pane-border-fg colour236 #base02
 set-option -g pane-active-border-fg colour239 #base01
-## message text
+# message text
 set-option -g message-bg default #base02
 set-option -g message-fg colour196 #orange
 set-option -g status on
@@ -86,13 +84,10 @@ set-option -g status-right-length 80
 set-option -g status-left "#(~/.tmux/scripts/powerline.sh left)"
 set-option -g status-right "#(~/.tmux/scripts/powerline.sh right)"
 
-# Load/Ignore Mac specific options
-run-shell "bash ~/.tmux/scripts/check_os.sh"
-
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'thornycrackers/tmux-sessionist'
 set -g @plugin 'thornycrackers/tmux-drawer'
+set -g @plugin 'thornycrackers/tmux-sessionist'
 set -g @plugin 'thornycrackers/tmux-open'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)