1 files changed, 5 insertions, 16 deletions
diff --git a/configs/shared/tmux/.tmux.conf b/configs/shared/tmux/.tmux.conf
index f2eff9bc7cf4..9c2124885c02 100644
--- a/configs/shared/tmux/.tmux.conf
+++ b/configs/shared/tmux/.tmux.conf
@@ -18,7 +18,6 @@ set -g @copycat_next 'p'
 set -g @copycat_prev 'n'
 set -g @plugin 'arcticicestudio/nord-tmux'
 
-# set -g @plugin 'tmux-plugins/tmux-yank'
 
 ################################################################################
 # Context Helpers
@@ -39,8 +38,8 @@ is_vim_or_emacs="ps -o state= -o comm= -t '#{pane_tty}' \
 
 # change tmux leader
 unbind C-b
-set -g prefix C-q
-bind C-q send-prefix
+set -g prefix C-y
+bind C-y send-prefix
 
 
 ################################################################################
@@ -48,17 +47,14 @@ bind C-q send-prefix
 ################################################################################
 
 # COLORS!
-set -g default-terminal "screen-256color"
-set-option -sa terminal-overrides ",xterm*:Tc"
+set -g default-terminal "tmux"
+set-option -sa terminal-overrides ",*256col*:Tc"
 
 
 ################################################################################
 # Copy Paste
 ################################################################################
 
-# Copy-paste integration
-set-option -g default-command "reattach-to-user-namespace -l zsh"
-
 # copy text like it's Vim
 bind -n Escape if-shell "${is_vim_or_emacs}" "send-keys Escape" copy-mode
 
@@ -67,17 +63,10 @@ setw -g mode-keys vi
 
 # Setup 'v' to begin selection as in Vim
 bind -Tcopy-mode-vi v send -X begin-selection
-bind -Tcopy-mode-vi y send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
+bind -Tcopy-mode-vi y send -X copy-pipe-and-cancel "xclip -selection clipboard -i"
 bind -Tcopy-mode-vi Escape send -X cancel
 bind -Tcopy-mode-vi V send -X rectangle-toggle
 
-# Update default binding of `Enter` to also use copy-pipe
-unbind -Tcopy-mode Enter
-bind -Tcopy-mode Enter send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
-
-# Bind ']' to use pbpaste
-bind ] run "reattach-to-user-namespace pbpaste | tmux load-buffer - && tmux paste-buffer"
-
 
 ################################################################################
 # Windows