From 780dafeaa70b89aa716b51990900aea37703a57c Mon Sep 17 00:00:00 2001 From: NullBite Date: Sat, 8 Feb 2025 14:13:58 -0500 Subject: [PATCH] flake: switch majority of packages to module --- flake.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 7f25fdb..5ccb11d 100644 --- a/flake.nix +++ b/flake.nix @@ -122,7 +122,7 @@ imports = [ ./flake ./lib/nixfiles/module.nix - # ./pkgs/module.nix + ./pkgs/module.nix ]; config = { @@ -447,18 +447,12 @@ nixosModules = (import ./modules/nixos) moduleInputs; homeManagerModules = (import ./modules/home-manager) moduleInputs; packages = eachSystem ( - system: let - pkgs = import nixpkgs-unstable {inherit system;}; - in - ( - import ./pkgs {inherit pkgs;} - ) - // { - iso = let - isoSystem = mkISOSystem system; - in - isoSystem.config.system.build.isoImage; - } + system: { + iso = let + isoSystem = mkISOSystem system; + in + isoSystem.config.system.build.isoImage; + } ); apps = eachSystem (system: import ./pkgs/apps.nix