oxwm

https://git.tonybtw.com/oxwm.git git://git.tonybtw.com/oxwm.git

pass in pkgs in forAllSystems to function

Commit
ad2ebbc9d140a21682a06275b83532642cb0464f
Parent
5cb2e29
Author
emzywastaken <amiamemetoo@gmail.com>
Date
2025-10-10 22:01:17

Diff

diff --git a/flake.nix b/flake.nix
index f12c6d3..aafd179 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,18 +8,15 @@
     nixpkgs,
   }: let
     systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
-    forAllSystems = nixpkgs.lib.genAttrs systems;
+
+    forAllSystems = fn: nixpkgs.lib.genAttrs systems (system: fn nixpkgs.legacyPackages.${system});
   in {
-    packages = forAllSystems (system: let
-      pkgs = import nixpkgs {inherit system;};
-    in {
+    packages = forAllSystems (pkgs: rec {
       default = pkgs.callPackage ./default.nix {};
-      oxwm = self.packages.${system}.default;
+      oxwm = default;
     });
 
-    devShells = forAllSystems (system: let
-      pkgs = import nixpkgs {inherit system;};
-    in {
+    devShells = forAllSystems (pkgs: {
       default = pkgs.mkShell {
         buildInputs = [
           pkgs.rustc
@@ -40,7 +37,7 @@
       };
     });
 
-    formatter = forAllSystems (system: (import nixpkgs {inherit system;}).alejandra);
+    formatter = forAllSystems (pkgs: pkgs.alejandra);
 
     nixosModules.default = {
       config,
@@ -83,7 +80,7 @@
             }
           ];
           services.displayManager.sessionPackages = [oxwmDesktopItem];
-          
+
           environment.systemPackages = [
             cfg.package
             pkgs.rustc