summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalo Bourgon <mbourgon@gmail.com>2022-08-14 17:52:52 -0700
committerMalo Bourgon <mbourgon@gmail.com>2022-08-16 17:41:13 -0700
commit796a72f0fe2c8df0e37f0febda3b6aad3b351a68 (patch)
tree6d468518938879b614185b27cfe08f07d5239781
parent8e2c71d1ca85461c6295dba31481eadb07fdbb19 (diff)
Update changelog
-rw-r--r--CHANGELOG23
-rw-r--r--modules/nix/default.nix2
2 files changed, 25 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1675b3e..b4f5cb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+2022-08-14
+- nix module updated to bring it back in sync with it's NixOS counterpart
+ It should now be much more fiesable to share code for this module between
+ `nix-darwin` and NixOS configs.
+
+ `nix-darwin` now requires Nix >= 2.2.
+
+ `nix.package` can no longer be a path to a profile.
+
+ `nix.version` option has been removed. Use `nix.package.version` if you want
+ to reference the version Nix installed/used by your config.
+
+ Many options moved/renamed from `nix.*` to `nix.settings.*`. For example
+ `nix.binaryCaches` is now `nix.settings.substituters`.
+
+ You can use `nix.settings` to set any option in `nix.conf`.
+
+ `users.nix.*` options moved to `nix.*`.
+
+ `nix.daemonIONice` was renamed to `nix.daemonIOLowPriority`, and
+ `nix.daemonNiceLevel` was removed in favor a new option
+ `nix.nix.daemonProcessType`.
+
2021-01-16
- Added `homebrew` module, to manage formulas installed by Homebrew via `brew bundle`.
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 6b32caa..2588d3b 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -1,3 +1,5 @@
+# Based off: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/nix-daemon.nix
+# When making changes please try to keep it in sync and keep the diff NixOS module clean.
{ config, lib, pkgs, ... }:
with lib;