From 8554b1b7337e0ab9a27d8fb73d8c5652e433eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Mon, 7 Feb 2022 15:29:45 +0100
Subject: [PATCH] :bug: fix deprecation errors

---
 flake.nix                        | 2 +-
 modules/cachix.nix               | 8 ++++----
 modules/cachix/nix-community.nix | 8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 56d8c29..6e3fce5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-21.11";
     nur.url = "github:nix-community/NUR";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.3.0";
+    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
     agenix.url = "github:ryantm/agenix";
 
     emacs-overlay.url = "github:nix-community/emacs-overlay";
diff --git a/modules/cachix.nix b/modules/cachix.nix
index 777f38f..063fdc3 100644
--- a/modules/cachix.nix
+++ b/modules/cachix.nix
@@ -5,9 +5,9 @@ let
   folder = ./cachix;
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in
-{
+  imports = lib.mapAttrsToList toImport
+    (lib.filterAttrs filterCaches (builtins.readDir folder));
+in {
   inherit imports;
-  nix.binaryCaches = [ "https://cache.nixos.org/" ];
+  nix.settings.substituters = [ "https://cache.nixos.org/" ];
 }
diff --git a/modules/cachix/nix-community.nix b/modules/cachix/nix-community.nix
index 7e4be28..2a6f291 100644
--- a/modules/cachix/nix-community.nix
+++ b/modules/cachix/nix-community.nix
@@ -1,9 +1,7 @@
 {
-  nix = {
-    binaryCaches = [
-      "https://nix-community.cachix.org"
-    ];
-    binaryCachePublicKeys = [
+  nix.settings = {
+    substituters = [ "https://nix-community.cachix.org" ];
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };