diff options
-rw-r--r-- | system/mba.nix | 12 | ||||
-rw-r--r-- | system/settings/darwin.nix | 16 |
2 files changed, 15 insertions, 13 deletions
diff --git a/system/mba.nix b/system/mba.nix index cd4d5a5b..e8d69490 100644 --- a/system/mba.nix +++ b/system/mba.nix @@ -7,10 +7,6 @@ ./settings/programs/shell.nix ]; - nixpkgs.config = { - allowUnfree = true; - }; - networking = { hostName = "mba"; }; @@ -25,14 +21,6 @@ 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 system.stateVersion = 4; diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix index 6143625b..629eff16 100644 --- a/system/settings/darwin.nix +++ b/system/settings/darwin.nix @@ -1,10 +1,24 @@ -{ 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 = { enable = true; |