From 3af37fd7f5ebcedd90ea8421755136df414931f3 Mon Sep 17 00:00:00 2001
From: electria <elec3137+git@proton.me>
Date: Tue, 8 Sep 2026 18:57:46 -0700
Subject: [PATCH] shell: use config.programs.fish.package over pkgs.fish

also sets the defaultUserShell independantly of allowAddingPackages,
since if programs.fish is already enabled it wouldn't be adding anything
---
 defaults/shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/shell.nix b/defaults/shell.nix
index 53e770e..2bd324e 100644
--- a/defaults/shell.nix
+++ b/defaults/shell.nix
@@ -47,7 +47,7 @@ in
   config = lib.mkIf cfg.enable {
     # use Fish, the nicest shell :)
     programs.fish.enable = lib.mkIf config.nixowos.allowAddingPackages true;
-    users.defaultUserShell = lib.mkIf config.nixowos.allowAddingPackages pkgs.fish;
+    users.defaultUserShell = lib.mkIf config.programs.fish.enable config.programs.fish.package;
 
     environment.shellAliases = {
       # make nix-shell preserve the user's $SHELL