gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 20:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules/nixos/{tf-glue,deploy} -> modules/nixos/deploy-tf

Browse source
This commit is contained in:
kat witch 2021-05-05 14:52:23 +01:00
parent 1b86e814b5
commit 064b3abcf8
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
3 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/nixos/default.nix
View file

@ -3,9 +3,8 @@
let hexchen = (import sources.nix-hexchen) { };
in {
imports = [
./deploy
./katnet
./tf-glue
./deploy-tf
(sources.pbb-nixfiles + "/modules/nftables")
(sources.tf-nix + "/modules/nixos/secrets.nix")
(sources.tf-nix + "/modules/nixos/secrets-users.nix")

5
modules/nixos/tf-glue/default.nix → modules/nixos/deploy-tf/default.nix
View file

@ -7,6 +7,11 @@ let
merge = loc: defs: map (def: def.value) defs;
};
in {
options.deploy.target = mkOption {
type = with types; str;
default = "";
};
options.deploy.tf = mkOption {
type = types.submodule {
freeformType = types.attrsOf unmergedValues;

14
modules/nixos/deploy/default.nix
View file

@ -1,14 +0,0 @@
{ config, pkgs, lib, options, ... }:
with lib;
{
options = {
deploy = {
target = mkOption {
type = with types; str;
default = "";
};
};
};
}