Move marauder configs into hosts directory

flake.nix

@@ -14,16 +14,16 @@
     common.url = "git+https://git.uninsane.org/nettika/nettika-common";
   };
 
-  outputs = { nixpkgs, phps, common, agenix, ... }: {
+  outputs = { nixpkgs, phps, common, agenix, ... }:
-    nixosConfigurations.marauder = nixpkgs.lib.nixosSystem {
+    let inherit (nixpkgs.lib) nixosSystem;
-      system = "x86_64-linux";
+    in {
-      modules = [
+      nixosConfigurations = {
-        ./configuration.nix
+        marauder = nixosSystem {
-        ./backup.nix
+          system = "x86_64-linux";
-        common.nixosModule
+          modules =
-        agenix.nixosModules.default
+            [ ./hosts/marauder common.nixosModule agenix.nixosModules.default ];
-      ];
+          specialArgs = { inherit phps agenix; };
-      specialArgs = { inherit phps agenix; };
+        };
+      };
     };
-  };
 }

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

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

secrets/secrets.nix

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