From 41b772c6d1c3c08414b5ccc4668c5a2e4a1fefe5 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 6 Jan 2024 16:35:54 -0800 Subject: [PATCH] refactor: systems/ folder --- .sops.yaml | 10 +++++----- devShell.nix | 1 + meta.nix | 8 ++++---- nixos/deploy.sh | 1 - {ct => systems/ct}/nixos.nix | 0 {mew => systems/tei}/nixos.nix | 0 {mew => systems/tei}/secrets.yaml | 0 {tewi => systems/tewi}/access.nix | 0 {tewi => systems/tewi}/androidtvremote2.nix | 0 {tewi => systems/tewi}/cloudflared.nix | 0 {tewi => systems/tewi}/deluge.nix | 0 {tewi => systems/tewi}/home-assistant.nix | 0 {tewi => systems/tewi}/kanidm.nix | 0 {tewi => systems/tewi}/mediatomb.nix | 0 {tewi => systems/tewi}/mosquitto.nix | 0 {tewi => systems/tewi}/nginx.nix | 0 {tewi => systems/tewi}/nixos.nix | 0 {tewi => systems/tewi}/postgres.nix | 0 {tewi => systems/tewi}/secrets.yaml | 0 {tewi => systems/tewi}/syncplay.nix | 0 {tewi => systems/tewi}/vouch.nix | 0 {tewi => systems/tewi}/zigbee2mqtt.nix | 0 22 files changed, 10 insertions(+), 10 deletions(-) rename {ct => systems/ct}/nixos.nix (100%) rename {mew => systems/tei}/nixos.nix (100%) rename {mew => systems/tei}/secrets.yaml (100%) rename {tewi => systems/tewi}/access.nix (100%) rename {tewi => systems/tewi}/androidtvremote2.nix (100%) rename {tewi => systems/tewi}/cloudflared.nix (100%) rename {tewi => systems/tewi}/deluge.nix (100%) rename {tewi => systems/tewi}/home-assistant.nix (100%) rename {tewi => systems/tewi}/kanidm.nix (100%) rename {tewi => systems/tewi}/mediatomb.nix (100%) rename {tewi => systems/tewi}/mosquitto.nix (100%) rename {tewi => systems/tewi}/nginx.nix (100%) rename {tewi => systems/tewi}/nixos.nix (100%) rename {tewi => systems/tewi}/postgres.nix (100%) rename {tewi => systems/tewi}/secrets.yaml (100%) rename {tewi => systems/tewi}/syncplay.nix (100%) rename {tewi => systems/tewi}/vouch.nix (100%) rename {tewi => systems/tewi}/zigbee2mqtt.nix (100%) diff --git a/.sops.yaml b/.sops.yaml index 76010d84..42495f34 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,9 +3,9 @@ keys: - &mew 65BD3044771CB6FB - &tewi_gen age17haatqc7gpk9t690affyqcvwmhmz0us95en2r7qpqzw29tpq3ffspld0cf - &tewi_osh age172nhlv3py990k2rgw64hy27hffmnpv6ssxyu9fepww7zxfgg347qna4gzt -- &mew_osh age16vcudjuaf3j28vlc44n78ly9eztrwekjss2kstzx9yhhutl9vpdsq58wtv +- &tei_osh age16vcudjuaf3j28vlc44n78ly9eztrwekjss2kstzx9yhhutl9vpdsq58wtv creation_rules: -- path_regex: 'tewi/secrets\.yaml$' +- path_regex: 'systems/tewi/secrets\.yaml$' shamir_threshold: 1 key_groups: - pgp: &pgp_common @@ -14,13 +14,13 @@ creation_rules: age: - *tewi_gen - *tewi_osh -- path_regex: 'mew/secrets\.yaml$' +- path_regex: 'systems/tei/secrets\.yaml$' shamir_threshold: 1 key_groups: - pgp: *pgp_common age: - - *mew_osh -- path_regex: '[^/]+/secrets\.yaml$' + - *tei_osh +- path_regex: 'systems/[^/]+/secrets\.yaml$' shamir_threshold: 1 key_groups: - pgp: *pgp_common diff --git a/devShell.nix b/devShell.nix index f5bda409..135056bf 100644 --- a/devShell.nix +++ b/devShell.nix @@ -39,6 +39,7 @@ pkgs.mkShell { export CI_PLATFORM="impure" export NF_CONFIG_ROOT=''${NF_CONFIG_ROOT-${toString ./.}} export NIX_PATH="$NIX_PATH:home=$NF_CONFIG_ROOT" + export NIX_SSHOPTS="''${NIX_SSHOPTS--p62954}" ''; } diff --git a/meta.nix b/meta.nix index c4da5aed..e0906970 100644 --- a/meta.nix +++ b/meta.nix @@ -21,19 +21,19 @@ { network.nodes.tewi = { imports = [ - ./tewi/nixos.nix + ./systems/tewi/nixos.nix nixfiles.nixos.base ]; }; - network.nodes.mew = { + network.nodes.tei = { imports = [ - ./mew/nixos.nix + ./systems/tei/nixos.nix nixfiles.nixos.base ]; }; network.nodes.reisen-ct = { imports = [ - ./ct/nixos.nix + ./systems/ct/nixos.nix nixfiles.nixos.base ]; }; diff --git a/nixos/deploy.sh b/nixos/deploy.sh index 2c11200b..fd9778b2 100755 --- a/nixos/deploy.sh +++ b/nixos/deploy.sh @@ -6,7 +6,6 @@ NF_CONFIG_ROOT=${NF_CONFIG_ROOT-.} NF_HOST=${NF_HOST-tewi} NIXOS_TOPLEVEL=network.nodes.$NF_HOST.system.build.toplevel NF_ADDR=${NF_ADDR-${NF_HOST}} -export NIX_SSHOPTS="${NIX_SSHOPTS--p62954}" if [[ $1 = tarball ]]; then shift diff --git a/ct/nixos.nix b/systems/ct/nixos.nix similarity index 100% rename from ct/nixos.nix rename to systems/ct/nixos.nix diff --git a/mew/nixos.nix b/systems/tei/nixos.nix similarity index 100% rename from mew/nixos.nix rename to systems/tei/nixos.nix diff --git a/mew/secrets.yaml b/systems/tei/secrets.yaml similarity index 100% rename from mew/secrets.yaml rename to systems/tei/secrets.yaml diff --git a/tewi/access.nix b/systems/tewi/access.nix similarity index 100% rename from tewi/access.nix rename to systems/tewi/access.nix diff --git a/tewi/androidtvremote2.nix b/systems/tewi/androidtvremote2.nix similarity index 100% rename from tewi/androidtvremote2.nix rename to systems/tewi/androidtvremote2.nix diff --git a/tewi/cloudflared.nix b/systems/tewi/cloudflared.nix similarity index 100% rename from tewi/cloudflared.nix rename to systems/tewi/cloudflared.nix diff --git a/tewi/deluge.nix b/systems/tewi/deluge.nix similarity index 100% rename from tewi/deluge.nix rename to systems/tewi/deluge.nix diff --git a/tewi/home-assistant.nix b/systems/tewi/home-assistant.nix similarity index 100% rename from tewi/home-assistant.nix rename to systems/tewi/home-assistant.nix diff --git a/tewi/kanidm.nix b/systems/tewi/kanidm.nix similarity index 100% rename from tewi/kanidm.nix rename to systems/tewi/kanidm.nix diff --git a/tewi/mediatomb.nix b/systems/tewi/mediatomb.nix similarity index 100% rename from tewi/mediatomb.nix rename to systems/tewi/mediatomb.nix diff --git a/tewi/mosquitto.nix b/systems/tewi/mosquitto.nix similarity index 100% rename from tewi/mosquitto.nix rename to systems/tewi/mosquitto.nix diff --git a/tewi/nginx.nix b/systems/tewi/nginx.nix similarity index 100% rename from tewi/nginx.nix rename to systems/tewi/nginx.nix diff --git a/tewi/nixos.nix b/systems/tewi/nixos.nix similarity index 100% rename from tewi/nixos.nix rename to systems/tewi/nixos.nix diff --git a/tewi/postgres.nix b/systems/tewi/postgres.nix similarity index 100% rename from tewi/postgres.nix rename to systems/tewi/postgres.nix diff --git a/tewi/secrets.yaml b/systems/tewi/secrets.yaml similarity index 100% rename from tewi/secrets.yaml rename to systems/tewi/secrets.yaml diff --git a/tewi/syncplay.nix b/systems/tewi/syncplay.nix similarity index 100% rename from tewi/syncplay.nix rename to systems/tewi/syncplay.nix diff --git a/tewi/vouch.nix b/systems/tewi/vouch.nix similarity index 100% rename from tewi/vouch.nix rename to systems/tewi/vouch.nix diff --git a/tewi/zigbee2mqtt.nix b/systems/tewi/zigbee2mqtt.nix similarity index 100% rename from tewi/zigbee2mqtt.nix rename to systems/tewi/zigbee2mqtt.nix