mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-02-07 12:19:07 +00:00
flake-parts/setups: include private modules as part of default shared modules
This commit is contained in:
parent
9729cd3005
commit
3bdaa63231
@ -40,11 +40,9 @@
|
||||
plover.systems = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
# This is to be used by the NixOS `home-manager.sharedModules` anyways.
|
||||
# Pretty much the baseline home-manager configuration for the whole
|
||||
# cluster.
|
||||
sharedModules = [
|
||||
# Import our private modules...
|
||||
../../modules/home-manager/_private
|
||||
|
||||
# ...plus a bunch of third-party modules.
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
|
@ -81,10 +81,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
# Basically the baseline NixOS configuration of the whole cluster.
|
||||
sharedModules = [
|
||||
# Import our private modules.
|
||||
../../modules/nixos/_private
|
||||
|
||||
# Only have third-party modules with optional NixOS modules.
|
||||
inputs.nix-index-database.nixosModules.nix-index
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
|
@ -224,7 +224,12 @@ in
|
||||
|
||||
config = lib.mkIf (cfg.configs != { }) {
|
||||
# Import our own home-manager modules.
|
||||
setups.home-manager.sharedModules = [ homeManagerModules ];
|
||||
setups.home-manager.sharedModules = [
|
||||
homeManagerModules
|
||||
|
||||
# Import our private modules...
|
||||
../../home-manager/_private
|
||||
];
|
||||
|
||||
flake =
|
||||
let
|
||||
|
@ -508,6 +508,9 @@ in
|
||||
# Import our own public NixOS modules.
|
||||
nixosModules
|
||||
|
||||
# Import our private modules.
|
||||
../../nixos/_private
|
||||
|
||||
# Set the home-manager-related settings.
|
||||
({ lib, ... }: {
|
||||
home-manager.sharedModules = partsConfig.setups.home-manager.sharedModules;
|
||||
|
Loading…
Reference in New Issue
Block a user