From ff9aa4738bb7b198677bacd7e5ffbb3201119c16 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 19 Mar 2022 00:11:07 +0100
Subject: [PATCH] Fixed nix renamed options and broken post-build hook

---
 nixos/gorgon/configuration.nix | 1 -
 nixos/modules/nix.nix          | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix
index e90efa2..3548c19 100644
--- a/nixos/gorgon/configuration.nix
+++ b/nixos/gorgon/configuration.nix
@@ -18,7 +18,6 @@ in
   nix.package = pkgs.nixUnstable;
   nix.extraOptions = ''
     experimental-features = nix-command flakes
-    post-build-hook = ${signHook}
   '';
 
   boot.kernelPackages = pkgs.linuxPackages_5_15;
diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix
index b9756d9..bf60194 100644
--- a/nixos/modules/nix.nix
+++ b/nixos/modules/nix.nix
@@ -16,15 +16,15 @@
     nixpkgs.flake = nixpkgs;
     dadada.flake = self;
   };
-  nix.binaryCaches = [
+  nix.settings.substituters = [
     https://cache.nixos.org/
     https://nix-community.cachix.org/
   ];
-  nix.binaryCachePublicKeys = [
+  nix.settings.trusted-public-keys = [
     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     "gorgon:eEE/PToceRh34UnnoFENERhk89dGw5yXOpJ2CUbfL/Q="
     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
   ];
-  nix.requireSignedBinaryCaches = true;
-  nix.useSandbox = true;
+  nix.settings.require-sigs = true;
+  nix.settings.sandbox = true;
 }