refactor: use constant for menu command name

numtide · Jan 13, 2024 · 94add6b · 94add6b
1 parent 9c87676
commit 94add6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/modules/devshell.nix b/modules/devshell.nix
@@ -12,6 +12,8 @@ let
   # environment.
   strOrPackage = import ../nix/strOrPackage.nix { inherit lib pkgs; };
 
+  inherit (import ../nix/commands/devshellMenu.nix { inherit pkgs; }) devshellMenuCommandName;
+
   # Use this to define a flake app for the environment.
   mkFlakeApp = bin: {
     type = "app";
@@ -255,7 +257,7 @@ in
       type = types.str;
       default = ''
         {202}🔨 Welcome to ${cfg.name}{reset}
-        $(type -p menu &>/dev/null && menu)
+        $(type -p ${devshellMenuCommandName} &>/dev/null && ${devshellMenuCommandName})
       '';
       apply = replaceStrings
         (map (key: "{${key}}") (attrNames ansi))

diff --git a/tests/core/commands.nix b/tests/core/commands.nix
@@ -1,4 +1,5 @@
 { pkgs, devshell, runTest }:
+let inherit (import ../../nix/commands/devshellMenu.nix { inherit pkgs; }) devshellMenuCommandName; in
 {
   # Basic devshell usage
   commands-1 =
@@ -33,7 +34,7 @@
       # Load the devshell
       source ${shell}/env.bash
 
-      menu
+      ${devshellMenuCommandName}
 
       # Checks that all the commands are available
       type -p bash-script