modules/lf: Consolidate the `ll` and `lm` wrappers in the module

Having them as separate packages was just not necessary.

7 files changed, 11 insertions, 5 deletions

diff --git a/modules/by-name/lf/lf/module.nix b/modules/by-name/lf/lf/module.nix
index 2e6669e8..ea9970ef 100644
--- a/modules/by-name/lf/lf/module.nix
+++ b/modules/by-name/lf/lf/module.nix
@@ -19,6 +19,8 @@
   commands = import ./commands {inherit pkgs sysLib shell_library system;};
   keybindings = import ./keybindings {inherit (cfg.keymaps) uid downloadDir;};
 
+  packages = import ./wrappers {inherit pkgs;};
+
   cfg = config.soispha.programs.lf;
 in {
   imports = [
@@ -58,6 +60,11 @@ in {
         "lf/colors".source = ./colors;
       };
 
+      programs.zsh.shellAliases = {
+        ll = ". ${lib.getExe packages.ll}";
+        lm = ". ${lib.getExe packages.lm}";
+      };
+
       programs.lf = {
         enable = true;
 
diff --git a/modules/by-name/lf/lf/wrappers/default.nix b/modules/by-name/lf/lf/wrappers/default.nix
new file mode 100644
index 00000000..7257a66e
--- /dev/null
+++ b/modules/by-name/lf/lf/wrappers/default.nix
@@ -0,0 +1,4 @@
+{pkgs}: {
+  ll = pkgs.callPackage ./ll {};
+  lm = pkgs.callPackage ./lm {};
+}
diff --git a/pkgs/by-name/ll/ll/package.nix b/modules/by-name/lf/lf/wrappers/ll/default.nix
index 6e4ee336..6e4ee336 100644
--- a/pkgs/by-name/ll/ll/package.nix
+++ b/modules/by-name/lf/lf/wrappers/ll/default.nix
diff --git a/pkgs/by-name/ll/ll/ll.sh b/modules/by-name/lf/lf/wrappers/ll/ll.sh
index e012cffa..e012cffa 100755
--- a/pkgs/by-name/ll/ll/ll.sh
+++ b/modules/by-name/lf/lf/wrappers/ll/ll.sh
diff --git a/pkgs/by-name/lm/lm/package.nix b/modules/by-name/lf/lf/wrappers/lm/default.nix
index 42bdc687..42bdc687 100644
--- a/pkgs/by-name/lm/lm/package.nix
+++ b/modules/by-name/lf/lf/wrappers/lm/default.nix
diff --git a/pkgs/by-name/lm/lm/lm.sh b/modules/by-name/lf/lf/wrappers/lm/lm.sh
index 71213721..71213721 100755
--- a/pkgs/by-name/lm/lm/lm.sh
+++ b/modules/by-name/lf/lf/wrappers/lm/lm.sh
diff --git a/modules/by-name/zs/zsh/module.nix b/modules/by-name/zs/zsh/module.nix
index 038048da..bf7e2a71 100644
--- a/modules/by-name/zs/zsh/module.nix
+++ b/modules/by-name/zs/zsh/module.nix
@@ -138,11 +138,6 @@ in {
           HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND = "bg=cyan,fg=white";
           HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND = "fg=red,underline,standout,bold";
         };
-
-        shellAliases = {
-          ll = ". ${lib.getExe pkgs.ll}";
-          lm = ". ${lib.getExe pkgs.lm}";
-        };
       };
     };
   };