From f4bb46fb286ed72a214fa7fd06b4b0b1b11bb744 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 19 Feb 2024 11:18:32 +0100 Subject: [PATCH 1/2] Nix: auto optimise store --- machines/SteamDeck/configuration.nix | 2 -- machines/WinMax2/configuration.nix | 2 -- roles/common/programs/nix.nix | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/machines/SteamDeck/configuration.nix b/machines/SteamDeck/configuration.nix index 930782a..0319993 100755 --- a/machines/SteamDeck/configuration.nix +++ b/machines/SteamDeck/configuration.nix @@ -24,8 +24,6 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - nix.settings.auto-optimise-store = true; - # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index c385e37..fe960af 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -63,8 +63,6 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d # Allow unfree packages nixpkgs.config.allowUnfree = true; - nix.settings.auto-optimise-store = true; - # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix index 07e90d7..deed94d 100755 --- a/roles/common/programs/nix.nix +++ b/roles/common/programs/nix.nix @@ -5,6 +5,9 @@ extraOptions = '' experimental-features = nix-command flakes ''; + settings = { + auto-optimise-store = true; + }; registry = { agenix = { from = { id = "agenix"; type = "indirect"; }; From 8d1b7584f3346be030f5654ecf81104317adcbfb Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 19 Feb 2024 11:26:41 +0100 Subject: [PATCH 2/2] Nix: move experimantal options setting tot nix.settings --- roles/common/programs/nix.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix index deed94d..fd36171 100755 --- a/roles/common/programs/nix.nix +++ b/roles/common/programs/nix.nix @@ -2,11 +2,9 @@ { nix = { - extraOptions = '' -experimental-features = nix-command flakes - ''; settings = { auto-optimise-store = true; + experimental-features = "nix-command flakes"; }; registry = { agenix = {