diff options
Diffstat (limited to '.config')
| -rwxr-xr-x | .config/nnn/plugins/joe_fzfcd | 3 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 79 |
2 files changed, 46 insertions, 36 deletions
diff --git a/.config/nnn/plugins/joe_fzfcd b/.config/nnn/plugins/joe_fzfcd index 4c74f88..91accba 100755 --- a/.config/nnn/plugins/joe_fzfcd +++ b/.config/nnn/plugins/joe_fzfcd @@ -7,7 +7,8 @@ use Env qw(NNN_PIPE PWD); sub main { my $dir; - $dir = `fd -t d -L | fzf`; + $dir = `fd -t d -L | fzf --preview ' eza --color=always --icons -T -L1 {} | + head -n 200'`; chomp($dir); open(FH, '>>', $NNN_PIPE) or die $!; print FH '0c' . $PWD . '/' . $dir; diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 37acce6..3eda548 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -40,6 +40,35 @@ LESS_TERMCAP_se=$(printf '\e[0m'); export LESS_TERMCAP_se LESS_TERMCAP_us=$(printf '\e[0;4;35m'); export LESS_TERMCAP_us LESS_TERMCAP_ue=$(printf '\e[0m'); export LESS_TERMCAP_ue +_gen_fzf_default_opts() { +local color00='#1d2021' +local color01='#282828' +local color02='#504945' +local color03='#665c54' +local color04='#a89984' +local color05='#bdae93' +local color06='#ebdbb2' +local color07='#fbf1c7' +local color08='#cc241d' +local color09='#fe8019' +local color0A='#d79921' +local color0B='#98971a' +local color0C='#689d6a' +local color0D='#458588' +local color0E='#b16286' +local color0F='#d65d0e' + +export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\ +" --color=bg+:$color00,bg:$color00"\ +" --color=fg:$color05,fg+:$color06"\ +" --color=hl:$color08,hl+:$color08"\ +" --color=spinner:$color0D"\ +" --color=header:$color08,info:$color03,pointer:$color08"\ +" --color=marker:$color0C,prompt:$color0A" +} + +_gen_fzf_default_opts + autoload -U history-search-end zle -N history-beginning-search-backward-end history-search-end zle -N history-beginning-search-forward-end history-search-end @@ -79,6 +108,16 @@ eza_after_cd() { } add-zsh-hook chpwd eza_after_cd +_fzf_comprun() { + local command=$1 + shift + + case "$command" in + cd) fzf "$@" --preview 'tree -C {} | head -200' ;; + *) fzf "$@" ;; + esac +} + autoload -Uz url-quote-magic zle -N self-insert url-quote-magic autoload -Uz bracketed-paste-magic @@ -88,10 +127,10 @@ zle -N bracketed-paste bracketed-paste-magic [ -f "$ZDOTDIR"/plugins.zsh ] && source "$ZDOTDIR"/plugins.zsh [ -f "$XDG_PACKAGE_HOME"/fzf/shell/completion.zsh ] && source "$XDG_PACKAGE_HOME"/fzf/shell/completion.zsh [ -f "$XDG_PACKAGE_HOME"/fzf/shell/key-bindings.zsh ] && source "$XDG_PACKAGE_HOME"/fzf/shell/key-bindings.zsh -[ -f "$XDG_CONFIG_HOME"/lf/icons ] && { - LF_ICONS="$(tr '\n' ':' <"$XDG_CONFIG_HOME"/lf/icons)" \ - && export LF_ICONS -} +# [ -f "$XDG_CONFIG_HOME"/lf/icons ] && { +# LF_ICONS="$(tr '\n' ':' <"$XDG_CONFIG_HOME"/lf/icons)" \ +# && export LF_ICONS +# } globalias() { if [[ $LBUFFER =~ ^[a-z0-9]+$ ]]; then @@ -113,6 +152,7 @@ lfcd () { [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir" fi } + nnncd () { # Block nesting of nnn in subshells @@ -149,36 +189,5 @@ bindkey -v "^ " globalias bindkey -v " " magic-space bindkey -M isearch " " magic-space -_gen_fzf_default_opts() { - -local color00='#1d2021' -local color01='#282828' -local color02='#504945' -local color03='#665c54' -local color04='#a89984' -local color05='#bdae93' -local color06='#ebdbb2' -local color07='#fbf1c7' -local color08='#cc241d' -local color09='#fe8019' -local color0A='#d79921' -local color0B='#98971a' -local color0C='#689d6a' -local color0D='#458588' -local color0E='#b16286' -local color0F='#d65d0e' - -export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\ -" --color=bg+:$color00,bg:$color00"\ -" --color=fg:$color05,fg+:$color06"\ -" --color=hl:$color08,hl+:$color08"\ -" --color=spinner:$color0D"\ -" --color=header:$color08,info:$color03,pointer:$color08"\ -" --color=marker:$color0C,prompt:$color0A" - -} - -_gen_fzf_default_opts - PROMPT="%B%{$fg[$prompt_main]%}%m %{$fg[$prompt_alt]%}%c%{$fg[$prompt_main]%}%#%{$reset_color%} " RPROMPT="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" |