From 9ad692088510b92c84a6c06c4bba30ebb7aa8e9c Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Mon, 31 Mar 2025 16:51:29 +0200
Subject: fix(modules/lf/commands): Avoid inheriting the path by default

All the commands should have their respective dependencies set.
The ones that need external commands (i.e., `execute`) can opt into
keeping their path set.
---
 modules/by-name/lf/lf/commands/default.nix | 38 ++++++++++--------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/modules/by-name/lf/lf/commands/default.nix b/modules/by-name/lf/lf/commands/default.nix
index 42508566..aa78514f 100644
--- a/modules/by-name/lf/lf/commands/default.nix
+++ b/modules/by-name/lf/lf/commands/default.nix
@@ -2,53 +2,38 @@
   functionCall = {
     name,
     dependencies,
-    ...
+    keepPath ? false,
   }:
     pkgs.writeShellApplication {
       inherit name;
       text = builtins.readFile ./base.sh + builtins.readFile ./scripts/${name}.sh;
       runtimeInputs = dependencies;
+      inheritPath = keepPath;
     }
     + "/bin/${name}";
 
   # closes the lf tui
-  shell = {
-    name,
-    dependencies,
-    ...
-  }: ''
+  shell = args: ''
     ''${{
-      ${functionCall {inherit name dependencies;}}
+      ${functionCall args}
     }}
   '';
   # runs the command in the ui/term bar
-  pipe = {
-    name,
-    dependencies,
-    ...
-  }: ''
+  pipe = args: ''
     %{{
-      ${functionCall {inherit name dependencies;}}
+      ${functionCall args}
     }}
   '';
   # runs the command in the background
-  async = {
-    name,
-    dependencies,
-    ...
-  }: ''
+  async = args: ''
     &{{
-      ${functionCall {inherit name dependencies;}}
+      ${functionCall args}
     }}
   '';
   # adds a prompt after the command has run
-  wait = {
-    name,
-    dependencies,
-    ...
-  }: ''
+  wait = args: ''
     !{{
-      ${functionCall {inherit name dependencies;}}
+      ${functionCall args}
     }}
   '';
 in {
@@ -97,6 +82,7 @@ in {
   execute = shell {
     name = "execute";
     dependencies = [];
+    keepPath = true;
   };
   follow_link = pipe {
     name = "follow_link";
@@ -118,6 +104,7 @@ in {
   mk_script = shell {
     name = "mk_script";
     dependencies = [];
+    keepPath = true;
   };
 
   set_clipboard_path = async {
@@ -153,5 +140,6 @@ in {
   view_file = async {
     name = "view_file";
     dependencies = with pkgs; [file];
+    keepPath = true;
   };
 }
-- 
cgit 1.4.1