From d683d4bb53dbda26473f5bef19974fc2ed816b8c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 5 Nov 2023 21:14:23 +0800 Subject: [PATCH] flake: move flake's substituter to ./flakes/* --- flakes/nixos/berberman.nix | 4 ++++ flakes/nixos/hyprland.nix | 6 ++++++ nixos/nix/nix.nix | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 flakes/nixos/hyprland.nix diff --git a/flakes/nixos/berberman.nix b/flakes/nixos/berberman.nix index a39333c..5bc873a 100644 --- a/flakes/nixos/berberman.nix +++ b/flakes/nixos/berberman.nix @@ -2,4 +2,8 @@ nixpkgs.overlays = [ inputs.berberman.overlays.default ]; + nix.settings = { + substituters = ["https://berberman.cachix.org"]; + trusted-public-keys = ["berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds="]; + }; } diff --git a/flakes/nixos/hyprland.nix b/flakes/nixos/hyprland.nix new file mode 100644 index 0000000..fa3f250 --- /dev/null +++ b/flakes/nixos/hyprland.nix @@ -0,0 +1,6 @@ +{...}: { + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; +} diff --git a/nixos/nix/nix.nix b/nixos/nix/nix.nix index 07e9324..51db219 100755 --- a/nixos/nix/nix.nix +++ b/nixos/nix/nix.nix @@ -8,14 +8,10 @@ "https://mirror.sjtu.edu.cn/nix-channels/store" # SJTU - 上海交通大学 Mirror "https://nix-community.cachix.org" - "https://berberman.cachix.org" - "https://hyprland.cachix.org" "https://cache.garnix.io" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; use-xdg-base-directories = true;