From 0116d66752a90160b11e20ad44b80308d612c28d Mon Sep 17 00:00:00 2001
From: Wittano <radoslaw.ratyna@gmail.com>
Date: Sat, 27 Jan 2024 12:34:07 +0100
Subject: [PATCH] fix(cachix): moved cachix repos to flake.nix

---
 configuration.nix | 11 -----------
 flake.lock        | 12 ++++++------
 flake.nix         | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 7fa1960c..9b55f9a9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,17 +14,6 @@
       max-jobs = 4;
       cores = 4;
       auto-optimise-store = true;
-      substituters = [
-        "https://wittano-nix-repo.cachix.org"
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-        "https://hyprland.cachix.org"
-      ];
-      trusted-public-keys = [
-        "wittano-nix-repo.cachix.org-1:SqjGwMsbzVQOXhbS90DXFC7AoGH99dzPy8zixK3cyt0="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
     };
     gc = {
       automatic = true;
diff --git a/flake.lock b/flake.lock
index 8548e2fe..d3691d32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -269,11 +269,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1705856552,
-        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
+        "lastModified": 1706191920,
+        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
+        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1705916986,
-        "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
+        "lastModified": 1706098335,
+        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
+        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a69416c4..649406e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,22 @@
 {
   description = "Wittano NixOS configuration";
 
+  nixConfig = {
+    extra-substituters = [
+      "https://ezkea.cachix.org"
+      "https://wittano-nix-repo.cachix.org"
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
+      "wittano-nix-repo.cachix.org-1:SqjGwMsbzVQOXhbS90DXFC7AoGH99dzPy8zixK3cyt0="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+    ];
+  };
+
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";