all repos — nixfiles @ 60740689e4575c353248c1aad25f7db577ce8f71

System and user configuration, managed by nix and home-manager

Move common nix-darwin config to darwin.nix

Alan Pearce
commit

60740689e4575c353248c1aad25f7db577ce8f71

parent

4d230ecf19a7709d8fabdd1cae155057215576d0

2 files changed, 15 insertions(+), 13 deletions(-)

changed files
M system/mba.nixsystem/mba.nix
@@ -7,10 +7,6 @@ ./settings/programs/base.nix
./settings/programs/shell.nix ]; - nixpkgs.config = { - allowUnfree = true; - }; - networking = { hostName = "mba"; };
@@ -24,14 +20,6 @@
# programs.nix-index.enable = true; environment.variables.LANG = "en_GB.UTF-8"; - - nix.gc = { - automatic = true; - user = "alan"; - options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))"; - }; - nix.daemonNiceLevel = 10; - nix.daemonIONice = true; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog
M system/settings/darwin.nixsystem/settings/darwin.nix
@@ -1,9 +1,23 @@
-{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { services.nix-daemon = { enable = true; enableSocketListener = true; + }; + nix = { + buildCores = lib.mkDefault 0; + daemonIONice = true; + daemonNiceLevel = 10; + gc = { + automatic = true; + user = "alan"; + options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))"; + }; + }; + + nixpkgs.config = { + allowUnfree = true; }; programs.zsh = {