From 5e5678ec15ebcd55a05e923df7d9744773180caf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 18 May 2023 13:24:26 +1000
Subject: [PATCH] build0*: move into /hosts
---
.sops.yaml | 8 ++++----
dev/treefmt.nix | 2 +-
flake.nix | 8 ++++----
{build01 => hosts/build01}/configuration.nix | 0
{build01 => hosts/build01}/secrets.yaml | 0
{build02 => hosts/build02}/configuration.nix | 0
{build02 => hosts/build02}/gitconfig.txt | 0
{build02 => hosts/build02}/nixpkgs-update-backup.nix | 0
{build02 => hosts/build02}/nixpkgs-update.nix | 0
.../build02}/packages-with-update-script.nix | 0
{build02 => hosts/build02}/secrets.yaml | 0
{build03 => hosts/build03}/configuration.nix | 0
{build03 => hosts/build03}/secrets.yaml | 0
{build04 => hosts/build04}/configuration.nix | 0
{build04 => hosts/build04}/hardware-configuration.nix | 0
{build04 => hosts/build04}/secrets.yaml | 0
modules/nixos/sops-nix.nix | 2 +-
tasks.py | 2 +-
18 files changed, 11 insertions(+), 11 deletions(-)
rename {build01 => hosts/build01}/configuration.nix (100%)
rename {build01 => hosts/build01}/secrets.yaml (100%)
rename {build02 => hosts/build02}/configuration.nix (100%)
rename {build02 => hosts/build02}/gitconfig.txt (100%)
rename {build02 => hosts/build02}/nixpkgs-update-backup.nix (100%)
rename {build02 => hosts/build02}/nixpkgs-update.nix (100%)
rename {build02 => hosts/build02}/packages-with-update-script.nix (100%)
rename {build02 => hosts/build02}/secrets.yaml (100%)
rename {build03 => hosts/build03}/configuration.nix (100%)
rename {build03 => hosts/build03}/secrets.yaml (100%)
rename {build04 => hosts/build04}/configuration.nix (100%)
rename {build04 => hosts/build04}/hardware-configuration.nix (100%)
rename {build04 => hosts/build04}/secrets.yaml (100%)
diff --git a/.sops.yaml b/.sops.yaml
index 9351196..3f58a7d 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -25,7 +25,7 @@ creation_rules:
- *ryantm
- *zimbatm
- *zowoq
- - path_regex: build01/[^/]+\.yaml$
+ - path_regex: hosts/build01/[^/]+\.yaml$
key_groups:
- age:
- *build01
@@ -33,7 +33,7 @@ creation_rules:
- *ryantm
- *zimbatm
- *zowoq
- - path_regex: build02/[^/]+\.yaml$
+ - path_regex: hosts/build02/[^/]+\.yaml$
key_groups:
- age:
- *build02
@@ -41,7 +41,7 @@ creation_rules:
- *ryantm
- *zimbatm
- *zowoq
- - path_regex: build03/[^/]+\.yaml$
+ - path_regex: hosts/build03/[^/]+\.yaml$
key_groups:
- age:
- *build03
@@ -49,7 +49,7 @@ creation_rules:
- *ryantm
- *zimbatm
- *zowoq
- - path_regex: build04/[^/]+\.yaml$
+ - path_regex: hosts/build04/[^/]+\.yaml$
key_groups:
- age:
- *build04
diff --git a/dev/treefmt.nix b/dev/treefmt.nix
index d300022..e158d5b 100644
--- a/dev/treefmt.nix
+++ b/dev/treefmt.nix
@@ -26,7 +26,7 @@
excludes = [
"nix/sources.nix"
# vendored from external source
- "build02/packages-with-update-script.nix"
+ "hosts/build02/packages-with-update-script.nix"
];
};
diff --git a/flake.nix b/flake.nix
index 83556f6..0b218a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,19 +98,19 @@
{
build01 = nixosSystem {
system = "x86_64-linux";
- modules = [ ./build01/configuration.nix ];
+ modules = [ ./hosts/build01/configuration.nix ];
};
build02 = nixosSystem {
system = "x86_64-linux";
- modules = [ ./build02/configuration.nix ];
+ modules = [ ./hosts/build02/configuration.nix ];
};
build03 = nixosSystem {
system = "x86_64-linux";
- modules = [ ./build03/configuration.nix ];
+ modules = [ ./hosts/build03/configuration.nix ];
};
build04 = nixosSystem {
system = "aarch64-linux";
- modules = [ ./build04/configuration.nix ];
+ modules = [ ./hosts/build04/configuration.nix ];
};
};
diff --git a/build01/configuration.nix b/hosts/build01/configuration.nix
similarity index 100%
rename from build01/configuration.nix
rename to hosts/build01/configuration.nix
diff --git a/build01/secrets.yaml b/hosts/build01/secrets.yaml
similarity index 100%
rename from build01/secrets.yaml
rename to hosts/build01/secrets.yaml
diff --git a/build02/configuration.nix b/hosts/build02/configuration.nix
similarity index 100%
rename from build02/configuration.nix
rename to hosts/build02/configuration.nix
diff --git a/build02/gitconfig.txt b/hosts/build02/gitconfig.txt
similarity index 100%
rename from build02/gitconfig.txt
rename to hosts/build02/gitconfig.txt
diff --git a/build02/nixpkgs-update-backup.nix b/hosts/build02/nixpkgs-update-backup.nix
similarity index 100%
rename from build02/nixpkgs-update-backup.nix
rename to hosts/build02/nixpkgs-update-backup.nix
diff --git a/build02/nixpkgs-update.nix b/hosts/build02/nixpkgs-update.nix
similarity index 100%
rename from build02/nixpkgs-update.nix
rename to hosts/build02/nixpkgs-update.nix
diff --git a/build02/packages-with-update-script.nix b/hosts/build02/packages-with-update-script.nix
similarity index 100%
rename from build02/packages-with-update-script.nix
rename to hosts/build02/packages-with-update-script.nix
diff --git a/build02/secrets.yaml b/hosts/build02/secrets.yaml
similarity index 100%
rename from build02/secrets.yaml
rename to hosts/build02/secrets.yaml
diff --git a/build03/configuration.nix b/hosts/build03/configuration.nix
similarity index 100%
rename from build03/configuration.nix
rename to hosts/build03/configuration.nix
diff --git a/build03/secrets.yaml b/hosts/build03/secrets.yaml
similarity index 100%
rename from build03/secrets.yaml
rename to hosts/build03/secrets.yaml
diff --git a/build04/configuration.nix b/hosts/build04/configuration.nix
similarity index 100%
rename from build04/configuration.nix
rename to hosts/build04/configuration.nix
diff --git a/build04/hardware-configuration.nix b/hosts/build04/hardware-configuration.nix
similarity index 100%
rename from build04/hardware-configuration.nix
rename to hosts/build04/hardware-configuration.nix
diff --git a/build04/secrets.yaml b/hosts/build04/secrets.yaml
similarity index 100%
rename from build04/secrets.yaml
rename to hosts/build04/secrets.yaml
diff --git a/modules/nixos/sops-nix.nix b/modules/nixos/sops-nix.nix
index 48bf6e9..76bc786 100644
--- a/modules/nixos/sops-nix.nix
+++ b/modules/nixos/sops-nix.nix
@@ -1,6 +1,6 @@
{ config, inputs, lib, ... }:
let
- defaultSopsPath = "${toString inputs.self}/${config.networking.hostName}/secrets.yaml";
+ defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
in
{
sops.defaultSopsFile = lib.mkIf (builtins.pathExists defaultSopsPath) defaultSopsPath;
diff --git a/tasks.py b/tasks.py
index a6f733f..bba9425 100644
--- a/tasks.py
+++ b/tasks.py
@@ -158,7 +158,7 @@ def decrypt_host_key(flake_attr, tmpdir):
"--extract",
'["ssh_host_ed25519_key"]',
"--decrypt",
- f"{ROOT}/{flake_attr}/secrets.yaml",
+ f"{ROOT}/hosts/{flake_attr}/secrets.yaml",
],
check=True,
stdout=fh,