diff --git a/modules/shell/fish/default.nix b/modules/shell/fish/default.nix
index 9c81de8..52b8e5e 100644
--- a/modules/shell/fish/default.nix
+++ b/modules/shell/fish/default.nix
@@ -45,7 +45,11 @@
         nix-shell-run = {
           body = ''
             set program $argv[1]
-            commandline -r "nix-shell -p $program --run \"$program $argv[2..-1]\""
+            if test (count $argv) -ge 1
+                commandline -r "nix run nixpkgs#$program -- $argv[2..-1]"
+            else
+                commandline -r "nix run nixpkgs#$program"
+            end
             commandline -f execute
           '';
         };
diff --git a/modules/shell/fish/functions/fish_user_key_bindings.fish b/modules/shell/fish/functions/fish_user_key_bindings.fish
index 3ca0ee0..cbf2c63 100644
--- a/modules/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/shell/fish/functions/fish_user_key_bindings.fish
@@ -14,3 +14,5 @@ bind -M insert \cp projects
 bind -M default \cp projects
 bind -M insert \x1F accept-autosuggestion
 bind -M default \x1F accept-autosuggestion
+bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run nixpkgs#"'