unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#48643] PATCH] gnu: fzf: Add fish shell functions to the package.
@ 2021-05-25  8:16 Solene Rapenne via Guix-patches via
  2021-09-26 12:02 ` bug#48643: " Efraim Flashner
  2021-10-02 20:43 ` [bug#48643] wp1148917-web wp1148917-web
  0 siblings, 2 replies; 4+ messages in thread
From: Solene Rapenne via Guix-patches via @ 2021-05-25  8:16 UTC (permalink / raw)
  To: 48643

This allows to enable fzf functions for fish using the following code in
the file ~/.config/fish/config.fish 

source ~/.guix-profile/share/fish/functions/fzf
fzf_key_bindings


---
 gnu/packages/terminals.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 37636c7cdc..5273dce005 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -851,11 +852,15 @@ usable with any list--including files, command history, processes and more.")
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (bash-completion (string-append out "/etc/bash_completion.d"))
+                     (fish-completion (string-append out "/share/fish/functions"))
                      (zsh-completion (string-append out "/share/zsh/site-functions")))
                 (with-directory-excursion "src/github.com/junegunn/fzf"
                   (mkdir-p bash-completion)
                   (copy-file "shell/completion.bash"
                              (string-append bash-completion "/fzf"))
+                  (mkdir-p fish-completion)
+                  (copy-file "shell/key-bindings.fish"
+                             (string-append fish-completion "/fzf"))
                   (mkdir-p zsh-completion)
                   (copy-file "shell/completion.zsh"
                              (string-append zsh-completion "/_fzf"))))))))))
-- 
2.31.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#48643: PATCH] gnu: fzf: Add fish shell functions to the package.
  2021-05-25  8:16 [bug#48643] PATCH] gnu: fzf: Add fish shell functions to the package Solene Rapenne via Guix-patches via
@ 2021-09-26 12:02 ` Efraim Flashner
  2021-10-02 20:43 ` [bug#48643] wp1148917-web wp1148917-web
  1 sibling, 0 replies; 4+ messages in thread
From: Efraim Flashner @ 2021-09-26 12:02 UTC (permalink / raw)
  To: Solene Rapenne; +Cc: 48643-done

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

I adjusted the fish completion path slightly to match the other
packages. Patch pushed!

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#48643]
  2021-05-25  8:16 [bug#48643] PATCH] gnu: fzf: Add fish shell functions to the package Solene Rapenne via Guix-patches via
  2021-09-26 12:02 ` bug#48643: " Efraim Flashner
@ 2021-10-02 20:43 ` wp1148917-web wp1148917-web
  2021-10-03 12:00   ` [bug#48643] Efraim Flashner
  1 sibling, 1 reply; 4+ messages in thread
From: wp1148917-web wp1148917-web @ 2021-10-02 20:43 UTC (permalink / raw)
  To: 48643@debbugs.gnu.org

Efraim, there seems to be a bit of confusion about the nature of the installed file: It is NOT a completion, but code that sets fzf shell-hotkeys. This should become obvious if you look at the folder from the source: https://github.com/junegunn/fzf/tree/master/shell
The file should probably be installed to vendor_functions.d/ as e.g. Arch does it: https://wiki.archlinux.org/title/Fzf#fish




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#48643]
  2021-10-02 20:43 ` [bug#48643] wp1148917-web wp1148917-web
@ 2021-10-03 12:00   ` Efraim Flashner
  0 siblings, 0 replies; 4+ messages in thread
From: Efraim Flashner @ 2021-10-03 12:00 UTC (permalink / raw)
  To: wp1148917-web; +Cc: 48643-done

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]

On Sat, Oct 02, 2021 at 10:43:15PM +0200, wp1148917-web wp1148917-web wrote:
> Efraim, there seems to be a bit of confusion about the nature of the installed file: It is NOT a completion, but code that sets fzf shell-hotkeys. This should become obvious if you look at the folder from the source: https://github.com/junegunn/fzf/tree/master/shell
> The file should probably be installed to vendor_functions.d/ as e.g. Arch does it: https://wiki.archlinux.org/title/Fzf#fish

First of all, thanks! I hadn't checked it too closely and relied on the
wording of 'fish completion'.

Checking the upstream documentation¹, Arch² and Debian³ the completions should
go in %output/share/fish/vendor_functions.d/fzf_key_bindings.fish, so
I've moved them there.

¹ https://fishshell.com/docs/current/completions.html?highlight=vendor#where-to-put-completions
² https://wiki.archlinux.org/title/Fzf#fish
³ https://sources.debian.org/src/fzf/0.24.3-1/debian/fzf.install/

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-10-03 12:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-25  8:16 [bug#48643] PATCH] gnu: fzf: Add fish shell functions to the package Solene Rapenne via Guix-patches via
2021-09-26 12:02 ` bug#48643: " Efraim Flashner
2021-10-02 20:43 ` [bug#48643] wp1148917-web wp1148917-web
2021-10-03 12:00   ` [bug#48643] Efraim Flashner

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).