diff --git a/modules/hm/default.nix b/modules/hm/default.nix
index 98de725..3f31f26 100644
--- a/modules/hm/default.nix
+++ b/modules/hm/default.nix
@@ -59,7 +59,6 @@ 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 875044b..d6eeff7 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -38,7 +38,11 @@ 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;
diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock
index bfefd24..cfd1d1d 100644
--- a/scripts/jpassmenu/Cargo.lock
+++ b/scripts/jpassmenu/Cargo.lock
@@ -217,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.8"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
 dependencies = [
  "anstream",
  "anstyle",