v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

nixos, terraform: minor updates

Browse source
This commit is contained in:
Vivian 2021-11-24 22:41:26 +01:00
parent a17aad8051
commit becbb6e85e
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -25,7 +25,7 @@
"${profile}" = lib.nixosSystem {
inherit system;
modules =
[ ./nixos/common ./nixos/hosts/${profile}/configuration.nix ]
[ ./nixos/common "${./.}/nixos/hosts/${profile}/configuration.nix" ]
++ (if lxc then [
"${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix"
./nixos/common/generic-lxc.nix
@ -54,7 +54,7 @@
pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [ vault-secrets.overlay ];
deployChecks = mapAttrs (_: lib: lib.deployChecks self.deploy) deploy-rs.lib;
checks = {};
checks = { };
in {
# Make the config and deploy sets
nixosConfigurations = lib.foldr (el: acc: acc // mkConfig el) { } nixHosts;
@ -84,8 +84,8 @@
nixfmt
nixUnstable
vault
(vault-push-approle-envs self { })
(vault-push-approles self { })
(vault-push-approle-envs self { })
];
};