home-manager: refactor fish

nix/homeModules/common/fish/default.nix

@@ -4,6 +4,11 @@
   pkgs,
   ...
 }:
+
+let
+  inherit (pkgs) myPkgs;
+in
+
 {
   imports = [
     ./aliasesAbbrs.nix
@@ -18,7 +23,7 @@
 
   home.packages = [
     pkgs.vivid
-    pkgs.myPkgs.hutils
+    myPkgs.hutils
   ];
   programs = {
     fd.enable = true;
@@ -33,7 +38,7 @@
 
   programs.fish = {
 
-    sourcePaths = lib.mkMerge [
+    sourcePaths =
       [
         # Make sure wrapper comes first
         # https://discourse.nixos.org/t/sudo-run-current-system-sw-bin-sudo-must-be-owned-by-uid-0-and-have-the-setuid-bit-set-and-cannot-chdir-var-cron-bailing-out-var-cron-permission-denied/20463/2
@@ -53,8 +58,7 @@
       ]
 
       # Add brew, but as fallback
-      (lib.mkIf pkgs.stdenv.isDarwin "/opt/homebrew/bin")
-    ];
+      ++ (lib.optional pkgs.stdenv.isDarwin "/opt/homebrew/bin");
 
     interactiveShellInit = builtins.readFile ./shellInit.fish;