From 990bbb51b7d553e7bc7602fea78c873358abd3cf Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 17:07:07 +1000 Subject: [PATCH] moved: nix.settings block from core/packages to core/configuration.nix --- core/configuration.nix | 14 ++++++++++++++ core/packages.nix | 14 ++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/configuration.nix b/core/configuration.nix index e6e79b3..f0cd43a 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -19,6 +19,7 @@ ]; ## locale is common across machines + ## crikey ! time.timeZone = "Australia/Brisbane"; i18n.defaultLocale = "en_GB.UTF-8"; @@ -41,6 +42,19 @@ sudo.execWheelOnly = true; }; + ## settings for nix + nix.settings = { + ## use all cores during build + cores = 0; + auto-optimise-store = true; + allowed-users = [ "@wheel" ]; + ## enable flakes uwu + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + ## disable these cuz they cause problems (thx sasha) ## see: https://github.com/NixOS/nixpkgs/issues/180175 systemd.services = { diff --git a/core/packages.nix b/core/packages.nix index 0baf80e..b7320a7 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -2,6 +2,8 @@ { + ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + ## find a better home for these please <3 fonts = { packages = with pkgs; [ @@ -30,16 +32,8 @@ }; }; - - nix.settings = { - cores = 0; - auto-optimise-store = true; - allowed-users = [ "@wheel" ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + + ## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- nixpkgs = {