From 48a23dbf97ed0a0a3ab35b8b81ba55a40e213758 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Thu, 8 Aug 2024 19:21:52 +0200
Subject: [PATCH] updated flake.nix, credits

---
 flake.lock                     | 70 ++++++++++++++++++++--------------
 flake.nix                      |  1 -
 modules/system/nix/module.nix  |  1 +
 modules/system/nix/nixpkgs.nix |  1 +
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2dee801..356e316 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1192,7 +1192,7 @@
       "inputs": {
         "flake-parts": "flake-parts_6",
         "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -1251,9 +1251,7 @@
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_4",
         "libgit2": "libgit2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-23-11": "nixpkgs-23-11",
         "nixpkgs-regression": "nixpkgs-regression",
         "pre-commit-hooks": "pre-commit-hooks"
@@ -1436,7 +1434,7 @@
         "flake-compat": "flake-compat_3",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": "nix-eval-jobs",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1723043911,
@@ -1453,6 +1451,22 @@
       }
     },
     "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1722813957,
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1686020360,
         "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@@ -1468,7 +1482,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1714912032,
         "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@@ -1484,7 +1498,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1720957393,
         "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
@@ -1581,6 +1595,22 @@
       }
     },
     "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1723136237,
+        "narHash": "sha256-f2yp4ScD1d5D4DneqMVrndFGKHMhYcxxC5oWTEn2iDM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2c05999807a16016e18a2aa6fab98142fc5da2cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1722813957,
         "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
@@ -1596,7 +1626,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1720781449,
         "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
@@ -1612,22 +1642,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1722813957,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nmd": {
       "flake": false,
       "locked": {
@@ -3316,7 +3330,7 @@
         "nix-super": "nix-super",
         "nixos-hardware": "nixos-hardware",
         "nixpak": "nixpak",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "quickshell": "quickshell",
         "schizofox": "schizofox",
@@ -3432,7 +3446,7 @@
     "spicetify-nix": {
       "inputs": {
         "flake-utils": "flake-utils_7",
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1704167711,
@@ -3481,7 +3495,7 @@
         "flake-compat": "flake-compat_5",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1722946882,
@@ -3671,7 +3685,7 @@
     },
     "treefmt-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1722330636,
diff --git a/flake.nix b/flake.nix
index 0e437a8..a55c08e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
     # Nix but better
     nix-super = {
       url = "github:privatevoid-net/nix-super";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     home-manager = {
diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix
index 4eff46c..c709167 100644
--- a/modules/system/nix/module.nix
+++ b/modules/system/nix/module.nix
@@ -1,3 +1,4 @@
+# credits to raf
 {
   pkgs,
   inputs',
diff --git a/modules/system/nix/nixpkgs.nix b/modules/system/nix/nixpkgs.nix
index e41e79c..f48d69c 100644
--- a/modules/system/nix/nixpkgs.nix
+++ b/modules/system/nix/nixpkgs.nix
@@ -1,3 +1,4 @@
+# taken from raf
 {
   # Global nixpkgs configuration. This is ignored if nixpkgs.pkgs is set
   # which is a case that should be avoided. Everything that is set to configure