From b0d423b36fb4876189fa4fac668171fb29faa419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Mon, 22 Jan 2024 20:32:40 +0100
Subject: [PATCH] wrappers/fish: use pathAdd

---
 wrappers/fish/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wrappers/fish/default.nix b/wrappers/fish/default.nix
index c25e3e6..b6840ce 100644
--- a/wrappers/fish/default.nix
+++ b/wrappers/fish/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...
@@ -11,12 +12,11 @@
     extraWrapperFlags = "--inherit-argv0";
 
     prependFlags = let
-      extraPkgs = with pkgs; [eza bat];
-      # Can't use pathAdd because fish used as login shell will ignore the variables the wrapper sets up
+      # Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
       path-add-lines =
         lib.concatMapStringsSep "\n"
         (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
-        extraPkgs;
+        config.wrappers.fish.pathAdd;
       config-fish = pkgs.writeText "config.fish" ''
         ${path-add-lines}
         source ${./config.fish}
@@ -25,5 +25,7 @@
       "-C"
       "source ${config-fish}"
     ];
+
+    pathAdd = with pkgs; [eza bat fzf];
   };
 }