From d63e7615bccce4bfe64e41876c2eebcc59c49966 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Mon, 8 Jul 2024 17:54:12 -0400
Subject: [PATCH] hosts: consolidate substituters

---
 flake.nix                                 |  8 +++++++-
 hosts/common.nix                          | 19 ++++++++++++++++++-
 nixosModules/desktop/hyprland/default.nix | 13 -------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 645d5e91..07c21ae6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,9 +27,15 @@
   };
 
   nixConfig = {
-    extra-substituters = ["https://hyprland.cachix.org"];
+    extra-substituters = [
+      "https://alyraffauf.cachix.org"
+      "https://hyprland.cachix.org"
+      "https://nix-community.cachix.org"
+    ];
     extra-trusted-public-keys = [
+      "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
 
diff --git a/hosts/common.nix b/hosts/common.nix
index de6757c6..9f4c3820 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -79,7 +79,24 @@
     }
   ];
 
-  nix.settings.trusted-users = ["aly"];
+  nix = {
+    settings = {
+      substituters = [
+        "https://alyraffauf.cachix.org"
+        "https://cache.nixos.org/"
+        "https://hyprland.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
+
+      trusted-public-keys = [
+        "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+
+      trusted-users = ["aly"];
+    };
+  };
 
   nixpkgs = {
     config.allowUnfree = true; # Allow unfree packages
diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix
index b3bcea96..3fe150d3 100644
--- a/nixosModules/desktop/hyprland/default.nix
+++ b/nixosModules/desktop/hyprland/default.nix
@@ -6,19 +6,6 @@
   ...
 }: {
   config = lib.mkIf config.ar.desktop.hyprland.enable {
-    nix.settings = {
-      auto-optimise-store = false;
-
-      substituters = [
-        "https://hyprland.cachix.org"
-        "https://cache.nixos.org/"
-      ];
-
-      trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-    };
-
     programs = {
       hyprland = {
         enable = true;