Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix copying from system clipboard for macosx sierra #47

Merged
merged 1 commit into from
May 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bin/dotfiles
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ CURRENT_SYMLINKS=(
"$HOME/.ideavimrc"
"$HOME/.muttrc"
"$HOME/.muttrc.local"
"$HOME/.tmux-linux"
"$HOME/.tmux-macosx"
"$HOME/.tmux-linux.conf"
"$HOME/.tmux-osx.conf"
"$HOME/.tmux.conf"
"$HOME/.tmux.conf.local"
"$HOME/.vim"
Expand Down Expand Up @@ -721,8 +721,8 @@ do_reconfigure() {
make_symlink ".gvimrc" "${PROJECT_SETTINGS_COMMON_DIR}/.gvimrc" "$HOME/.gvimrc"
make_symlink ".ideavimrc" "${PROJECT_SETTINGS_COMMON_DIR}/.ideavimrc" "$HOME/.ideavimrc"
make_symlink ".mutt" "${PROJECT_SETTINGS_COMMON_DIR}/.mutt" "$HOME/.mutt"
make_symlink ".tmux-macosx" "${PROJECT_SETTINGS_COMMON_DIR}/.tmux-macosx" "$HOME/.tmux-macosx"
make_symlink ".tmux-linux" "${PROJECT_SETTINGS_COMMON_DIR}/.tmux-linux" "$HOME/.tmux-linux"
make_symlink ".tmux-osx.conf" "${PROJECT_SETTINGS_COMMON_DIR}/.tmux-osx.conf" "$HOME/.tmux-osx.conf"
make_symlink ".tmux-linux.conf" "${PROJECT_SETTINGS_COMMON_DIR}/.tmux-linux.conf" "$HOME/.tmux-linux.conf"
make_symlink ".tmux.conf" "${PROJECT_SETTINGS_COMMON_DIR}/.tmux.conf" "$HOME/.tmux.conf"
make_symlink ".tmux.conf.local" "${PROJECT_SETTINGS_THEME_DIR}/.tmux.conf.local" "$HOME/.tmux.conf.local"
make_symlink ".vim" "${PROJECT_SETTINGS_COMMON_DIR}/.vim" "$HOME/.vim"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Use vim keybindings in copy mode
setw -g mode-keys vi

# Fix for macos sierra (http://stackoverflow.com/a/39741226/1977012)
set -g default-shell $SHELL
set -g default-command "reattach-to-user-namespace -l ${SHELL}"

# Setup 'v' to begin selection as in Vim
bind-key -t vi-copy v begin-selection
bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
Expand All @@ -9,4 +13,5 @@ bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
unbind -t vi-copy Enter
bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"

set-option -g default-command "reattach-to-user-namespace -l zsh"
# vim: set ft=tmux tw=0 nowrap:
2 changes: 1 addition & 1 deletion settings/common/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,6 @@ source-file ~/.tmux.conf.local
###########################################################
## Load specyfic settings based on OS
###########################################################
if-shell "uname | grep -q Darwin" "source-file $HOME/.tmux-macosx" "source-file $HOME/.tmux-linux"
if-shell "uname | grep -q Darwin" "source-file $HOME/.tmux-osx.conf" "source-file $HOME/.tmux-linux.conf"

# vim: set ft=tmux tw=0 nowrap:
2 changes: 2 additions & 0 deletions settings/common/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ zstyle ':completion:*:*' ignored-patterns '*ORIG_HEAD'

case $(uname -s) in
Darwin)
export PATH="/usr/local/sbin:$PATH"

# export mysql (and its sub-programs)
if [[ -d "/usr/local/mysql" && $PATH != *'mysql'* ]]; then
export PATH=$PATH:/usr/local/mysql/bin
Expand Down