aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Hiar <codyfh@gmail.com>2017-06-10 20:03:11 -0600
committerCody Hiar <codyfh@gmail.com>2017-06-10 20:03:11 -0600
commit154a15d5c3afa693463587e8e5083297e40d89a6 (patch)
treef83cb74d7baf607dbea70a92ee8bfc7ac9fedf4e
parent12825d5147f5c0b1636dbda5ba34790d7c7bb236 (diff)
Fixing up a couple small misses
-rwxr-xr-xmac.tmux.config9
-rwxr-xr-xscripts/check_os.sh8
2 files changed, 3 insertions, 14 deletions
diff --git a/mac.tmux.config b/mac.tmux.config
deleted file mode 100755
index 110f8ff..0000000
--- a/mac.tmux.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim: syntax=conf
-
-# Setup 'v' to begin selection as in Vim
-bind -T copy-mode-vi y send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
-# Update default binding of `Enter` to also use copy-pipe
-unbind -T copy-mode-vi Enter
-bind-key -T copy-mode-vi Enter send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
-# Allow pbcopy inside of session
-set-option -g default-command "reattach-to-user-namespace -l zsh"
diff --git a/scripts/check_os.sh b/scripts/check_os.sh
index e4abf85..a538023 100755
--- a/scripts/check_os.sh
+++ b/scripts/check_os.sh
@@ -18,16 +18,14 @@ set -euo pipefail
# Main loop of program
main() {
if [ "$(uname)" == "Darwin" ]; then
- # Setup 'v' to begin selection as in Vim
bind -T copy-mode-vi y send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
- # Update default binding of `Enter` to also use copy-pipe
unbind -T copy-mode-vi Enter
bind-key -T copy-mode-vi Enter copy-pipe "reattach-to-user-namespace pbcopy"
- # Allow pbcopy inside of session
set-option -g default-command "reattach-to-user-namespace -l zsh"
elif [ "$(uname)" == "Linux" ]; then
- bind -Tcopy-mode-vi y send -X copy-pipe-and-cancel "tmux save-buffer - | xp"
- tmux source-file "$HOME/.tmux/linux.tmux.config"
+ bind -T copy-mode-vi y send -X copy-pipe-and-cancel "tmux save-buffer - | xp"
+ unbind -T copy-mode-vi Enter
+ bind-key -T copy-mode-vi Enter copy-pipe "tmux save-buffer - | xp"
fi
}
main