diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 2508500..c380563 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -25,7 +25,7 @@
         command fzf
       '';
       dev_projects = /* fish */ ''
-        if $hn == "dnsc-work"
+        if test "$hn" == "dnsc-work"
           begin
             fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
@@ -188,14 +188,7 @@
         end
       '';
       setup_env = /* fish */ ''
-        set -l user_env (cat $HOME/.env)
-
-        if test -z "$user_env"
-          echo "~/.env not found"
-          return 1
-        end
-
-        for line in ($user_env | grep -v '^#')
+        for line in (cat $HOME/.env | grep -v '^#')
             set item (string split -m 1 '=' $line)
             set -gx $item[1] $item[2]
         end
@@ -219,7 +212,7 @@
       setup_env
       setup_path
 
-      if $hn == "dnsc-work"
+      if test "$hn" == "dnsc-work"
         setup_work
       end