summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2023-10-12 10:28:39 +0000
committerMike Vink <mike1994vink@gmail.com>2023-10-12 10:28:39 +0000
commit7dcfcc34fac18ace170dc5aeaf049edf82f8f158 (patch)
treeac12ce22755fd5d321dd96452d26a10485977624
parenta73532c19d9fa547a6330421e3093256e9d65b3c (diff)
fixup
-rw-r--r--flake.nix4
-rw-r--r--profiles/core/secrets.nix26
2 files changed, 15 insertions, 15 deletions
diff --git a/flake.nix b/flake.nix
index 764acd8..f2afd92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
])));
};
- nixosConfigurations.core = nixpkgs.lib.nixosSystem {
+ nixosConfigurations.core = extraModules: nixpkgs.lib.nixosSystem {
inherit lib system;
specialArgs = {inherit inputs;};
modules = [
@@ -57,7 +57,7 @@
] ++ (attrValues
(attrsets.mergeAttrsList (map modulesIn [
./profiles/core
- ])));
+ ]))) ++ extraModules;
};
templates = {
diff --git a/profiles/core/secrets.nix b/profiles/core/secrets.nix
index 9d38c95..c7a3ba5 100644
--- a/profiles/core/secrets.nix
+++ b/profiles/core/secrets.nix
@@ -10,19 +10,19 @@
age.sshKeyPaths = [];
age.keyFile = "${config.hm.xdg.configHome}/sops/age/keys.txt";
- secrets = mapAttrs' (name: _: let
- parts = splitString "." name;
- base = head parts;
- format = if length parts > 1 then elemAt parts 1 else "binary";
- in
- {
- name = base;
- value = {
- sopsFile = "${inputs.self}/secrets/${name}";
- inherit format;
- key = "lemptop"; # TODO: get actual hostname from somewhere
- };
- }) (builtins.readDir "${inputs.self}/secrets"); # keep it out of the store
+ # secrets = mapAttrs' (name: _: let
+ # parts = splitString "." name;
+ # base = head parts;
+ # format = if length parts > 1 then elemAt parts 1 else "binary";
+ # in
+ # {
+ # name = base;
+ # value = {
+ # sopsFile = "${inputs.self}/secrets/${name}";
+ # inherit format;
+ # key = "lemptop"; # TODO: get actual hostname from somewhere
+ # };
+ # }) (builtins.readDir "${inputs.self}/secrets"); # keep it out of the store
};
environment = {