From 6157eabfb8bb29a2585b1ca46a01a10de935b1b9 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 6 Dec 2024 11:48:08 +0100 Subject: [PATCH] darwin: adjust nix config --- agenix/hosts/Pallas/config.nix | 1 - agenix/hosts/Styx/config.nix | 1 - home/hosts/Styx.nix | 2 +- system/hosts/Pallas.nix | 5 +++++ system/hosts/Styx.nix | 5 +++++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/agenix/hosts/Pallas/config.nix b/agenix/hosts/Pallas/config.nix index 5a67921..cfb6caa 100644 --- a/agenix/hosts/Pallas/config.nix +++ b/agenix/hosts/Pallas/config.nix @@ -5,7 +5,6 @@ secrets = { nix-netrc = { file = ../all/nix/netrc.age; - path = "/etc/nix/netrc"; mode = "444"; }; diff --git a/agenix/hosts/Styx/config.nix b/agenix/hosts/Styx/config.nix index 5a67921..cfb6caa 100644 --- a/agenix/hosts/Styx/config.nix +++ b/agenix/hosts/Styx/config.nix @@ -5,7 +5,6 @@ secrets = { nix-netrc = { file = ../all/nix/netrc.age; - path = "/etc/nix/netrc"; mode = "444"; }; diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index 7107032..f1a1644 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -66,7 +66,7 @@ in hexyl hyperfine just - lnav + #lnav mtr nix-tree nix-update diff --git a/system/hosts/Pallas.nix b/system/hosts/Pallas.nix index 224f9ee..67d4ad6 100644 --- a/system/hosts/Pallas.nix +++ b/system/hosts/Pallas.nix @@ -1,3 +1,5 @@ +{ config, ... }: + let homeDir = "/Users/daniel"; in @@ -28,6 +30,7 @@ in keep-outputs = true; extra-nix-path = "nixpkgs=flake:nixpkgs"; + always-allow-substitutes = true; builders-use-substitutes = true; extra-substituters = [ @@ -46,6 +49,8 @@ in "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; + netrc-file = config.age.secrets.nix-netrc.path; + trusted-users = [ "@admin" ]; connect-timeout = 5; diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index f3e1f48..048f4e6 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -1,3 +1,5 @@ +{ config, ... }: + let homeDir = "/Users/daniel"; in @@ -29,6 +31,7 @@ in keep-outputs = true; extra-nix-path = "nixpkgs=flake:nixpkgs"; + always-allow-substitutes = true; builders-use-substitutes = true; extra-substituters = [ @@ -54,6 +57,8 @@ in "devshells:YXtbU0DheB229oCr2D0H0qHjj2Ed/e2VZiLSXgQ1IVA=" ]; + netrc-file = config.age.secrets.nix-netrc.path; + trusted-users = [ "@admin" ]; connect-timeout = 5;