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

feat: kw -> nixfiles, kw.secrets -> secrets

Browse source
This commit is contained in:
Kat Inskip 2022-10-02 14:57:26 -07:00
parent 9794026f6c
commit ece1dbe466
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
63 changed files with 180 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/kat.nix
View file

@ -11,7 +11,7 @@
];
shell = pkgs.zsh;
extraGroups = [ "wheel" "video" "systemd-journal" "plugdev" "bird2" "vfio" "input" "uinput" ];
hashedPassword = mkIf (meta.trusted ? secrets) (removeSuffix "\n" config.kw.secrets.repo.kat-user.text);
hashedPassword = mkIf (meta.trusted ? secrets) (removeSuffix "\n" config.secrets.repo.kat-user.text);
};
systemd.tmpfiles.rules = [

2
nixos/network.nix
View file

@ -302,7 +302,7 @@
variables = {
tailscale-authkey.export = true;
tailscale-apikey = {
value.shellCommand = "${meta.kw.secrets.command} secrets/tailscale -f api_key";
value.shellCommand = "${meta.secrets.command} secrets/tailscale -f api_key";
sensitive = true;
export = true;
};

4
nixos/systems/daiyousei.nix
View file

@ -1,4 +1,4 @@
{ config, inputs, tf, meta, kw, pkgs, lib, ... }: with lib; {
{ config, inputs, tf, meta, nixfiles, pkgs, lib, ... }: with lib; {
imports = with meta; [
hardware.aarch64-linux
hardware.oracle.ubuntu
@ -23,7 +23,7 @@
services.znc
];
kw.oci = {
nixfiles.oci = {
specs = {
shape = "VM.Standard.A1.Flex";
cores = 4;

4
nixos/systems/rinnosuke.nix
View file

@ -1,4 +1,4 @@
{ config, tf, meta, kw, pkgs, lib, ... }: with lib; {
{ config, tf, meta, nixfiles, pkgs, lib, ... }: with lib; {
imports = with meta; [
hardware.oracle.ubuntu
nixos.network
@ -6,7 +6,7 @@
services.knot
];
kw.oci = {
nixfiles.oci = {
specs = {
shape = "VM.Standard.E2.1.Micro";
cores = 1;

2
nixos/systems/tewi/home-assistant.nix
View file

@ -17,7 +17,7 @@
];
};
kw.secrets.variables.ha-integration = {
secrets.variables.ha-integration = {
path = "secrets/home-assistant";
field = "notes";
};

8
nixos/systems/tewi/mosquitto.nix
View file

@ -6,22 +6,22 @@
];
};
kw.secrets.variables.z2m-pass = {
secrets.variables.z2m-pass = {
path = "secrets/mosquitto";
field = "z2m";
};
kw.secrets.variables.systemd-pass = {
secrets.variables.systemd-pass = {
path = "secrets/mosquitto";
field = "systemd";
};
kw.secrets.variables.hass-pass = {
secrets.variables.hass-pass = {
path = "secrets/mosquitto";
field = "hass";
};
kw.secrets.variables.espresence-pass = {
secrets.variables.espresence-pass = {
path = "secrets/mosquitto";
field = "espresence";
};

4
nixos/systems/tewi/vouch.nix
View file

@ -62,12 +62,12 @@
};
};
config = {
kw.secrets.variables.gensokyo-id = {
secrets.variables.gensokyo-id = {
path = "secrets/id.gensokyo.zone";
field = "client_secret";
};
kw.secrets.variables.gensokyo-jwt = {
secrets.variables.gensokyo-jwt = {
path = "secrets/id.gensokyo.zone";
field = "jwt";
};

4
nixos/systems/tewi/zigbee2mqtt.nix
View file

@ -6,12 +6,12 @@
];
};
kw.secrets.variables.z2m-mqtt-password = {
secrets.variables.z2m-mqtt-password = {
path = "secrets/mosquitto";
field = "z2m";
};
kw.secrets.variables.z2m-network-key = {
secrets.variables.z2m-network-key = {
path = "secrets/zigbee2mqtt";
field = "password";
};