From 0fa31a0aaaee89fb68338f4b7869b5eff3557e14 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 11 Feb 2024 04:01:42 +0900 Subject: feat(modules): cachix -> binary-cache --- modules/binary-cache/caches/nix-community.nix | 12 ++++++++++++ modules/binary-cache/default.nix | 23 +++++++++++++++++++++++ modules/cachix/caches/nix-community.nix | 12 ------------ modules/cachix/default.nix | 23 ----------------------- 4 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 modules/binary-cache/caches/nix-community.nix create mode 100644 modules/binary-cache/default.nix delete mode 100644 modules/cachix/caches/nix-community.nix delete mode 100644 modules/cachix/default.nix (limited to 'modules') 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/default.nix b/modules/binary-cache/default.nix new file mode 100644 index 0000000..551ab98 --- /dev/null +++ b/modules/binary-cache/default.nix @@ -0,0 +1,23 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.modules.binary-cache; + + 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; + + options.modules.binary-cache = { + enable = mkEnableOption "binary-cache"; + }; + + config = mkIf cfg.enable { + nix.settings.substituters = [ "https://cache.nixos.org/" ]; + environment.systemPackages = [ pkgs.cachix ]; + }; +} 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/default.nix b/modules/cachix/default.nix deleted file mode 100644 index 5222457..0000000 --- a/modules/cachix/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; -let - cfg = config.modules.cachix; - - 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; - - options.modules.cachix = { - enable = mkEnableOption "cachix"; - }; - - config = mkIf cfg.enable { - nix.settings.substituters = [ "https://cache.nixos.org/" ]; - environment.systemPackages = [ pkgs.cachix ]; - }; -} -- cgit 1.4.1