fix up some path names

data/piped/pipedClusterConfig.nix

@@ -1,5 +1,5 @@
 let
-  internalWireGuard = import ./chaosInternalWireGuard.nix;
+  internalWireGuard = import ../wireguard/chaosInternalWireGuard.nix;
   ports = import ./pipedClusterPorts.nix;
 in rec {
   inherit ports;
@@ -27,6 +27,8 @@ in rec {
       joinString = "${ip}:${toString ports.cockroachDB}";
       advertiseAddr = joinString;
 
+      resticBucket = "Piped-UK";
+
       vaultUserName = "rapsberry-container-piped-uk";
 
       baseDomain = "piped-uk.owo.monster";

extras/mk-raspberry-ext-drive.nix

@@ -4,7 +4,7 @@
   btrfs-progs,
   writeShellApplication,
 }: let
-  externalDriveData = import ../data/raspberryExternalDrive.nix;
+  externalDriveData = import ../data/drives/raspberryExternalDrive.nix;
 in (writeShellApplication {
   name = "mk-raspberry-ext-drive";
   runtimeInputs = [

hosts/hetzner-vm/containers/social/default.nix

@@ -55,7 +55,7 @@ in {
         ]
         ++ (with hosts.hetzner-vm.containers.social; [
           profiles.gotosocial
-          profiles.backups
+          profiles.restic
         ]);
 
       environment.systemPackages = with pkgs; [

hosts/raspberry/profiles/cockroachDB.nix

@@ -1,5 +1,5 @@
 {self, ...}: let
-  internalWireGuard = import "${self}/data/chaosInternalWireGuard.nix";
+  internalWireGuard = import "${self}/data/wireguard/chaosInternalWireGuard.nix";
 in {
   systemd.tmpfiles.rules = [
     "d /var/lib/cockroachdb-certs - root root"

hosts/raspberry/profiles/externalDrive.nix

@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  externalDriveData = import "${self}/data/raspberryExternalDrive.nix";
+  externalDriveData = import "${self}/drives/data/raspberryExternalDrive.nix";
 
   mountExternalDrive = let
     jq = "${pkgs.jq}/bin/jq";

hosts/vault/secrets.nix

@@ -27,9 +27,7 @@
         manual = true;
       };
 
-      # this doesn't need to be a secret and can be generated at install time
-      # but it makes it easier to install.
-      # it's stored in /nix store anyway
+r
       ssh_host_ed25519_key = {
         path = "/ssh_host_ed25519_key";
         permissions = "600";

lib/internalWireGuardLib.nix

@@ -8,7 +8,7 @@
   inherit (lib.strings) concatStringsSep;
   inherit (builtins) attrNames;
 
-  wireguardData = import ../data/chaosInternalWireGuard.nix;
+  wireguardData = import ../data/wireguard/chaosInternalWireGuard.nix;
   wireguardHosts = wireguardData.hosts;
 
   kvPathForHost = host: "/private-public-keys/wireguard/chaos-internal/${host}";

outputs.nix

@@ -63,7 +63,7 @@ in
             inherit pkgs;
           };
 
-          wireguardData = import ./data/chaosInternalWireGuard.nix;
+          wireguardData = import ./data/wireguard/chaosInternalWireGuard.nix;
           hostsWithWireGuard = builtins.attrNames wireguardData.hosts;
         in {
           packages = mergeAttrsList [

presets/nixos/encryptedDrive.nix

@@ -7,8 +7,8 @@
 }: let
   inherit (lib.modules) mkBefore;
 
-  encryptedUSB = import "${self}/data/encryptedUSB.nix";
-  driveData = import "${self}/data/drives/normalEncryptedDrive.nix";
+  encryptedUSB = import "${self}/data/drives/encryptedUSB.nix";
+  driveData = import "${self}/data/drives/encryptedDrive.nix";
 in {
   boot = {
     initrd.availableKernelModules = [

profiles/chaosInternalWireGuard/wireguard.nix

@@ -11,7 +11,7 @@
   # Assume this to be set
   secrets = config.services.secrets.secrets;
 
-  wireguardData = import "${self}/data/chaosInternalWireGuard.nix";
+  wireguardData = import "${self}/data/wireguard/chaosInternalWireGuard.nix";
   wireguardHosts = wireguardData.hosts;
 
   currentHostName = config.networking.hostName;

profiles/usbAutoMount.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  encryptedUSB = import ../data/encryptedUSB.nix;
+  encryptedUSB = import ../data/drives/encryptedUSB.nix;
 
   encUSBMount = pkgs.writeShellScriptBin "enc_usb_mount" ''
     set -x