Huge tmux-fzf simplification with files quoting

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9f6f8349156e3de96b7539f9ee5688c4422e3674..b0c5e6a3c39af07fcc79d5a69a127cc33739248c 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -41,7 +41,7 @@ bindkey "^[[A" history-beginning-search-backward-end
 bindkey "^[[B" history-beginning-search-forward-end
 
 beginning-history-incremental-pattern-search-backward() {
 bindkey "^[[B" history-beginning-search-forward-end
 
 beginning-history-incremental-pattern-search-backward() {

-    zle history-incremental-pattern-search-backward $(echo $BUFFER | sed "s/ /*/g")
+    zle history-incremental-pattern-search-backward ${BUFFER:gs/ /*/}

 }
 zle -N beginning-history-incremental-pattern-search-backward
 bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward
 }
 zle -N beginning-history-incremental-pattern-search-backward
 bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward


@@ -51,14 +51,14 @@ bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 
 # Prompt {{{
 function zle-line-init zle-keymap-select {
 
 # Prompt {{{
 function zle-line-init zle-keymap-select {

-    mode_vi="${${KEYMAP/vicmd/+}/(main|viins)/-}"
-    [ $timer ] && timer_show=$(( $SECONDS - $timer ))
+    mode_vi=${${KEYMAP/vicmd/+}/(main|viins)/-}
+    [[ $timer ]] && timer_show=$(( $SECONDS - $timer ))

     prompt="%2~|"
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
     prompt+="%B%F{magenta}%#%f%b "
     prompt="%2~|"
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
     prompt+="%B%F{magenta}%#%f%b "

-    PS1="$prompt"
+    PS1=$prompt

     zle reset-prompt
 }
 zle -N zle-line-init
     zle reset-prompt
 }
 zle -N zle-line-init


@@ -92,7 +92,7 @@ f() {
 }
 
 ssht() {
 }
 
 ssht() {

-    ssh -C -t "$1" tmux attach -t0
+    ssh -C -t $1 tmux attach -t0

 }
 alias sshnm="ssh -S none"
 # }}}
 }
 alias sshnm="ssh -S none"
 # }}}


@@ -174,11 +174,11 @@ bindkey -s "\eOP" " inc\n" # F1
 zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
 _mycomp () {
 zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
 _mycomp () {

-    [ "$words[1]" != "man" ] || { _man && return 0 }
-    [ $CURRENT -eq 1 ] && _command_names ||  _files && return 0
+    [[ ${words[1]} != man ]] || { _man && return 0 }
+    [[ $CURRENT -eq 1 ]] && _command_names ||  _files && return 0

     # MAGIC_EQUAL_SUBST {{{
     # MAGIC_EQUAL_SUBST {{{

-    [[ "$PREFIX" = *\=* ]] || return 1
-    compstate[parameter]="${PREFIX%%\=*}"
+    [[ $PREFIX = *\=* ]] || return 1
+    compstate[parameter]=${PREFIX%%\=*}

     compset -P 1 "*="
     _value
     # }}}
     compset -P 1 "*="
     _value
     # }}}


@@ -211,36 +211,10 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # }}}
 
 # fzf {{{
 # }}}
 
 # fzf {{{

-alias -g PE="| pe"
-
-export FZF_DEFAULT_OPTS="--color=16 --info=inline --preview='less -N -S {}'"
-
-_fzf_find() {
-    find . \( -path "*/\.git" -o -fstype devfs -o -fstype procfs \) -prune \
-        -o -type d -print $@ 2>/dev/null | cut -b3-
-}
-
-export FZF_CTRL_T_COMMAND="_fzf_find -o -type f -print -o -type l -print"
-export FZF_ALT_C_COMMAND=_fzf_find
-
-_fzf_git_status() {
-    local item
-    git status --short | fzf -m --preview="" | while read item ; do
-        item=`echo $item | cut -w -f2-`
-        echo -n "$item "
-    done
-    local ret=$?
-    print
-    return $ret
-}
-fzf-git-status-widget() {
-  LBUFFER="${LBUFFER}$(_fzf_git_status)"
-  local ret=$?
-  zle reset-prompt
-  return $ret
+export FZF_DEFAULT_OPTS="--color=16 --info=inline"
+cf() {
+    local dir=$(find ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
+        fzf --height 40% --reverse --preview="tree -CN {}")
+    [[ -z $dir ]] || cd $dir

 }
 }

-zle -N fzf-git-status-widget
-bindkey "^Y" fzf-git-status-widget
-
-. ~/work/fzf/shell/key-bindings.zsh

 # }}}
 # }}}