skim can be used instead of fzf

Author: AndydeCleyre

NEWS.rst

@@ -10,6 +10,7 @@ Changed
 
 - vpy and vpyshebang now resolve any symlinks in the script path
   before determining the projdir and venv path.
+- ``sk`` (skim) may now be used instead of ``fzf``
 
 0.3.8
 =====

doc/src/deps.md

@@ -1,6 +1,7 @@
 # Dependencies
 
-The primary requirements are Zsh, Python, and [`fzf`](https://github.com/junegunn/fzf),
+The primary requirements are Zsh, Python, and
+[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim),
 with optional additions for more colorful output, alternative json parsers, and faster performance.
 
 ## Suggested Dependencies by Platform
@@ -47,7 +48,7 @@ with optional additions for more colorful output, alternative json parsers, and
 
     - [Zsh](https://repology.org/project/zsh/versions)
     - [Python](https://repology.org/project/python/versions)
-    - [`fzf`](https://github.com/junegunn/fzf)
+    - [`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim)
 
 === "The optional ones"
 

doc/src/start.md

@@ -7,7 +7,7 @@
 ## Install locally
 
 Aside from Zsh and Python, the only dependency you're likely to *need* is
-[`fzf`](https://github.com/junegunn/fzf).
+[`fzf`](https://github.com/junegunn/fzf) *or* [`sk` (skim)](https://github.com/lotabout/skim).
 For more details and recommended package manager commands, see [Dependencies](deps.md).
 
 To install `zpy` itself, you only need to source the file `zpy.plugin.zsh`

zpy.plugin.zsh

@@ -271,12 +271,34 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4}
     REPLY="${ZPY_VENVS_HOME}/${REPLY}"
 }
 
+.zpy_fzf_cmd () {
+    emulate -L zsh
+    unset REPLY
+
+    local fzf_cmd=fzf
+    if (( $+commands[fzf] )) {
+        REPLY=fzf
+    } elif (( $+commands[sk] )) {
+        REPLY=sk
+    } else {
+        .zpy_log error \
+            'zpy selection operations require a filter tool' 'Any one of:' \
+            '- fzf' \
+            '- sk (skim)'
+        .zpy_log tip Suggestion "Install fzf with your distro's package manager."
+        return 1
+    }
+}
+
 .zpy_chooseproj () {  # [--multi]
     emulate -L zsh
     [[ $ZPY_VENVS_HOME ]] || return
 
     # TODO: should this absorb .zpy_pipzchoosepkg?
 
+    .zpy_fzf_cmd || return
+    local fzf_cmd=$REPLY
+
     local multi fzf_args=(--reverse -0 --preview='<{}/*.in')
     if [[ $1 == --multi ]] {
         unset reply
@@ -291,7 +313,7 @@ ZPY_PROCS=${${$(nproc 2>/dev/null):-$(sysctl -n hw.logicalcpu 2>/dev/null)}:-4}
     local projdirs=(${ZPY_VENVS_HOME}/*/project(@N-/:P))
     reply=(${(f)"$(
         print -rln -- $projdirs \
-        | fzf $fzf_args
+        | $fzf_cmd $fzf_args
     )"})
 
     [[ $reply ]] || return
@@ -1827,6 +1849,9 @@ jsonfile.write_text(dumps(data, indent=4))
     # TODO: fzf OR skim OR fzy OR peco
     [[ -r $ZPY_SRC ]] || return
 
+    .zpy_fzf_cmd || return
+    local fzf_cmd=$REPLY
+
     local fzf_args=() fzf_header fzf_prompt multi
     fzf_args=(--reverse -0)
     fzf_header='Packages:'
@@ -1856,7 +1881,7 @@ jsonfile.write_text(dumps(data, indent=4))
 
     local pkgs=($1/*(N/:t))
     reply=(${(f)"$(
-        print -rln -- $pkgs | fzf $fzf_args
+        print -rln -- $pkgs | $fzf_cmd $fzf_args
     )"})
 
     [[ $reply ]] || return
@@ -1919,7 +1944,7 @@ jsonfile.write_text(dumps(data, indent=4))
 
     zf_mkdir -p $bins_home
 
-    local pkgname projdir vpath bins bin src dest REPLY
+    local pkgname projdir vpath bins bin src dest REPLY fzf_cmd
     for 1 {
         .zpy_pkgspec2name $1 || return
         pkgname=$REPLY
@@ -1933,6 +1958,9 @@ jsonfile.write_text(dumps(data, indent=4))
         if [[ $bins_showlist ]] {
             bins=(${bins:*bins_showlist})
         } else {
+            .zpy_fzf_cmd || return
+            fzf_cmd=$REPLY
+
             bins=(${bins:|bins_hidelist})
             bins=(${bins:#([aA]ctivate(|.csh|.fish|.ps1|.bat|.nu|_this.py)|(deactivate|pydoc).bat|easy_install(|-<->*)|(pip|python|pypy)(|<->*)|*.so|__pycache__)})
             if [[ $pkgname != pip-tools ]]  bins=(${bins:#pip-(compile|sync)})
@@ -1941,7 +1969,7 @@ jsonfile.write_text(dumps(data, indent=4))
             if [[ $pkgname != build     ]]  bins=(${bins:#pyproject-build})
             bins=(${(f)"$(
                 print -rln $bins \
-                | fzf $fzf_args --header="$fzf_header $1 . . ." \
+                | $fzf_cmd $fzf_args --header="$fzf_header $1 . . ." \
                 --prompt='Which scripts should be added to the path? Choose one with <enter> or more with <tab>. '
             )"})
         }