Skip to content

ref: config -> hosts | nixos -> os #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pacman99 merged 1 commit into from
Apr 22, 2021
Merged

ref: config -> hosts | nixos -> os #256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions lib/mkFlake/evalArgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,63 +82,63 @@ let
};
};

configModule = {
hostModule = {
options = with types; {
system = mkOption {
type = systemType;
default = "x86_64-linux";
description = ''
system for this config
system for this host
'';
};
channelName = mkOption {
type = types.enum (builtins.attrValues config.channels);
default = "nixpkgs";
description = ''
Channel this config should follow
Channel this host should follow
'';
};
modules = mkOption {
type = pathToListOf moduleType;
default = [ ];
description = ''
The configuration for this config
The configuration for this host
'';
};
};
};

# This is only needed for configDefaults
# modules in each config don't get exported
# This is only needed for hostDefaults
# modules in each host don't get exported
externalModulesModule = {
options = {
externalModules = mkOption {
type = pathToListOf moduleType;
default = [ ];
description = ''
The configuration for this config
The configuration for this host
'';
};
};
};

# Home-manager's configs get exported automatically from nixos.hosts
# So there is no need for a config options in the home namespace
# So there is no need for a host options in the home namespace
# This is only needed for nixos
includeConfigsModule = { name, ... }: {
includeHostsModule = { name, ... }: {
options = with types; {
configDefaults = mkOption {
type = submodule [ configModule externalModulesModule ];
hostDefaults = mkOption {
type = submodule [ hostModule externalModulesModule ];
default = { };
description = ''
Defaults for all configs.
the modules passed under configDefault will be exported
Defaults for all hosts.
the modules passed under hostDefaults will be exported
to the '${name}Modules' flake output.
They will also be added to all configs.
They will also be added to all hosts.
'';
};
configs = mkOption {
type = attrsOf (submodule configModule);
hosts = mkOption {
type = attrsOf (submodule hostModule);
default = { };
description = ''
configurations to include in the ${name}Configurations output
Expand Down Expand Up @@ -204,8 +204,8 @@ let
nixpkgs channels to create
'';
};
nixos = mkOption {
type = submodule [ includeConfigsModule importsModule ];
os = mkOption {
type = submodule [ includeHostsModule importsModule ];
default = { };
description = ''
hosts, modules, suites, and profiles for nixos
Expand Down