Use better defaults for fzf

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Better defaults for `fzf`.
+
 ### Fixed
 
 - PowerShell: use global scope for aliases.

Cargo.toml

@@ -21,7 +21,7 @@ anyhow = "1.0.32"
 askama = { version = "0.10.3", default-features = false }
 bincode = "1.3.1"
 clap = "=3.0.0-beta.5"
-dirs-next = "2.0.0"
+dirs = "4.0.0"
 dunce = "1.0.1"
 glob = "0.3.0"
 ordered-float = "2.0.0"

src/config.rs

@@ -3,7 +3,7 @@ use std::ffi::OsString;
 use std::path::PathBuf;
 
 use anyhow::{bail, Context, Result};
-use dirs_next as dirs;
+use dirs;
 use glob::Pattern;
 
 use crate::db::Rank;

src/fzf.rs

@@ -19,6 +19,19 @@ impl Fzf {
         command.arg("-n2..").stdin(Stdio::piped()).stdout(Stdio::piped());
         if let Some(fzf_opts) = config::fzf_opts() {
             command.env("FZF_DEFAULT_OPTS", fzf_opts);
+        } else {
+            command.args(&[
+                "--bind=ctrl-z:ignore",
+                "--exit-0",
+                "--height=35%",
+                "--inline-info",
+                "--no-sort",
+                "--reverse",
+                "--select-1",
+            ]);
+            if cfg!(unix) {
+                command.arg("--preview=ls -p {2}");
+            }
         }
 
         let child = match command.spawn() {

src/shell.rs

@@ -1,14 +1,5 @@
 use crate::app::InitHook;
 
-const FZF_COMPLETE_OPTS: &str = "\
-    --bind=ctrl-z:ignore \
-    --exit-0 \
-    --height=35% \
-    --inline-info \
-    --no-sort \
-    --reverse \
-    --select-1";
-
 #[derive(Debug, Eq, PartialEq)]
 pub struct Opts<'a> {
     pub cmd: Option<&'a str>,

templates/bash.txt

@@ -127,10 +127,8 @@ if [[ :"${SHELLOPTS}": =~ :(vi|emacs): && ${TERM} != 'dumb' ]]; then
         # If there is a space after the last word, use interactive selection.
         elif [[ -z ${COMP_WORDS[-1]} ]]; then
             \local result
-            result="$(
-                _ZO_FZF_OPTS='{{ crate::shell::FZF_COMPLETE_OPTS }}' \
-                    \builtin command zoxide query -i -- "${COMP_WORDS[@]:1}"
-            )" && COMPREPLY=("${__zoxide_z_prefix}${result}")
+            result="$(\builtin command zoxide query -i -- "${COMP_WORDS[@]:1}")" \
+                && COMPREPLY=("${__zoxide_z_prefix}${result}")
             \builtin printf '\e[5n'
         fi
     }

templates/fish.txt

@@ -83,7 +83,7 @@ function __zoxide_z_complete
     else
         # Otherwise, use interactive selection.
         set -l query $tokens[2..-1]
-        set -l result (_ZO_FZF_OPTS='{{ crate::shell::FZF_COMPLETE_OPTS }}' zoxide query -i -- $query)
+        set -l result (zoxide query -i -- $query)
         and commandline -p "$tokens[1] "(string escape $result)
         commandline -f repaint
     end