nix run is now nix shell semantically

haslersn · Dec 29, 2020 · d2418a9 · d2418a9
1 parent 8c857d4
commit d2418a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/.any-nix-run-wrapper b/bin/.any-nix-run-wrapper
@@ -10,7 +10,7 @@ fns () {
             pos=$((pos-1))
         elif [[ $arg == -* ]]; then
             if [[ $arg == -c ]] || [[ $arg == --command ]]; then
-                command nix run "$@"
+                command nix shell "$@"
                 return
             elif [[ $arg == --arg ]] || [[ $arg == --argstr ]]; then
                 pos=2
@@ -27,6 +27,6 @@ fns () {
     if [[ -n $name ]] && [[ $name != shell ]]; then
         pkgs+=" "$name
     fi
-    env ANY_NIX_SHELL_PKGS="$pkgs" IN_NIX_RUN=1 nix run "$@" --command $which_shell
+    env ANY_NIX_SHELL_PKGS="$pkgs" IN_NIX_RUN=1 nix shell "$@" --command $which_shell
 }
-fns "$@"
+fns "$@"
diff --git a/bin/any-nix-shell b/bin/any-nix-shell
@@ -12,7 +12,7 @@ end
 
 # Overwrite the nix command
 function nix
-    if test \$argv[1] = run
+    if test \$argv[1] = shell
         set argv[1] fish
         $(which .any-nix-run-wrapper) \$argv
     else
@@ -51,7 +51,7 @@ function nix-shell () {
 
 # Overwrite the nix command
 function nix () {
-    if [[ \$1 == run ]]; then
+    if [[ \$1 == shell ]]; then
         shift
         $(which .any-nix-run-wrapper) zsh "\$@"
     else