From d08a7ee0b01d83493316473d635a63d90b5a343f Mon Sep 17 00:00:00 2001
From: Nettika <git@nettika.cat>
Date: Sun, 6 Jul 2025 00:02:36 -0700
Subject: [PATCH] Move marauder configs into hosts directory

---
 flake.nix                                     |  22 +++++++++---------
 backup.nix => hosts/marauder/backup.nix       |   0
 .../marauder/default.nix                      |   2 ++
 .../marauder/secrets}/restic-env.age          |   0
 .../marauder/secrets}/restic-password.age     | Bin
 secrets.nix                                   |   8 +++++++
 secrets/secrets.nix                           |   8 -------
 7 files changed, 21 insertions(+), 19 deletions(-)
 rename backup.nix => hosts/marauder/backup.nix (100%)
 rename configuration.nix => hosts/marauder/default.nix (99%)
 rename {secrets => hosts/marauder/secrets}/restic-env.age (100%)
 rename {secrets => hosts/marauder/secrets}/restic-password.age (100%)
 create mode 100644 secrets.nix
 delete mode 100644 secrets/secrets.nix

diff --git a/flake.nix b/flake.nix
index d118a4d..3bae5f2 100755
--- a/flake.nix
+++ b/flake.nix
@@ -14,16 +14,16 @@
     common.url = "git+https://git.uninsane.org/nettika/nettika-common";
   };
 
-  outputs = { nixpkgs, phps, common, agenix, ... }: {
-    nixosConfigurations.marauder = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        ./configuration.nix
-        ./backup.nix
-        common.nixosModule
-        agenix.nixosModules.default
-      ];
-      specialArgs = { inherit phps agenix; };
+  outputs = { nixpkgs, phps, common, agenix, ... }:
+    let inherit (nixpkgs.lib) nixosSystem;
+    in {
+      nixosConfigurations = {
+        marauder = nixosSystem {
+          system = "x86_64-linux";
+          modules =
+            [ ./hosts/marauder common.nixosModule agenix.nixosModules.default ];
+          specialArgs = { inherit phps agenix; };
+        };
+      };
     };
-  };
 }
diff --git a/backup.nix b/hosts/marauder/backup.nix
similarity index 100%
rename from backup.nix
rename to hosts/marauder/backup.nix
diff --git a/configuration.nix b/hosts/marauder/default.nix
similarity index 99%
rename from configuration.nix
rename to hosts/marauder/default.nix
index e4339ad..1a33913 100755
--- a/configuration.nix
+++ b/hosts/marauder/default.nix
@@ -9,6 +9,8 @@ let
     ${pkgs.ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null -
   '';
 in {
+  imports = [ ./backup.nix ];
+
   nixpkgs.config.allowUnfree = true;
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/secrets/restic-env.age b/hosts/marauder/secrets/restic-env.age
similarity index 100%
rename from secrets/restic-env.age
rename to hosts/marauder/secrets/restic-env.age
diff --git a/secrets/restic-password.age b/hosts/marauder/secrets/restic-password.age
similarity index 100%
rename from secrets/restic-password.age
rename to hosts/marauder/secrets/restic-password.age
diff --git a/secrets.nix b/secrets.nix
new file mode 100644
index 0000000..493de1b
--- /dev/null
+++ b/secrets.nix
@@ -0,0 +1,8 @@
+let
+  marauder.nettika =
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHopty1QG8P+OfGxQ9CV0BI1IRB/q6yITzMZaZ6Zspid";
+in {
+  "hosts/marauder/secrets/restic-env.age".publicKeys = [ marauder.nettika ];
+  "hosts/marauder/secrets/restic-password.age".publicKeys =
+    [ marauder.nettika ];
+}
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
deleted file mode 100644
index 5e3f402..0000000
--- a/secrets/secrets.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-let
-  nettika =
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHopty1QG8P+OfGxQ9CV0BI1IRB/q6yITzMZaZ6Zspid";
-in {
-  "restic-env.age".publicKeys = [ nettika ];
-  "restic-password.age".publicKeys = [ nettika ];
-  "zerotier-networks.age".publicKeys = [ nettika ];
-}