From 918b1dafb8f6d00640fb39775ea047bf5392ef7a Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Mon, 29 May 2023 14:11:41 +0200
Subject: [PATCH] refactor: move nixConfig to flake.nix

---
 flake.nix                   | 17 +++++++++++++++++
 machines/common/default.nix | 15 ---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 706a067..da2c800 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,23 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
+  nixConfig = {
+    extra-substituters = [
+      "https://catppuccin.cachix.org"
+      "https://mic92.cachix.org"
+      "https://nekowinston.cachix.org"
+      "https://nix-community.cachix.org"
+      "https://pre-commit-hooks.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU="
+      "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
+      "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
+    ];
+  };
+
   outputs = {
     self,
     darwin,
diff --git a/machines/common/default.nix b/machines/common/default.nix
index 8d85ae2..69d98f1 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -6,21 +6,6 @@
     settings = {
       experimental-features = ["nix-command" "flakes" "repl-flake"];
       auto-optimise-store = pkgs.stdenv.isLinux;
-      substituters = [
-        "https://catppuccin.cachix.org"
-        "https://mic92.cachix.org"
-        "https://nekowinston.cachix.org"
-        "https://nix-community.cachix.org"
-        "https://pre-commit-hooks.cachix.org"
-      ];
-      # configuration.nix
-      trusted-public-keys = [
-        "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU="
-        "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
-        "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
-      ];
       # consider downloaded tarballs as fresh for 7 days
       tarball-ttl = 604800;
     };