From 7093ba7791e388ce7e58fbcf3c5ce5efbfb02dff Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 5 Jul 2022 08:42:24 -0400
Subject: [PATCH] improve nix-shell-run with args

---
 modules/programming/python.nix | 2 +-
 modules/shell/fish/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programming/python.nix b/modules/programming/python.nix
index 3e3cabd..45341b3 100644
--- a/modules/programming/python.nix
+++ b/modules/programming/python.nix
@@ -8,7 +8,7 @@
       black # Python formatter
     ];
 
-    programs.fish.shellAbbrs = { py = "python"; };
+    programs.fish.shellAbbrs = { py = "python3"; };
 
   };
 
diff --git a/modules/shell/fish/default.nix b/modules/shell/fish/default.nix
index be9cba0..9c81de8 100644
--- a/modules/shell/fish/default.nix
+++ b/modules/shell/fish/default.nix
@@ -45,7 +45,7 @@
         nix-shell-run = {
           body = ''
             set program $argv[1]
-            commandline -r "nix-shell -p $program --run $program"
+            commandline -r "nix-shell -p $program --run \"$program $argv[2..-1]\""
             commandline -f execute
           '';
         };