diff --git a/glue/default.nix b/glue/default.nix index 073e700..81f53c9 100644 --- a/glue/default.nix +++ b/glue/default.nix @@ -91,6 +91,7 @@ let ); nixosModules = collectModules "${flake}/modules/nixos"; + nixosProfiles = collectModules "${flake}/profiles/nixos"; inputNixosModules = lib.map (flake: flake.outputs.nixosModules.default) ( lib.filter (flake: lib.hasAttrByPath [ "outputs" "nixosModules" "default" ] flake) ( lib.attrValues inputs @@ -98,6 +99,7 @@ let ); homeModules = collectModules "${flake}/modules/home"; + homeProfiles = collectModules "${flake}/profiles/home"; inputHomeModules = lib.map (flake: flake.outputs.homeManagerModules.default) ( lib.filter (flake: lib.hasAttrByPath [ "outputs" "homeManagerModules" "default" ] flake) ( lib.attrValues inputs @@ -141,7 +143,7 @@ let 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.useGlobalPkgs = true; home-manager.users = homesConfiguration; @@ -155,6 +157,7 @@ let usersModule ] ++ nixosModules + ++ nixosProfiles ++ inputNixosModules; } ) (lib.attrsets.filterAttrs (name: entry: entry.type == "directory") attrs) diff --git a/modules/home/profiles/base.nix b/profiles/home/base.nix similarity index 100% rename from modules/home/profiles/base.nix rename to profiles/home/base.nix diff --git a/modules/home/profiles/gnome.nix b/profiles/home/gnome.nix similarity index 100% rename from modules/home/profiles/gnome.nix rename to profiles/home/gnome.nix diff --git a/modules/home/profiles/jan.nix b/profiles/home/jan.nix similarity index 100% rename from modules/home/profiles/jan.nix rename to profiles/home/jan.nix diff --git a/modules/nixos/profiles/base.nix b/profiles/nixos/base.nix similarity index 100% rename from modules/nixos/profiles/base.nix rename to profiles/nixos/base.nix diff --git a/modules/nixos/profiles/desktop.nix b/profiles/nixos/desktop.nix similarity index 100% rename from modules/nixos/profiles/desktop.nix rename to profiles/nixos/desktop.nix diff --git a/modules/nixos/profiles/laptop.nix b/profiles/nixos/laptop.nix similarity index 100% rename from modules/nixos/profiles/laptop.nix rename to profiles/nixos/laptop.nix diff --git a/modules/nixos/profiles/vm.nix b/profiles/nixos/vm.nix similarity index 100% rename from modules/nixos/profiles/vm.nix rename to profiles/nixos/vm.nix