From 8b82f52e75e7127bf240293b3eef483aabffb405 Mon Sep 17 00:00:00 2001 From: Peter Rice Date: Wed, 29 Apr 2020 11:41:30 -0400 Subject: [PATCH] fish: source each file in plugin conf.d separately According to https://fishshell.com/docs/current/cmds/source.html, only one file can be sourced at a time: "If additional arguments are specified after the file name, they will be inserted into the $argv variable." PR #1204 --- modules/programs/fish.nix | 4 +++- tests/modules/programs/fish/plugins.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 240289176..730afa792 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -441,7 +441,9 @@ in { # Source initialization code if it exists. if test -d $plugin_dir/conf.d - source $plugin_dir/conf.d/*.fish + for f in $plugin_dir/conf.d/*.fish + source $f + end end if test -f $plugin_dir/key_bindings.fish diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix index 1d661ff0e..657c33f39 100644 --- a/tests/modules/programs/fish/plugins.nix +++ b/tests/modules/programs/fish/plugins.nix @@ -21,7 +21,9 @@ let # Source initialization code if it exists. if test -d $plugin_dir/conf.d - source $plugin_dir/conf.d/*.fish + for f in $plugin_dir/conf.d/*.fish + source $f + end end if test -f $plugin_dir/key_bindings.fish