difftreelog
refactor consistent module naming
in: trunk
4 files changed
README.adocdiffbeforeafterboth--- a/README.adoc
+++ b/README.adoc
@@ -60,8 +60,8 @@
# treat the contents of this file as implementation detail
data = import ./fleet.nix;
- # globalModules section of fleet config declares modules, which are used for all configured nixos hosts.
- globalModules = [
+ # nixosModules section of fleet config declares modules, which are used for all configured nixos hosts.
+ nixosModules = [
lanzaboote.nixosModules.lanzaboote
({
config,
@@ -81,7 +81,7 @@
# Is I.e wiring up the mesh VPN, or deploying kubernetes, or other things.
#
# Modules use the same semantics as standard nixos module system, they are just configuring all the hosts at once.
- modules = [
+ fleetModules = [
./wireguard
# Multi-instancible modules example
(import ./kubernetes {hosts = ["a" "b"];})
@@ -93,7 +93,7 @@
# Every host has some system, for which the system configuration needs to be built
system = "x86_64-linux";
# And nixos modules
- modules = [
+ nixosModules = [
./controlplane-1/hardware-configuration.nix
./controlplane-1/configuration.nix
# Configuration may also be specified inline, as in any nixos config.
lib/default.nixdiffbeforeafterboth--- a/lib/default.nix
+++ b/lib/default.nix
@@ -8,8 +8,8 @@
nixpkgs,
overlays ? [],
hosts,
- modules,
- globalModules ? [],
+ fleetModules,
+ nixosModules ? [],
extraFleetLib ? {},
}: let
hostNames = nixpkgs.lib.attrNames hosts;
@@ -25,10 +25,10 @@
++ [
data
({...}: {
- inherit globalModules hosts overlays;
+ inherit nixosModules hosts overlays;
})
]
- ++ modules;
+ ++ fleetModules;
specialArgs = {
inherit nixpkgs fleetLib;
};
modules/fleet/meta.nixdiffbeforeafterboth1{2 lib,3 fleetLib,4 config,5 nixpkgs,6 ...7}:8with lib;9with fleetLib; let10 hostModule = with types;11 {...} @ hostConfig: let12 hostName = hostConfig.config._module.args.name;13 in {14 options = {15 modules = mkOption {16 type = listOf (mkOptionType {17 name = "submodule";18 inherit (submodule {}) check;19 merge = lib.options.mergeOneOption;20 description = "Nixos modules";21 });22 description = "List of nixos modules";23 default = [];24 };25 system = mkOption {26 type = str;27 description = "Type of system";28 };29 encryptionKey = mkOption {30 type = str;31 description = "Encryption key";32 };33 nixosSystem = mkOption {34 type = unspecified;35 description = "Nixos configuration";36 };37 nixpkgs = mkOption {38 type = unspecified;39 description = "Nixpkgs override";40 default = nixpkgs;41 };42 };43 config = {44 nixosSystem = hostConfig.config.nixpkgs.lib.nixosSystem {45 inherit (hostConfig.config) system modules;46 specialArgs = {47 inherit fleetLib;48 fleet = hostsToAttrs (host: config.hosts.${host}.nixosSystem.config);49 };50 };51 modules = [52 ({...}: {53 networking.hostName = mkFleetGeneratorDefault hostName;54 })55 ];56 };57 };58 overlayType = mkOptionType {59 name = "nixpkgs-overlay";60 description = "nixpkgs overlay";61 check = lib.isFunction;62 merge = lib.mergeOneOption;63 };64in {65 options = with types; {66 hosts = mkOption {67 type = attrsOf (submodule hostModule);68 default = {};69 description = "Configurations of individual hosts";70 };71 globalModules = mkOption {72 type = listOf (mkOptionType {73 name = "submodule";74 inherit (submodule {}) check;75 merge = lib.options.mergeOneOption;76 description = "Nixos modules";77 });78 description = "Modules, which should be added to every system";79 default = [];80 };81 overlays = mkOption {82 default = [];83 type = listOf overlayType;84 };85 };86 config = {87 hosts = hostsToAttrs (host: {88 modules =89 config.globalModules90 ++ [91 ({...}: {92 nixpkgs.overlays = config.overlays;93 })94 ];95 });96 globalModules = import ../../nixos/modules/module-list.nix;97 };98}modules/fleet/secrets.nixdiffbeforeafterboth--- a/modules/fleet/secrets.nix
+++ b/modules/fleet/secrets.nix
@@ -133,7 +133,7 @@
})
config.sharedSecrets;
hosts = hostsToAttrs (host: {
- modules = let
+ nixosModules = let
cleanupSecret = secretName: v: {
inherit (v) public secret;
shared = true;