From 2fdcb6f68081e73363f9eb06dcbabd4705086488 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sat, 3 Apr 2021 21:28:33 +0300 Subject: [PATCH] exa: add --sort=type --- home/.bashrc-bloated | 2 +- home/.config/fish/conf.d/env.fish | 2 +- home/.config/nnn/plugins/fzcd | 2 +- home/.config/vifm/scripts/preview_vifm | 2 +- home/.config/vifm/vifmrc | 2 +- home/.config/zsh/.zshenv | 2 +- home/.config/zsh/plugins.zsh | 2 +- home/.local/bin/garbage/preview | 2 +- home/.local/bin/scope.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated index b7fd0a4..204504b 100644 --- a/home/.bashrc-bloated +++ b/home/.bashrc-bloated @@ -60,7 +60,7 @@ export FZF_DEFAULT_OPTS="--multi --layout=reverse --inline-info export FZF_DEFAULT_COMMAND="fd --type f --follow --hidden --exclude .git" export FZF_CTRL_T_OPTS="--no-height --preview-window 'left:60%' --preview '$HOME/.local/bin/garbage/preview {} 2>/dev/null'" export FZF_CTRL_T_COMMAND="fd --follow --hidden --exclude .git" -export FZF_ALT_C_OPTS="--preview 'exa -1a --color always --icons {} 2>/dev/null'" +export FZF_ALT_C_OPTS="--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'" export FZF_ALT_C_COMMAND="fd --type d --follow --hidden --exclude .git" export FZF_TMUX=1 # ibus diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish index 0baab83..f3e16a1 100644 --- a/home/.config/fish/conf.d/env.fish +++ b/home/.config/fish/conf.d/env.fish @@ -66,7 +66,7 @@ set -gx FZF_DEFAULT_OPTS "--multi --layout=reverse --inline-info set -gx FZF_DEFAULT_COMMAND "fd --type f --follow --hidden --exclude .git" set -gx FZF_CTRL_T_OPTS "--no-height --preview-window 'left:60%' --preview '$HOME/.local/bin/garbage/preview {} 2>/dev/null'" set -gx FZF_CTRL_T_COMMAND "fd . \$dir --follow --hidden --exclude .git" -set -gx FZF_ALT_C_OPTS "--preview 'exa -1a --color always --icons {} 2>/dev/null'" +set -gx FZF_ALT_C_OPTS "--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'" set -gx FZF_ALT_C_COMMAND "fd --type d --follow --hidden --exclude .git" set -gx FZF_TMUX 1 # ibus diff --git a/home/.config/nnn/plugins/fzcd b/home/.config/nnn/plugins/fzcd index 92cc571..b29229c 100755 --- a/home/.config/nnn/plugins/fzcd +++ b/home/.config/nnn/plugins/fzcd @@ -8,7 +8,7 @@ . "$(dirname "$0")"/.nnn-plugin-helper if [ "$(cmd_exists fzf)" -eq "0" ]; then - sel=$(fd --type d --follow --hidden --exclude .git | fzf --preview 'exa -1a --color always --icons {} 2>/dev/null') + sel=$(fd --type d --follow --hidden --exclude .git | fzf --preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null') else exit 1 fi diff --git a/home/.config/vifm/scripts/preview_vifm b/home/.config/vifm/scripts/preview_vifm index 0fec6da..9df46ed 100755 --- a/home/.config/vifm/scripts/preview_vifm +++ b/home/.config/vifm/scripts/preview_vifm @@ -35,7 +35,7 @@ case "$1" in echo "" else echo "\0" - exa -1a --color always --icons "$1" + exa -1a --sort=type --color always --icons "$1" fi ;; application/zip | application/x-tar | application/x-rar | application/x-7z-compressed | application/x-xz | application/x-bzip2 | application/x-gzip) atool -l -q "$1" | tail -n +3 | awk -F' ' '{print $NF}' ;; diff --git a/home/.config/vifm/vifmrc b/home/.config/vifm/vifmrc index 1f4e8ee..09d32c4 100644 --- a/home/.config/vifm/vifmrc +++ b/home/.config/vifm/vifmrc @@ -151,7 +151,7 @@ command! fzf : let $FZF_RES = term('fzf --preview-window left --preview "$HOME/. \| endif " fzf dir -command! fzd : let $FZF_RES = term('fd --type d --follow --hidden --exclude .git | fzf --preview "exa -1a --color always --icons {} 2>/dev/null" 2> /dev/tty') +command! fzd : let $FZF_RES = term('fd --type d --follow --hidden --exclude .git | fzf --preview "exa -1a --sort=type --color always --icons {} 2>/dev/null" 2> /dev/tty') \| if $FZF_RES != '' \| cd $FZF_RES \| endif diff --git a/home/.config/zsh/.zshenv b/home/.config/zsh/.zshenv index 67aee61..ca58a17 100644 --- a/home/.config/zsh/.zshenv +++ b/home/.config/zsh/.zshenv @@ -56,7 +56,7 @@ export FZF_DEFAULT_OPTS="--multi --layout=reverse --inline-info export FZF_DEFAULT_COMMAND="fd --type f --follow --hidden --exclude .git" export FZF_CTRL_T_OPTS="--no-height --preview-window 'left:60%' --preview '$HOME/.local/bin/garbage/preview {} 2>/dev/null'" export FZF_CTRL_T_COMMAND="fd --follow --hidden --exclude .git" -export FZF_ALT_C_OPTS="--preview 'exa -1a --color always --icons {} 2>/dev/null'" +export FZF_ALT_C_OPTS="--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'" export FZF_ALT_C_COMMAND="fd --type d --follow --hidden --exclude .git" export FZF_TMUX=1 # ibus diff --git a/home/.config/zsh/plugins.zsh b/home/.config/zsh/plugins.zsh index 2a2fa4f..4ad2059 100644 --- a/home/.config/zsh/plugins.zsh +++ b/home/.config/zsh/plugins.zsh @@ -34,7 +34,7 @@ zstyle ':fzf-tab:complete:_zlua:*' query-string input zstyle ':fzf-tab:complete:kill:argument-rest' fzf-preview 'ps --pid=$word -o cmd --no-headers -w -w' zstyle ':fzf-tab:complete:kill:argument-rest' fzf-flags '--preview-window=down:3:wrap' zstyle ':fzf-tab:complete:kill:*' popup-pad 0 3 -zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1 --color=always $realpath' +zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1a --sort=type --color=always --icons $realpath' zstyle ':fzf-tab:complete:cd:*' popup-pad 30 0 zstyle ":completion:*:git-checkout:*" sort false # zstyle ":fzf-tab:*" fzf-flags '--color=bg+:23' diff --git a/home/.local/bin/garbage/preview b/home/.local/bin/garbage/preview index 0d05eb8..e7ab6f7 100755 --- a/home/.local/bin/garbage/preview +++ b/home/.local/bin/garbage/preview @@ -74,7 +74,7 @@ case "$1" in mimetype=$(file --dereference --brief --mime-type -- "$1") case "$mimetype" in inode/directory) - exa -1a --color always --icons "$1" ;; + exa -1a --sort=type --color always --icons "$1" ;; application/zip|application/x-tar|application/x-gzip) atool -l -q "$1" | tail -n +3 | awk -F' ' '{print $NF}' ;; image/vnd.djvu) diff --git a/home/.local/bin/scope.sh b/home/.local/bin/scope.sh index e985e49..8cec52c 100755 --- a/home/.local/bin/scope.sh +++ b/home/.local/bin/scope.sh @@ -29,7 +29,7 @@ case "$1" in mimetype=$(file --dereference --brief --mime-type -- "$1") case "$mimetype" in inode/directory) - exa -1a --color always --icons "$1" ;; + exa -1a --sort=type --color always --icons "$1" ;; application/zip|application/x-tar|application/x-gzip) atool -l -q "$1" | tail -n +3 | awk -F' ' '{print $NF}' ;; image/vnd.djvu)