From 010f0f6fc385cb6dc121571a0f8bcefacc0cd2a5 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 1 Jun 2024 07:14:42 +0100
Subject: [PATCH] Update to nixos-24.05

nixpkgs url and flake lock updates

Remove nixpkgs from registry and nixPath as it's done automatically in
NixOS now

Stop setting nix package to nixVersions.unstable as that's now
deprecated
---
 configuration/default.nix | 4 ----
 flake.lock                | 8 ++++----
 flake.nix                 | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/configuration/default.nix b/configuration/default.nix
index e8dc13b7..8c7b4a0c 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -1,13 +1,10 @@
 {
-  config,
-  lib,
   pkgs,
   iosevkaCustom,
   ...
 }: {
   nix = {
     enable = true;
-    package = pkgs.nixVersions.unstable;
     settings = {
       cores = 0;
       max-jobs = "auto";
@@ -16,7 +13,6 @@
       auto-optimise-store = true;
     };
     channel.enable = true;
-    nixPath = ["nixpkgs=${pkgs.path}"];
     gc = {
       automatic = true;
       options = "--delete-older-than 7d";
diff --git a/flake.lock b/flake.lock
index e5bf9f09..a1daff76 100644
--- a/flake.lock
+++ b/flake.lock
@@ -138,16 +138,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716361217,
-        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 259a0642..4e597978 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";
     niri = {
       url = "github:yalter/niri/v0.1.6"; # Follow stable releases
@@ -47,7 +47,6 @@
         nix = {
           settings.trusted-users = [primaryUser];
           registry = {
-            nixpkgs.flake = nixpkgs;
             my-nixos = {
               from = {
                 type = "indirect";