From 96e11ec3b4fbb2f088c321ca166b7a6b1e501ba6 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Wed, 12 Jun 2024 09:10:52 +1000
Subject: [PATCH] Update to new stable packages

---
 darwin/default.nix  |  2 +-
 flake.lock          | 22 +++++++++++-----------
 flake.nix           |  4 ++--
 shared/packages.nix |  3 +--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/darwin/default.nix b/darwin/default.nix
index c113398..22fb0ca 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -14,7 +14,7 @@ let user = "dekker1"; in
 
   # Setup user, packages, programs
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nix;
     settings.trusted-users = [ "@admin" "${user}" ];
 
     gc = {
diff --git a/flake.lock b/flake.lock
index 48a5fa1..cef0b84 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,16 +79,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1717476296,
-        "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -112,11 +112,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1718081617,
-        "narHash": "sha256-0X4yXFa/hKIg/vg34ArQBTF/mJCo9jDABDpstm0XXjA=",
+        "lastModified": 1718089718,
+        "narHash": "sha256-CHHtcraLj/6W3Mo9kdrxZxoZYEI0qpGkUBbxFBPl7Ks=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "172f4b6f06d0415fb38e40a5a27a349ec847a6e3",
+        "rev": "f5fe7f4584062a739f6a38983717b7fe0783a094",
         "type": "github"
       },
       "original": {
@@ -227,16 +227,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1717943341,
-        "narHash": "sha256-yxWsqI5xJD3CxLsxUdwO0j6I3w9tWL7OTPX+an34NeE=",
+        "lastModified": 1718062102,
+        "narHash": "sha256-jrZElSRwgy8CyJ8kthtdv7v3uleaRwY6h7TEUwYXXo8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d7a9684369629451f055bdef150053e3ba02c142",
+        "rev": "c24bf950ab438d94bd664ef16f62139c152808c2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-23.11-darwin",
+        "ref": "nixpkgs-24.05-darwin",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c4e030a..c1e2177 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "Dekker1's home manager configuation";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
diff --git a/shared/packages.nix b/shared/packages.nix
index 36a9d7e..7d5cfb8 100644
--- a/shared/packages.nix
+++ b/shared/packages.nix
@@ -20,7 +20,6 @@ with pkgs; [
   zoxide
 
   # Fonts
-  go-font
   ibm-plex
   atkinson-hyperlegible
   (nerdfonts.override { fonts = [ "Go-Mono" ]; })
@@ -40,7 +39,7 @@ with pkgs; [
 
   # MiniZinc solvers
   gecode
-  # or-tools
+  or-tools
 
   # Nix development tools
   nixpkgs-fmt