From 21d85d41efed3bd6f1640efdf6f6d6f8ae5d8af2 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Thu, 18 Apr 2024 11:03:49 +0800
Subject: [PATCH] feat: use the latest version of the nix package manager

---
 modules/base.nix            | 4 ++++
 modules/darwin/nix-core.nix | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/base.nix b/modules/base.nix
index 2a853ab9..bc86316a 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -15,6 +15,10 @@
     ../certs/ecc-ca.crt
   ];
 
+  # auto upgrade nix to the unstable version
+  # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/tools/package-management/nix/default.nix#L284
+  nix.package = pkgs.nixVersions.unstable;
+
   environment.systemPackages = with pkgs; [
     git # used by nix flakes
     git-lfs # used by huggingface models
diff --git a/modules/darwin/nix-core.nix b/modules/darwin/nix-core.nix
index e93241df..992be3a0 100644
--- a/modules/darwin/nix-core.nix
+++ b/modules/darwin/nix-core.nix
@@ -7,7 +7,7 @@
   #    https://daiderd.com/nix-darwin/manual/index.html#sec-options
   #
   # History Issues:
-  #  1. Fixed by replace the determinated nix-installer by the official one:
+  #  1. Fixed by replace the determined nix-installer by the official one:
   #     https://github.com/LnL7/nix-darwin/issues/149#issuecomment-1741720259
   #
   ###################################################################################
@@ -15,9 +15,8 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # Auto upgrade nix package and the daemon service.
+  # Auto upgrade the nix-daemon service.
   services.nix-daemon.enable = true;
-  nix.package = pkgs.nix;
 
   # Disable auto-optimise-store because of this issue:
   #   https://github.com/NixOS/nix/issues/7273