From ef9d46a1c4262a0e06d1f165d70272feb4571115 Mon Sep 17 00:00:00 2001 From: sstent Date: Sun, 19 Nov 2023 21:27:39 +0000 Subject: [PATCH] finish nomad, add consul, sops --- modules/common.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/common.nix b/modules/common.nix index 5e7d10a..6c12729 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -10,23 +10,23 @@ ./nomad.nix ./odroid-m1-setleds.nix ./odroid-m1.nix - #inputs.sops-nix.nixosModules.sops + inputs.sops-nix.nixosModules.sops ]; - ###secretstore path variable - # options._secretstore = lib.mkOption { - # type = lib.types.str; - # default = "${inputs.self}/secrets"; - # description = "Path to the Secrets storage"; - # }; + ##secretstore path variable + options._secretstore = lib.mkOption { + type = lib.types.str; + default = "${inputs.self}/secrets"; + description = "Path to the Secrets storage"; + }; - # config = { + config = { system.stateVersion = "23.11"; # Did you read the comment? - # sops = { - # defaultSopsFile = "${config._secretstore}/host-secrets.yaml"; - # age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; - # }; + sops = { + defaultSopsFile = "${config._secretstore}/host-secrets.yaml"; + age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; + }; # Enable nix flakes nix.package = pkgs.nixFlakes; @@ -46,5 +46,5 @@ nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; }; users.extraUsers.root.initialPassword = lib.mkForce "odroid"; } - # ; -# } + ; +}