From 0972ea9754a695b51840c0e58ef7c68dafb7b70d Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 10 Feb 2024 07:20:19 +0900 Subject: feat(modules): cachix -> binary-cache --- modules/binary-cache/caches/helix.nix | 12 ++++++++++++ modules/binary-cache/caches/nix-community.nix | 12 ++++++++++++ modules/binary-cache/caches/nix-gaming.nix | 12 ++++++++++++ modules/binary-cache/caches/nixrc.nix | 12 ++++++++++++ modules/binary-cache/default.nix | 13 +++++++++++++ modules/cachix/caches/helix.nix | 12 ------------ modules/cachix/caches/nix-community.nix | 12 ------------ modules/cachix/caches/nix-gaming.nix | 12 ------------ modules/cachix/caches/nixrc.nix | 12 ------------ modules/cachix/default.nix | 13 ------------- modules/default.nix | 2 +- 11 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 modules/binary-cache/caches/helix.nix create mode 100644 modules/binary-cache/caches/nix-community.nix create mode 100644 modules/binary-cache/caches/nix-gaming.nix create mode 100644 modules/binary-cache/caches/nixrc.nix create mode 100644 modules/binary-cache/default.nix delete mode 100644 modules/cachix/caches/helix.nix delete mode 100644 modules/cachix/caches/nix-community.nix delete mode 100644 modules/cachix/caches/nix-gaming.nix delete mode 100644 modules/cachix/caches/nixrc.nix delete mode 100644 modules/cachix/default.nix diff --git a/modules/binary-cache/caches/helix.nix b/modules/binary-cache/caches/helix.nix new file mode 100644 index 0000000..7783a96 --- /dev/null +++ b/modules/binary-cache/caches/helix.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + nix.settings = { + substituters = [ + "https://helix.cachix.org" + ]; + trusted-public-keys = [ + "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" + ]; + }; +} diff --git a/modules/binary-cache/caches/nix-community.nix b/modules/binary-cache/caches/nix-community.nix new file mode 100644 index 0000000..d323939 --- /dev/null +++ b/modules/binary-cache/caches/nix-community.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + nix.settings = { + substituters = [ + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; +} diff --git a/modules/binary-cache/caches/nix-gaming.nix b/modules/binary-cache/caches/nix-gaming.nix new file mode 100644 index 0000000..c02bc5f --- /dev/null +++ b/modules/binary-cache/caches/nix-gaming.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + nix.settings = { + substituters = [ + "https://nix-gaming.cachix.org" + ]; + trusted-public-keys = [ + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + ]; + }; +} diff --git a/modules/binary-cache/caches/nixrc.nix b/modules/binary-cache/caches/nixrc.nix new file mode 100644 index 0000000..6444ae5 --- /dev/null +++ b/modules/binary-cache/caches/nixrc.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + nix.settings = { + substituters = [ + "https://nixrc.cachix.org" + ]; + trusted-public-keys = [ + "nixrc.cachix.org-1:Hza//IlTj9UID+DaCXaM/cftfZzcXZ4zeW9XHLIcztU=" + ]; + }; +} diff --git a/modules/binary-cache/default.nix b/modules/binary-cache/default.nix new file mode 100644 index 0000000..9dd55b5 --- /dev/null +++ b/modules/binary-cache/default.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: +let + folder = ./caches; + 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 +{ + inherit imports; + nix.settings.substituters = [ "https://cache.nixos.org/" ]; + + environment.systemPackages = [ pkgs.cachix ]; +} diff --git a/modules/cachix/caches/helix.nix b/modules/cachix/caches/helix.nix deleted file mode 100644 index 7783a96..0000000 --- a/modules/cachix/caches/helix.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - nix.settings = { - substituters = [ - "https://helix.cachix.org" - ]; - trusted-public-keys = [ - "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" - ]; - }; -} diff --git a/modules/cachix/caches/nix-community.nix b/modules/cachix/caches/nix-community.nix deleted file mode 100644 index d323939..0000000 --- a/modules/cachix/caches/nix-community.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - nix.settings = { - substituters = [ - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; -} diff --git a/modules/cachix/caches/nix-gaming.nix b/modules/cachix/caches/nix-gaming.nix deleted file mode 100644 index c02bc5f..0000000 --- a/modules/cachix/caches/nix-gaming.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - nix.settings = { - substituters = [ - "https://nix-gaming.cachix.org" - ]; - trusted-public-keys = [ - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" - ]; - }; -} diff --git a/modules/cachix/caches/nixrc.nix b/modules/cachix/caches/nixrc.nix deleted file mode 100644 index 6444ae5..0000000 --- a/modules/cachix/caches/nixrc.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - nix.settings = { - substituters = [ - "https://nixrc.cachix.org" - ]; - trusted-public-keys = [ - "nixrc.cachix.org-1:Hza//IlTj9UID+DaCXaM/cftfZzcXZ4zeW9XHLIcztU=" - ]; - }; -} diff --git a/modules/cachix/default.nix b/modules/cachix/default.nix deleted file mode 100644 index 9dd55b5..0000000 --- a/modules/cachix/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, lib, ... }: -let - folder = ./caches; - 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 -{ - inherit imports; - nix.settings.substituters = [ "https://cache.nixos.org/" ]; - - environment.systemPackages = [ pkgs.cachix ]; -} diff --git a/modules/default.nix b/modules/default.nix index df11f91..260290a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,5 @@ { - cachix = import ./cachix; + binary-cache = import ./binary-cache; flakes = import ./flakes.nix; nix = import ./nix.nix; security = import ./security.nix; -- cgit 1.4.1