Move cachix out of shared modules

dustinlyons · Sep 19, 2024 · d755277 · d755277
1 parent 4089894
commit d755277
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 55 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix
@@ -7,7 +7,6 @@ let user = "dustin"; in
  ../../modules/darwin/secrets.nix
  ../../modules/darwin/home-manager.nix
  ../../modules/shared
- ../../modules/shared/cachix
  agenix.darwinModules.default
  ];
 
@@ -17,8 +16,11 @@ let user = "dustin"; in
  # Setup user, packages, programs
  nix = {
  package = pkgs.nix;
- settings.trusted-users = [ "@admin" "${user}" ];
 
+ settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+
  gc = {
  user = "root";
  automatic = true;

diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix
@@ -7,7 +7,6 @@ let user = "dustin";
  ../../modules/nixos/secrets.nix
  ../../modules/nixos/disk-config.nix
  ../../modules/shared
- ../../modules/shared/cachix
  agenix.nixosModules.default
  ];
 
@@ -41,6 +40,10 @@ let user = "dustin";
  nix = {
  nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ];
  settings.allowed-users = [ "${user}" ];
+ settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+
  package = pkgs.nix;
  extraOptions = ''
  experimental-features = nix-command flakes

diff --git a/templates/starter-with-secrets/hosts/darwin/default.nix b/templates/starter-with-secrets/hosts/darwin/default.nix
@@ -8,7 +8,6 @@ let user = "%USER%"; in
  ../../modules/darwin/secrets.nix
  ../../modules/darwin/home-manager.nix
  ../../modules/shared
- ../../modules/shared/cachix
  agenix.darwinModules.default
  ];
 
@@ -19,6 +18,8 @@ let user = "%USER%"; in
  nix = {
  package = pkgs.nix;
  settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
 
  gc = {
  user = "root";

diff --git a/templates/starter-with-secrets/hosts/nixos/default.nix b/templates/starter-with-secrets/hosts/nixos/default.nix
@@ -7,7 +7,6 @@ let user = "%USER%";
  ../../modules/nixos/secrets.nix
  ../../modules/nixos/disk-config.nix
  ../../modules/shared
- ../../modules/shared/cachix
  agenix.nixosModules.default
  ];
 
@@ -43,6 +42,10 @@ let user = "%USER%";
  nix = {
  nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ];
  settings.allowed-users = [ "${user}" ];
+ settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+
  package = pkgs.nix;
  extraOptions = ''
  experimental-features = nix-command flakes

diff --git a/templates/starter-with-secrets/modules/shared/cachix/default.nix b/templates/starter-with-secrets/modules/shared/cachix/default.nix
diff --git a/templates/starter/hosts/darwin/default.nix b/templates/starter/hosts/darwin/default.nix
@@ -7,7 +7,6 @@ let user = "%USER%"; in
  imports = [
  ../../modules/darwin/home-manager.nix
  ../../modules/shared
- ../../modules/shared/cachix
  ];
 
  # Auto upgrade nix package and the daemon service.
@@ -17,6 +16,8 @@ let user = "%USER%"; in
  nix = {
  package = pkgs.nix;
  settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
 
  gc = {
  user = "root";

diff --git a/templates/starter/hosts/nixos/default.nix b/templates/starter/hosts/nixos/default.nix
@@ -6,7 +6,6 @@ let user = "%USER%";
  imports = [
  ../../modules/nixos/disk-config.nix
  ../../modules/shared
- ../../modules/shared/cachix
  ];
 
  # Use the systemd-boot EFI boot loader.
@@ -41,6 +40,10 @@ let user = "%USER%";
  nix = {
  nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ];
  settings.allowed-users = [ "${user}" ];
+ settings.trusted-users = [ "@admin" "${user}" ];
+ settings.substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ];
+ settings.trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+
  package = pkgs.nix;
  extraOptions = ''
  experimental-features = nix-command flakes

diff --git a/templates/starter/modules/shared/cachix/default.nix b/templates/starter/modules/shared/cachix/default.nix