From d676c59cdaab510f0d463cf6a3f7bd1d99db0a10 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas <foo.dogsquared@gmail.com> Date: Thu, 2 Dec 2021 21:48:44 +0800 Subject: [PATCH] Update flake output - Remove package outputs for MacOS since I don't have any. - Import our custom packages as an overlay for our NixOS configs. - Recursively import our modules which is more correct. --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index fdf8f6bc..3f8e4208 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ systems = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" "aarch64-linux" "armv6l-linux" "armv7l-linux" @@ -33,6 +32,9 @@ # Stallman-senpai will be disappointed. nixpkgs.config.allowUnfree = true; + # Extend nixpkgs with our own package set. + nixpkgs.overlays = [ (self: super: import ./pkgs { pkgs = super; }) ]; + # We live in a Unicode world and dominantly English in technical fields so we'll # have to go with it. i18n.defaultLocale = "en_US.UTF-8"; @@ -69,7 +71,7 @@ # We're going to make our custom modules available for our flake. Whether # or not this is a good thing is debatable, I just want to test it. - nixosModules = libExtended.mapAttrs (_: path: import path) + nixosModules = libExtended.mapAttrsRecursive (_: path: import path) (libExtended.filesToAttr ./modules); homeConfigurations = let