From 60bd2e3271f1c83bbb105e5a6b7ca5cb4b8662bb Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Sun, 16 Apr 2023 13:43:17 +0200
Subject: [PATCH] Add gitpkgs to flake inputs and configure package overlays.

---
 flake.lock       | 48 ++++++++++++++++++++++++++++++++----------------
 flake.nix        |  5 +++--
 pkgs/nixpkgs.nix | 28 +++++++++++++++++++---------
 3 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 373f5e6..c9b5adb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,13 +84,28 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs-git": {
       "locked": {
-        "lastModified": 1681349002,
-        "narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=",
+        "lastModified": 1681645985,
+        "narHash": "sha256-WoKbmu+Mp1KMX14/Y5C2Y9hi1e5IAV/xVE7wZcwEuuM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c",
+        "rev": "ec2b9644eb7f78752a93290eb6b766ac98b71fb5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1681482634,
+        "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
         "type": "github"
       },
       "original": {
@@ -102,11 +117,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1681005198,
-        "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=",
+        "lastModified": 1681613598,
+        "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a",
+        "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac",
         "type": "github"
       },
       "original": {
@@ -118,11 +133,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1681465517,
-        "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=",
+        "lastModified": 1681557730,
+        "narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4",
+        "rev": "85b081528b937df4bfcaee80c3541b58f397df8b",
         "type": "github"
       },
       "original": {
@@ -134,11 +149,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1681465517,
-        "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=",
+        "lastModified": 1681557730,
+        "narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4",
+        "rev": "85b081528b937df4bfcaee80c3541b58f397df8b",
         "type": "github"
       },
       "original": {
@@ -152,6 +167,7 @@
       "inputs": {
         "mailserver": "mailserver",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-git": "nixpkgs-git",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
@@ -165,11 +181,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1681209176,
-        "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=",
+        "lastModified": 1681613729,
+        "narHash": "sha256-9Qb0tHW8l1hgFkuB76n4VT9UNUaR7QL3CgmJ5hcVYEg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1",
+        "rev": "b7a6670a28b01cd1f62879921e36be2c69c4137a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f12e59a..909392f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,10 @@
 {
   description = "NixOS Configuration";
   inputs = rec {
-    nixpkgs.url = "github:/NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-unstable.url = "github:/NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-git.url = "github:/NixOS/nixpkgs";
     nixpkgs-stable.url = "github:/NixOS/nixpkgs/nixos-22.11";
+    nixpkgs-unstable.url = "github:/NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:/NixOS/nixpkgs/nixos-unstable";
     mailserver.url = "gitlab:/simple-nixos-mailserver/nixos-mailserver";
     sops-nix = {
       url = github:Mic92/sops-nix;
diff --git a/pkgs/nixpkgs.nix b/pkgs/nixpkgs.nix
index dc2315f..65a778d 100644
--- a/pkgs/nixpkgs.nix
+++ b/pkgs/nixpkgs.nix
@@ -1,17 +1,27 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs,
+  nixpkgs-unstable, nixpkgs-stable, nixpkgs-git,
+  ... }:
 
 let
   callPackage = pkgs.callPackage;
 in {
-  nixpkgs.config = {
-    allowUnfree = true;
-    mpv.vaapiSupport = (lib.elem "xserver" config.machine.services);
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      mpv.vaapiSupport = (lib.elem "xserver" config.machine.services);
 
-    packageOverrides = {
-      theme_flat-remix = callPackage ./flat-remix { };
-      theme_sddm_midnight = callPackage ./sddm_midnight { };
-      xdiskusage = callPackage ./xdiskusage { };
-      gitpkgs = import /nixpkgs {};
+      packageOverrides = {
+        theme_flat-remix = callPackage ./flat-remix { };
+        theme_sddm_midnight = callPackage ./sddm_midnight { };
+        xdiskusage = callPackage ./xdiskusage { };
+      };
     };
+    overlays = [
+      (final: prev: {
+        gitpkgs = nixpkgs-git.legacyPackages."${prev.system}";
+        stablepkgs = nixpkgs-stable.legacyPackages."${prev.system}";
+        unstablepkgs = nixpkgs-unstable.legacyPackages."${prev.system}";
+      })
+    ];
   };
 }