From e06ce60bfecd9aefab882cb442d380ac1d52b9ec Mon Sep 17 00:00:00 2001
From: atagen <boss@atagen.co>
Date: Wed, 27 Aug 2025 12:37:58 +1000
Subject: [PATCH] fix app launcher path, switch to MATE fm

---
 graphical/desktop/niri-config.kdl | 2 +-
 graphical/fm.nix                  | 6 +++---
 graphical/shell.nix               | 2 +-
 lib/create.nix                    | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/graphical/desktop/niri-config.kdl b/graphical/desktop/niri-config.kdl
index 96b46b0..4d5f7e1 100755
--- a/graphical/desktop/niri-config.kdl
+++ b/graphical/desktop/niri-config.kdl
@@ -71,7 +71,7 @@ binds {
     Mod+Ctrl+K { move-window-up; }
     Mod+Ctrl+L { move-column-right-or-to-monitor-right; }
     Mod+D { spawn "qs" "ipc" "call" "launch" "toggle"; }
-    Mod+E { spawn "pcmanfm"; }
+    Mod+E { spawn "caja"; }
     Mod+Equal { spawn "bitwarden"; }
     Mod+F { spawn "firefox"; }
     Mod+H { focus-column-left; }
diff --git a/graphical/fm.nix b/graphical/fm.nix
index 29bf09d..f3aa4b7 100644
--- a/graphical/fm.nix
+++ b/graphical/fm.nix
@@ -3,8 +3,8 @@
   scope,
   ...
 }:
-with pkgs;
+with pkgs.mate;
 scope "apps" {
-  fm = pcmanfm;
-  archive = mate.engrampa;
+  fm = caja;
+  archive = engrampa;
 }
diff --git a/graphical/shell.nix b/graphical/shell.nix
index d1b3bc2..f47213e 100644
--- a/graphical/shell.nix
+++ b/graphical/shell.nix
@@ -18,7 +18,7 @@ in
   };
 
   systemd.user.services.quickshell = {
-    path = [ inputs.niri.packages.${pkgs.system}.niri-unstable ];
+    environment.PATH = lib.mkForce "/run/current-system/sw/bin:/run/current-system/sw/sbin:/etc/profiles/per-user/bolt/bin:/etc/profiles/per-user/bolt/sbin";
     unitConfig = {
       Description = "Quickshell";
       Requires = [
diff --git a/lib/create.nix b/lib/create.nix
index 65d1e70..cf8dbf7 100644
--- a/lib/create.nix
+++ b/lib/create.nix
@@ -13,7 +13,6 @@ in
         specialArgs = {
           inherit inputs;
           inherit (info) system;
-          # annoyingly, this is the only dependency on `system` from the entrypoint
           localPkgs = lib.packagesFromDirectoryRecursive {
             inherit (inputs.nixpkgs.legacyPackages.${info.system}) callPackage;
             directory = ../pkgs;