From 984baab7312aba10b1da38c29ccf97f11092c3b3 Mon Sep 17 00:00:00 2001
From: Elec3137 <elec3137@proton.me>
Date: Tue, 24 Mar 2026 11:09:49 -0700
Subject: [PATCH] defaults/shell: add guards for pulling in fish and direnv

---
 defaults/shell.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/defaults/shell.nix b/defaults/shell.nix
index e76e8f7..e8df363 100644
--- a/defaults/shell.nix
+++ b/defaults/shell.nix
@@ -48,8 +48,8 @@ in
 
   config = lib.mkIf cfg.enable {
     # use Fish, the nicest shell :)
-    programs.fish.enable = true;
-    users.defaultUserShell = pkgs.fish;
+    programs.fish.enable = lib.mkIf config.nixowos.allowAddingPackages true;
+    users.defaultUserShell = lib.mkIf config.nixowos.allowAddingPackages pkgs.fish;
     # avoid generating caches (enabled by fish) due to slowdowns during nixos-rebuild
     # this may degrade autocompletion
     documentation.man.generateCaches = false;
@@ -64,11 +64,11 @@ in
     environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
 
     # enter dev env on cd
-    programs.direnv = lib.mkDefault {
-      enable = true;
+    programs.direnv = {
+      enable = lib.mkIf config.nixowos.allowAddingPackages (lib.mkDefault true);
       # hide extra logging, that isn't particularly useful
       # (for only using nix at least)
-      settings.global.hide_env_diff = true;
+      settings.global.hide_env_diff = lib.mkDefault true;
     };
   };
 }