From 629a57f88f6e03a1fce7398ac10cdd959b1d8e6e Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Tue, 3 Sep 2024 01:36:22 +0200 Subject: [PATCH] move most of the binary caches back into their modules I actually have no idea what to do twith the nix community one --- hosts/chmura/services/conduit.nix | 9 +++++++++ hosts/common/core/binary-caches.nix | 10 ---------- modules/cli/nh.nix | 9 +++++++++ modules/gui/anyrun.nix | 9 +++++++++ modules/gui/hypr/land.nix | 9 +++++++++ modules/tui/helix.nix | 9 +++++++++ 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/hosts/chmura/services/conduit.nix b/hosts/chmura/services/conduit.nix index 7b970cd..2d30fce 100644 --- a/hosts/chmura/services/conduit.nix +++ b/hosts/chmura/services/conduit.nix @@ -5,6 +5,15 @@ }: let port = 6167; in { + nix.settings = { + substituters = [ + "https://attic.conduit.rs/conduit" + ]; + trusted-public-keys = [ + "conduit:ddcaWZiWm0l0IXZlO8FERRdWvEufwmd0Negl1P+c0Ns=" + ]; + }; + environment.systemPackages = [ pkgs.mautrix-discord ]; services.matrix-conduit = { diff --git a/hosts/common/core/binary-caches.nix b/hosts/common/core/binary-caches.nix index 525d13f..f3fbb1a 100644 --- a/hosts/common/core/binary-caches.nix +++ b/hosts/common/core/binary-caches.nix @@ -2,19 +2,9 @@ _: { nix.settings = { substituters = [ "https://nix-community.cachix.org" - "https://attic.conduit.rs/conduit" - "https://helix.cachix.org" - "https://viperml.cachix.org" - "https://anyrun.cachix.org" - "https://hyprland.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "conduit:ddcaWZiWm0l0IXZlO8FERRdWvEufwmd0Negl1P+c0Ns=" - "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" - "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8=" - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; } diff --git a/modules/cli/nh.nix b/modules/cli/nh.nix index 325aa0b..723255e 100644 --- a/modules/cli/nh.nix +++ b/modules/cli/nh.nix @@ -20,6 +20,15 @@ in { }; config = mkIf cfg.enable { + nix.settings = { + substituters = [ + "https://viperml.cachix.org" + ]; + trusted-public-keys = [ + "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8=" + ]; + }; + programs.nh = { enable = true; package = inputs.nh.packages.${pkgs.system}.default; diff --git a/modules/gui/anyrun.nix b/modules/gui/anyrun.nix index 6bfcd7f..c3d9f48 100644 --- a/modules/gui/anyrun.nix +++ b/modules/gui/anyrun.nix @@ -15,6 +15,15 @@ in { options.poz.programs.anyrun.enable = mkEnableOption "anyrun"; config = mkIf cfg.enable { + nix.settings = { + substituters = [ + "https://anyrun.cachix.org" + ]; + trusted-public-keys = [ + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + ]; + }; + home-manager.users.${username} = { imports = [ inputs.anyrun.homeManagerModules.default ]; diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix index 93821c6..3ac7d2d 100644 --- a/modules/gui/hypr/land.nix +++ b/modules/gui/hypr/land.nix @@ -117,6 +117,15 @@ in { disabledModules = [ "programs/hyprland.nix" ]; config = mkIf cfg.enable { + nix.settings = { + substituters = [ + "https://hyprland.cachix.org" + ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; + }; + environment.sessionVariables = { XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_TYPE = "wayland"; diff --git a/modules/tui/helix.nix b/modules/tui/helix.nix index ccb66a6..d9b94c8 100644 --- a/modules/tui/helix.nix +++ b/modules/tui/helix.nix @@ -20,6 +20,15 @@ in { options.poz.programs.helix.enable = mkEnableOption "helix"; config = mkIf cfg.enable { + nix.settings = { + substituters = [ + "https://helix.cachix.org" + ]; + trusted-public-keys = [ + "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" + ]; + }; + home-manager.users.${username} = { programs.helix = { enable = true;