diff --git a/modules/hm/default.nix b/modules/hm/default.nix
index 3f31f26..98de725 100644
--- a/modules/hm/default.nix
+++ b/modules/hm/default.nix
@@ -59,6 +59,7 @@ in
           icons = "auto";
         };
         # Shell
+        bash.enable = true; # ensure HM variables are passed to `bash` too (otherwise `jpassmenu` doesn't work)
         fish = {
           enable = true;
           preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index d6eeff7..875044b 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -38,11 +38,7 @@ in
       # Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish)
       bash.interactiveShellInit = # bash
         ''
-          if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-          then
-            shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-            exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-          fi
+          if [[ "$(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm)" != "fish" && -z "$BASH_EXECUTION_STRING" ]]; then shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""; exec ${pkgs.fish}/bin/fish "$LOGIN_OPTION"; fi
         '';
       # Default shell
       fish.enable = true;