From adc444b2742c8b3ec64f5cf9f4d0bf2c2a2fc2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Wed, 4 Jan 2023 08:41:38 +0000
Subject: [PATCH] allow foureighty to acces new store

---
 nixos/boxes/bolty/nix-store-server.nix |  1 +
 nixos/distributed-builds.nix           | 33 ++++++++++++--------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nixos/boxes/bolty/nix-store-server.nix b/nixos/boxes/bolty/nix-store-server.nix
index fd0640f5..b4795842 100644
--- a/nixos/boxes/bolty/nix-store-server.nix
+++ b/nixos/boxes/bolty/nix-store-server.nix
@@ -5,6 +5,7 @@
     write = true;
     keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4OvRjIUlO2TGPTjYNXbgFuP95uvbszyBjqvAC+Z8zH release-bot@cyplo.dev"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
     ];
   };
 }
diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix
index 6d0fd74f..6d915176 100644
--- a/nixos/distributed-builds.nix
+++ b/nixos/distributed-builds.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{ config, pkgs, ... }: {
   programs.ssh.extraConfig = ''
     Host vpsfree1
         HostName vpsfree1
@@ -10,22 +6,23 @@
     StrictHostKeyChecking=accept-new
   '';
 
-  nix.buildMachines = [
-    {
-      hostName = "bolty";
-      sshUser = "nix-builder";
-      sshKey = "/home/cyryl/.ssh/id_ed25519";
-      systems = ["i686-linux" "x86_64-linux" "aarch64-linux"];
-      maxJobs = 2;
-      speedFactor = 1;
-      supportedFeatures = ["kvm" "big-parallel"];
-      mandatoryFeatures = [];
-    }
-  ];
+  nix.buildMachines = [{
+    hostName = "bolty";
+    sshUser = "nix-builder";
+    sshKey = "/home/cyryl/.ssh/id_ed25519";
+    systems = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+    maxJobs = 2;
+    speedFactor = 1;
+    supportedFeatures = [ "kvm" "big-parallel" ];
+    mandatoryFeatures = [ ];
+  }];
 
   nix.extraOptions = ''
     builders-use-substitutes = true
   '';
   nix.distributedBuilds = true;
-  nix.settings.substituters = ["s3://nix-store?endpoint=objects.cyplo.dev&scheme=https&region=cyplodev" "https://cache.nixos.org/"];
+  nix.settings.substituters =
+    [ "ssh://nix-ssh@bolty.raptor-carp.ts.net" "https://cache.nixos.org/" ];
+  nix.settings.trusted-public-keys =
+    [ "cyplodev-store-key:a/+PEufePs7giWqYyRqy+TgUKLMbY+RQuJQu2aUjdl8=" ];
 }