diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 5651fd61..ceb2411f 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -9,7 +9,9 @@
       set ZELLIJ_AUTO_ATTACH true 
       set ZELLIJ_AUTO_EXIT true
       ssh-add > /dev/null &> /dev/null
-      eval (zellij setup --generate-auto-start fish | string collect)
+      if status is-interactive
+        eval (zellij setup --generate-auto-start fish | string collect)
+      end
     '';
     functions = {
       update_secrets = ''
@@ -18,6 +20,7 @@
         find secrets -name "*.yaml" -exec sops updatekeys {} \;
       '';
       restart-docker = ''
+     # set GPG_TTY $tty
         pushd /Storage/Data/docker-compose/sysctl.io/
         docker stop $argv
         docker rm $argv
diff --git a/stylix/common/default.nix b/stylix/common/default.nix
index 5830b31e..5f832d53 100644
--- a/stylix/common/default.nix
+++ b/stylix/common/default.nix
@@ -1,4 +1,3 @@
 { lib, ... }: {
   stylix.targets.tmux.enable = lib.mkForce false;
-  stylix.targets.fish.enable = lib.mkForce false;
 }