refactor: systems/ folder

.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

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}"
   '';
 }
 

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
           ];
         };

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