flake: move extra-substituters settings to flake.nix

Author: Renna42

Justfile

@@ -1,32 +1,32 @@
 default: switch
 
 inspect:
-  nix run github:bluskript/nix-inspect -- -p .
+  nix --accept-flake-config run github:bluskript/nix-inspect -- -p .
 
 install hostname target:
-    nix run github:nix-community/nixos-anywhere -- \
+    nix --accept-flake-config run github:nix-community/nixos-anywhere -- \
       --flake .#{{ hostname }} \
       --target-host {{ target }} \
       --copy-host-keys \
       --disko-mode disko \
 
 bootstrap hostname disk:
-    nix --extra-experimental-features "nix-command flakes" run 'github:nix-community/disko#disko-install' -- --flake .#{{ hostname }} --disk main {{ disk }}
+    nix --extra-experimental-features "nix-command flakes" --accept-flake-config run 'github:nix-community/disko#disko-install' -- --flake .#{{ hostname }} --disk main {{ disk }}
 
 build:
-  nh os build .
+  nh os build . --accept-flake-config
 
 switch:
-  nh os switch .
+  nh os switch . --accept-flake-config
 
 boot:
-  nh os boot .
+  nh os boot . --accept-flake-config
 
 dryrun:
-  nixos-rebuild dry-run --flake . --sudo -v --log-format internal-json |& nom --json
+  nixos-rebuild dry-run --flake . --sudo --accept-flake-config -v --log-format internal-json |& nom --json
 
 darwin-switch:
-  nh darwin switch .
+  nh darwin switch . --accept-flake-config
 
 gc:
   # remove all generations older than 7 days

darwin/nix.nix

@@ -28,16 +28,6 @@
         "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
         "https://mirrors.ustc.edu.cn/nix-channels/store"
       ];
-      extra-substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.garnix.io"
-        "https://renna42.cachix.org"
-      ];
-      extra-trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-        "renna42.cachix.org-1:AqHSiL2lFKYHYJ0U2YFiW1kjItvFMmyyc6loFZR3/X8="
-      ];
       warn-dirty = false;
       use-xdg-base-directories = true;
       # Disable the built-in flake registry to speed up evaluation

flake.nix

@@ -1,6 +1,21 @@
 {
   description = "Renna's System Flake";
 
+  nixConfig = {
+    extra-substituters = [
+      "https://nix-community.cachix.org"
+      "https://attic.xuyh0120.win/lantian"
+      "https://cache.garnix.io"
+      "https://renna42.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "renna42.cachix.org-1:AqHSiL2lFKYHYJ0U2YFiW1kjItvFMmyyc6loFZR3/X8="
+    ];
+  };
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";

lib/with-offline-installer.nix

@@ -57,12 +57,10 @@ in
                   "https://mirror.sjtu.edu.cn/nix-channels/store"
                   "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
                   "https://mirrors.ustc.edu.cn/nix-channels/store"
-                ];
-                extra-substituters = [
                   "https://nix-community.cachix.org"
                   "https://cache.garnix.io"
                 ];
-                extra-trusted-public-keys = [
+                trusted-public-keys = [
                   "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
                   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
                 ];

nixos/common/nix.nix

@@ -46,18 +46,6 @@
           "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
           "https://mirrors.ustc.edu.cn/nix-channels/store"
         ];
-        extra-substituters = [
-          "https://nix-community.cachix.org"
-          "https://attic.xuyh0120.win/lantian"
-          "https://cache.garnix.io"
-          "https://renna42.cachix.org"
-        ];
-        extra-trusted-public-keys = [
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
-          "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-          "renna42.cachix.org-1:AqHSiL2lFKYHYJ0U2YFiW1kjItvFMmyyc6loFZR3/X8="
-        ];
         warn-dirty = false;
         system-features = [
           "kvm"