build(deps): nix flake update, 23.11 -> 24.05

Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/9b35a20ab70da97fd1266ce816dd4104f89c88b9' (2024-01-11) → 'github:nix-community/emacs-overlay/3ba06331405227702c827478f0aee79ba0b917fb' (2024-05-24) • Updated input 'flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'home-manager': 'github:nix-community/home-manager/7e398b3d76bc1503171b1364c9d4a07ac06f3851' (2024-01-01) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) • Updated input 'nixgl': 'github:guibou/nixGL/489d6b095ab9d289fe11af0219a9ff00fe87c7c5' (2023-06-04) → 'github:guibou/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a' (2024-04-19) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/b34a6075e9e298c4124e35c3ccaf2210c1f3a43b' (2024-01-09) → 'github:nixos/nixos-hardware/d9e0b26202fd500cf3e79f73653cce7f7d541191' (2024-05-20) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2aaf35bc85b2a6f9957fe9df17bcf5f94fbd0e85' (2024-01-11) → 'github:nixos/nixpkgs/5581031cba1765483f12ddf2eed92198daa4ef09' (2024-05-24) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/2aaf35bc85b2a6f9957fe9df17bcf5f94fbd0e85' (2024-01-11) → 'github:nixos/nixpkgs/5581031cba1765483f12ddf2eed92198daa4ef09' (2024-05-24) • Updated input 'nur': 'github:nix-community/nur/813d3e60730dacabd842ac7dbf6c7b46c6ded339' (2024-01-11) → 'github:nix-community/nur/8b33b57c6815f2c788a961570fb86c70f3cfad26' (2024-05-24) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/04f25d7bec9fb29d2c3bacaa48a3304840000d36' (2024-01-07) → 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17)
yurrriq · May 24, 2024 · 2d8f87c · 2d8f87c
1 parent 48430bd
commit 2d8f87c
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 52 deletions.
diff --git a/config/nix.nix b/config/nix.nix
@@ -2,8 +2,6 @@
 
 {
   nix = {
-    package = pkgs.nixUnstable;
-
     settings = {
       experimental-features = [
         "flakes"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,7 +11,7 @@
     };
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixgl = {
@@ -20,8 +20,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05";
     nur.url = "github:nix-community/nur";
     treefmt-nix = {
       inputs.nixpkgs.follows = "nixpkgs";
@@ -68,12 +68,12 @@
           # https://typeof.net/Iosevka/customizer
           iosevka-custom = prev.iosevka.override {
             privateBuildPlan = ''
-              [buildPlans.iosevka-custom]
+              [buildPlans.Iosevkacustom]
               family = "Iosevka Custom"
               spacing = "normal"
               serifs = "sans"
-              export-glyph-names = true
-              [buildPlans.iosevka-custom.ligations]
+              exportGlyphNames = true
+              [buildPlans.Iosevkacustom.ligations]
               inherits = "dlig"
             '';
             set = "custom";
@@ -183,7 +183,7 @@
             home = {
               username = "eric";
               homeDirectory = "/home/eric";
-              stateVersion = "23.11";
+              stateVersion = "24.05";
             };
           }
         ];

diff --git a/machines/sruxps/home.nix b/machines/sruxps/home.nix
@@ -72,7 +72,7 @@
     curl
     httpie
     cachix
-    nixUnstable
+    nix
     home-manager
     nixgl.nixGLIntel
     networkmanager

diff --git a/modules/nix.nix b/modules/nix.nix
@@ -18,7 +18,6 @@
       options = "--delete-older-than 30d";
     };
     optimise.automatic = true;
-    package = pkgs.nixUnstable;
   };
   environment.systemPackages = with pkgs; [
     cachix

diff --git a/src/config/nix.nw b/src/config/nix.nw
@@ -5,8 +5,6 @@
 
 {
   nix = {
-    package = pkgs.nixUnstable;
-
     settings = {
       experimental-features = [
         "flakes"

diff --git a/src/flake.nw b/src/flake.nw
@@ -75,7 +75,7 @@ invaluable tool for managing a deterministic \bash{$HOME}.  Pin a version and fo
 
 <<inputs>>=
 home-manager = {
-  url = "github:nix-community/home-manager/release-23.11";
+  url = "github:nix-community/home-manager/release-24.05";
   inputs.nixpkgs.follows = "nixpkgs";
 };
 @
@@ -107,14 +107,14 @@ Someday soon again, prefer to live on the edge and pin \nix{nixpkgs} to the
 \textit{nixpkgs-unstable} branch.
 
 <<inputs>>=
-nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
+nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
 @
 
 Additionally, pin a stable version of the
 \hrefootnote{https://github.com/NixOS/nixpkgs}{Nix Packages collection}.
 
 <<inputs>>=
-nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.11";
+nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05";
 @
 
 \subsection{NUR}
@@ -432,7 +432,7 @@ homeConfigurations.eric = inputs.home-manager.lib.homeManagerConfiguration {
       home = {
         username = "eric";
         homeDirectory = "/home/eric";
-        stateVersion = "23.11";
+        stateVersion = "24.05";
       };
     }
   ];
@@ -503,12 +503,12 @@ iosevka-custom = final: prev: {
   # https://typeof.net/Iosevka/customizer
   iosevka-custom = prev.iosevka.override {
     privateBuildPlan = ''
-      [buildPlans.iosevka-custom]
+      [buildPlans.Iosevkacustom]
       family = "Iosevka Custom"
       spacing = "normal"
       serifs = "sans"
-      export-glyph-names = true
-      [buildPlans.iosevka-custom.ligations]
+      exportGlyphNames = true
+      [buildPlans.Iosevkacustom.ligations]
       inherits = "dlig"
     '';
     set = "custom";

diff --git a/src/machines/sruxps/home.nw b/src/machines/sruxps/home.nw
@@ -197,7 +197,7 @@ bind
 curl
 httpie
 cachix
-nixUnstable
+nix
 home-manager
 nixgl.nixGLIntel
 networkmanager

diff --git a/src/modules/nix.nw b/src/modules/nix.nw
@@ -11,7 +11,6 @@
     <<Configure extra options>>
     <<Configure garbage collection>>
     optimise.automatic = true;
-    package = pkgs.nixUnstable;
   };
   <<Install Cachix>>
 }