Skip to content

Commit

Permalink
Remove redundant reattach-to-user-namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
pgilad committed Dec 1, 2019
1 parent 6b7a7fc commit 417a3d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion hammerspoon/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function mountApp(appName)
end

hs.hotkey.bind(hyper, 'c', mountApp("Google Chrome"))
hs.hotkey.bind(hyper, 'i', mountApp("iTerm"))
-- hs.hotkey.bind(hyper, 'i', mountApp("iTerm"))
hs.hotkey.bind(hyper, 'j', mountApp("IntelliJ IDEA"))
hs.hotkey.bind(hyper, 's', mountApp("Slack"))
hs.hotkey.bind(hyper, 't', mountApp("Alacritty"))
Expand Down
7 changes: 2 additions & 5 deletions tmux/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
set-option -g repeat-time 1000
set-option -g default-shell $SHELL

# Patch for OS X pbpaste and pbcopy under tmux.
set-option -g default-command "reattach-to-user-namespace -l $SHELL"

# Default termtype. If the rcfile sets $TERM, that overrides this value.
set-option -g default-terminal screen-256color
set-option -g terminal-overrides xterm:color=256
Expand Down Expand Up @@ -113,7 +110,7 @@ bind v split-window -h
# vi mode begin selection
bind-key -T copy-mode-vi v send-keys -X begin-selection
# copy selection to osx clipboard
bind-key -T copy-mode-vi v send-keys -X copy-pipe "reattach-to-user-namespace pbcopy"
bind-key -T copy-mode-vi v send-keys -X copy-pipe "pbcopy"
# copy till end of line to tmux clipboard
bind-key -T copy-mode-vi v send-keys -X copy-end-of-line

Expand All @@ -128,7 +125,7 @@ unbind ^L
bind ^L refresh-client

unbind-key -T copy-mode-vi Space ; bind-key -T copy-mode-vi v send-keys -X begin-selection
unbind-key -T copy-mode-vi Enter ; bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
unbind-key -T copy-mode-vi Enter ; bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "pbcopy"
unbind-key -T copy-mode-vi C-v ; bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
unbind-key -T copy-mode-vi [ ; bind-key -T copy-mode-vi [ send-keys -X begin-selection
unbind-key -T copy-mode-vi ] ; bind-key -T copy-mode-vi ] send-keys -X copy-selection

0 comments on commit 417a3d8

Please sign in to comment.