From de90fa19303213ace45952711bf0fd6b3cd85f3d Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 10 Feb 2024 18:09:25 -0500 Subject: modules: import extra options where they're introduced --- modules/nixos/default.nix | 2 +- modules/nixos/traits/default.nix | 1 + modules/nixos/traits/home-manager.nix | 3 +++ modules/nixos/traits/secrets.nix | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/traits/home-manager.nix (limited to 'modules/nixos') diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index a334bb3..2460091 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,7 @@ { flake.nixosModules = { - default = ./base; archetypes = ./archetypes; + base = ./base; desktop = ./desktop; traits = ./traits; }; diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix index bf064a2..d2a50e7 100644 --- a/modules/nixos/traits/default.nix +++ b/modules/nixos/traits/default.nix @@ -5,6 +5,7 @@ ./cloudflared.nix ./containers.nix ./hercules.nix + ./home-manager.nix ./locale.nix ./nginx.nix ./nvk diff --git a/modules/nixos/traits/home-manager.nix b/modules/nixos/traits/home-manager.nix new file mode 100644 index 0000000..01af5b1 --- /dev/null +++ b/modules/nixos/traits/home-manager.nix @@ -0,0 +1,3 @@ +{inputs, ...}: { + imports = [inputs.home-manager.nixosModules.home-manager]; +} diff --git a/modules/nixos/traits/secrets.nix b/modules/nixos/traits/secrets.nix index 085d8f3..57762cd 100644 --- a/modules/nixos/traits/secrets.nix +++ b/modules/nixos/traits/secrets.nix @@ -1,6 +1,7 @@ { config, lib, + inputs, ... }: let cfg = config.traits.secrets; @@ -9,6 +10,8 @@ in { enable = lib.mkEnableOption "secrets management"; }; + imports = [inputs.agenix.nixosModules.default]; + config = lib.mkIf cfg.enable { age = { identityPaths = ["/etc/age/key"]; -- cgit v1.2.3