diff options
| -rwxr-xr-x | modules/by-name/di/direnv/landrun-fish.sh | 1 | ||||
| -rw-r--r-- | modules/by-name/lf/lf/module.nix | 15 | ||||
| -rw-r--r-- | modules/by-name/lf/lf/wrappers/ll.fish | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/by-name/di/direnv/landrun-fish.sh b/modules/by-name/di/direnv/landrun-fish.sh index 2220db20..0219b317 100755 --- a/modules/by-name/di/direnv/landrun-fish.sh +++ b/modules/by-name/di/direnv/landrun-fish.sh @@ -12,7 +12,6 @@ landrun \ --env IN_DIRENV_SANDBOX=true \ --env TMPDIR="$_new_tmp" \ --rox /nix/store \ - --rox /run/wrappers/bin/sudo \ --rw "$_new_tmp" \ --ro /etc/ \ --ro /proc/ \ diff --git a/modules/by-name/lf/lf/module.nix b/modules/by-name/lf/lf/module.nix index 435df119..2d80f68e 100644 --- a/modules/by-name/lf/lf/module.nix +++ b/modules/by-name/lf/lf/module.nix @@ -33,14 +33,15 @@ } "lf command map"; process = prefix: attrs: - lib.mapAttrsToList (name: value: + lib.mapAttrsToList (name: value: let + new_prefix = + if prefix == null + then name + else prefix + name; + in if (builtins.isAttrs value) - then - (process name value) - ++ [(lib.nameValuePair name null)] - else if prefix == null - then (lib.nameValuePair name value) - else (lib.nameValuePair (prefix + name) value)) + then (process new_prefix value) ++ [(lib.nameValuePair new_prefix null)] + else (lib.nameValuePair new_prefix value)) attrs; keybindings = builtins.listToAttrs (lib.lists.flatten (process null keybindings_raw)); diff --git a/modules/by-name/lf/lf/wrappers/ll.fish b/modules/by-name/lf/lf/wrappers/ll.fish index 4d1e3561..6478d6f1 100644 --- a/modules/by-name/lf/lf/wrappers/ll.fish +++ b/modules/by-name/lf/lf/wrappers/ll.fish @@ -22,7 +22,7 @@ begin set --erase SHOULD_SANDBOX_DIRENV case '*' # Just pass things along, that we don't know about - printf "SYSCMD not recognized: %s\n" "$cmd" + printf "%s\n\r" "$cmd" >&2 end end |