3 files changed, 24 insertions, 30 deletions
diff --git a/modules/file-management/lf/default.nix b/modules/file-management/lf/default.nix
index cd9ca5c..15d34ae 100644
--- a/modules/file-management/lf/default.nix
+++ b/modules/file-management/lf/default.nix
@@ -34,10 +34,6 @@
       "inode/directory" = "lf.desktop";
     };
 
-    home.packages = with pkgs; [
-      busybox
-    ];
-
     programs.lf = {
       enable = true;
       package = config.file-management.lf.package;
@@ -48,7 +44,7 @@
         hidden = true;
         preview = true;
 
-        shell = "sh";
+        shell = config.home.sessionVariables.SHELL;
         ifs = "\n";
         scrolloff = "4";
         period = "1";
@@ -65,9 +61,7 @@
         source = lib.getExe config.scripts.file-preview.package;
       };
 
-      extraConfig = ''
-        ${builtins.readFile ./lfrc}
-      '';
+      extraConfig = builtins.readFile ./lfrc;
     };
 
     home.file.".config/lf/icons".source = ./icons;
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix
index abecc38..fd610d0 100644
--- a/modules/scripts/default.nix
+++ b/modules/scripts/default.nix
@@ -20,27 +20,25 @@
   ];
 
   config = {
-    home.packages = [
-      pkgs.file
-      config.terminal.bat.package
-    ]
-    ++ lib.filter (x: x != null) (lib.mapAttrsToList (_: s: s.package) config.scripts)
-    ++ lib.filter (x: x != null) (
-      lib.mapAttrsToList (
-        name: sc:
-        if sc.enable && sc.desktop.enable then
-          pkgs.makeDesktopItem {
-            name = name;
-            desktopName = sc.desktop.displayName;
-            exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe sc.package}";
-            icon = "kitty";
-            categories = [ "Utility" ];
-            terminal = false;
-            type = "Application";
-          }
-        else
-          null
-      ) config.scripts
-    );
+    home.packages =
+      [ ]
+      ++ lib.filter (x: x != null) (lib.mapAttrsToList (_: s: s.package) config.scripts)
+      ++ lib.filter (x: x != null) (
+        lib.mapAttrsToList (
+          name: sc:
+          if sc.enable && sc.desktop.enable then
+            pkgs.makeDesktopItem {
+              name = name;
+              desktopName = sc.desktop.displayName;
+              exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe sc.package}";
+              icon = "kitty";
+              categories = [ "Utility" ];
+              terminal = false;
+              type = "Application";
+            }
+          else
+            null
+        ) config.scripts
+      );
   };
 }
diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix
index ff684b4..4b4180f 100644
--- a/modules/security/ssh/default.nix
+++ b/modules/security/ssh/default.nix
@@ -26,5 +26,7 @@
         HashKnownHosts = "yes";
       };
     };
+
+    services.ssh-agent.enable = lib.mkIf config.security.gpg.enable false;
   };
 }