From 73528b3d622efba092bc7f4791fe5567f6158629 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@constantcontact.com>
Date: Fri, 10 Jan 2020 08:01:04 -0500
Subject: [PATCH] Buncha stuff

---
 bin/safe-reattach-to-user-namespace |  8 +++
 playbooks/roles/zsh/tasks/main.yml  |  5 ++
 tmux/tmux.conf                      |  5 +-
 zsh/funcs/skim.funcs                | 77 +++++++++++++++++++++++++++--
 zsh/zshrc                           |  2 +-
 5 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100755 bin/safe-reattach-to-user-namespace

diff --git a/bin/safe-reattach-to-user-namespace b/bin/safe-reattach-to-user-namespace
new file mode 100755
index 0000000..c4200fd
--- /dev/null
+++ b/bin/safe-reattach-to-user-namespace
@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+
+# If reattach-to-user-namespace is not available, just run the command.
+if [ -n "$(command -v reattach-to-user-namespace)" ]; then
+  reattach-to-user-namespace $@
+else
+  exec "$@"
+fi
diff --git a/playbooks/roles/zsh/tasks/main.yml b/playbooks/roles/zsh/tasks/main.yml
index ddb8cae..b668957 100644
--- a/playbooks/roles/zsh/tasks/main.yml
+++ b/playbooks/roles/zsh/tasks/main.yml
@@ -42,3 +42,8 @@
     dest: ~/.zsh.d
     state: link
 
+- name: copy contents of bin
+  synchronize:
+    src: ~/.dotfiles/bin/
+    dest: ~/bin
+
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index fe7effb..95edb7a 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -68,7 +68,10 @@ bind Escape copy-mode
 unbind p
 bind p paste-buffer
 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"
+
+# Mac OS X fix for pbcopy, pbpaste, and launchctl
+# set-option -g default-command "safe-reattach-to-user-namespace -l $SHELL"
+bind -Tcopy-mode-vi 'y' send -X copy-pipe-and-cancel "safe-reattach-to-user-namespace pbcopy"
 
 # split-windows
 bind | split-window -h -c "#{pane_current_path}"
diff --git a/zsh/funcs/skim.funcs b/zsh/funcs/skim.funcs
index 2e1061c..baf3549 100644
--- a/zsh/funcs/skim.funcs
+++ b/zsh/funcs/skim.funcs
@@ -1,10 +1,77 @@
-# This entire thing almost entirely, shamelessly stolen from fzf/shell/key-bindings.zsh, replacing fzf with skim
-export SKIM_DEFAULT_COMMAND="rg --files"
+# export SKIM_DEFAULT_COMMAND="rg --files"
+# Key bindings
+# ------------
+# copied and modified from https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh
+#
+if [[ $- == *i* ]]; then
+
+# CTRL-T - Paste the selected file path(s) into the command line
+__fsel() {
+  local cmd="${SKIM_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail 2> /dev/null
+  eval "$cmd" | SKIM_DEFAULT_OPTIONS="--height ${SKIM_TMUX_HEIGHT:-40%} --reverse $SKIM_DEFAULT_OPTIONS $SKIM_CTRL_T_OPTS" $(__skimcmd) -m "$@" | while read item; do
+    echo -n "${(q)item} "
+  done
+  local ret=$?
+  echo
+  return $ret
+}
+
+__skim_use_tmux__() {
+  [ -n "$TMUX_PANE" ] && [ "${SKIM_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ]
+}
+
+__skimcmd() {
+  __skim_use_tmux__ &&
+    echo "sk-tmux -d${SKIM_TMUX_HEIGHT:-40%}" || echo "sk"
+}
+
+skim-file-widget() {
+  LBUFFER="${LBUFFER}$(__fsel)"
+  local ret=$?
+  zle reset-prompt
+  return $ret
+}
+zle     -N   skim-file-widget
+bindkey '^P' skim-file-widget
+
+# Ensure precmds are run after cd
+skim-redraw-prompt() {
+  local precmd
+  for precmd in $precmd_functions; do
+    $precmd
+  done
+  zle reset-prompt
+}
+zle -N skim-redraw-prompt
+
+# ALT-C - cd into the selected directory
+skim-cd-widget() {
+  local cmd="${SKIM_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail 2> /dev/null
+  local dir="$(eval "$cmd" | SKIM_DEFAULT_OPTIONS="--height ${SKIM_TMUX_HEIGHT:-40%} --reverse $SKIM_DEFAULT_OPTIONS $SKIM_ALT_C_OPTS" $(__skimcmd) -m)"
+  if [[ -z "$dir" ]]; then
+    zle redisplay
+    return 0
+  fi
+  cd "$dir"
+  local ret=$?
+  zle skim-redraw-prompt
+  return $ret
+}
+zle     -N    skim-cd-widget
+bindkey '\ec' skim-cd-widget
+
+# CTRL-R - Paste the selected command from history into the command line
 skim-history-widget() {
   local selected num
-  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null
+  setopt localoptions noglobsubst noposixbuiltins pipefail 2> /dev/null
   selected=( $(fc -rl 1 |
-      SKIM_DEFAULT_OPTS="--height ${SKIM_TMUX_HEIGHT:-40%} $SKIM_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $SKIM_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" sk-tmux -d${SKIM_TMUX_HEIGHT} ))
+    SKIM_DEFAULT_OPTIONS="--height ${SKIM_TMUX_HEIGHT:-40%} $SKIM_DEFAULT_OPTIONS -n2..,.. --tiebreak=index $SKIM_CTRL_R_OPTS --query=${(qqq)LBUFFER} -m" $(__skimcmd)) )
   local ret=$?
   if [ -n "$selected" ]; then
     num=$selected[1]
@@ -17,3 +84,5 @@ skim-history-widget() {
 }
 zle     -N   skim-history-widget
 bindkey '^R' skim-history-widget
+
+fi
diff --git a/zsh/zshrc b/zsh/zshrc
index 68c799c..c55a316 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -23,7 +23,6 @@ zle -N down-line-or-beginning-search
 
 [[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
 [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
-bindkey "^R" __history_search
 
 autoload -Uz compinit promptinit
 promptinit
@@ -83,6 +82,7 @@ function nv() {
 export PATH="$PATH:$HOME/.anyenv/bin"
 eval "$(anyenv init -)"
 export PATH="$(yarn global bin):$PATH"
+# export SKIM_TMUX=1
 
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
 export SDKMAN_DIR="$HOME/.sdkman"