Moved profiles to dedicated directory

This commit is contained in:
Jan-Bulthuis 2025-05-29 12:16:38 +02:00
parent cdffa07675
commit 9a97168950
8 changed files with 4 additions and 1 deletions

View File

@ -91,6 +91,7 @@ let
); );
nixosModules = collectModules "${flake}/modules/nixos"; nixosModules = collectModules "${flake}/modules/nixos";
nixosProfiles = collectModules "${flake}/profiles/nixos";
inputNixosModules = lib.map (flake: flake.outputs.nixosModules.default) ( inputNixosModules = lib.map (flake: flake.outputs.nixosModules.default) (
lib.filter (flake: lib.hasAttrByPath [ "outputs" "nixosModules" "default" ] flake) ( lib.filter (flake: lib.hasAttrByPath [ "outputs" "nixosModules" "default" ] flake) (
lib.attrValues inputs lib.attrValues inputs
@ -98,6 +99,7 @@ let
); );
homeModules = collectModules "${flake}/modules/home"; homeModules = collectModules "${flake}/modules/home";
homeProfiles = collectModules "${flake}/profiles/home";
inputHomeModules = lib.map (flake: flake.outputs.homeManagerModules.default) ( inputHomeModules = lib.map (flake: flake.outputs.homeManagerModules.default) (
lib.filter (flake: lib.hasAttrByPath [ "outputs" "homeManagerModules" "default" ] flake) ( lib.filter (flake: lib.hasAttrByPath [ "outputs" "homeManagerModules" "default" ] flake) (
lib.attrValues inputs lib.attrValues inputs
@ -141,7 +143,7 @@ let
usersModule = usersModule =
{ ... }: { ... }:
{ {
home-manager.sharedModules = homeModules ++ inputHomeModules; home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules;
home-manager.useUserPackages = false; # TODO: See if this should be changed to true? home-manager.useUserPackages = false; # TODO: See if this should be changed to true?
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users = homesConfiguration; home-manager.users = homesConfiguration;
@ -155,6 +157,7 @@ let
usersModule usersModule
] ]
++ nixosModules ++ nixosModules
++ nixosProfiles
++ inputNixosModules; ++ inputNixosModules;
} }
) (lib.attrsets.filterAttrs (name: entry: entry.type == "directory") attrs) ) (lib.attrsets.filterAttrs (name: entry: entry.type == "directory") attrs)