From 8eb4a0e6b931e428c16ccc33df6d25c7ec830a1d Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 21 Jul 2023 12:04:14 +0200
Subject: [PATCH] nvfetcher: use version 0.6.1.0 from latest instead of flake

---
 flake.lock             | 68 ++++--------------------------------------
 flake.nix              |  6 ----
 overlays/overrides.nix |  1 +
 3 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3970b7d4..92b24f41 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,7 +92,7 @@
     "devshell_2": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1686680692,
@@ -217,24 +217,6 @@
       }
     },
     "flake-utils_3": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
       "locked": {
         "lastModified": 1653893745,
         "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@@ -249,9 +231,9 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_4": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -399,30 +381,6 @@
         "type": "github"
       }
     },
-    "nvfetcher": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1684337341,
-        "narHash": "sha256-v9bOz/mZ58kS1x2YYfPoWy6CfK3w1R/ZyZmqSCs1QO8=",
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "rev": "d3226cb40df74dd6b432d5ce15bbcb05f3825ce2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -436,7 +394,6 @@
         "nixos": "nixos",
         "nixos-22-05": "nixos-22-05",
         "nixos-hardware": "nixos-hardware",
-        "nvfetcher": "nvfetcher",
         "triton-vmtools": "triton-vmtools",
         "tritonshell": "tritonshell"
       }
@@ -471,24 +428,9 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "triton-vmtools": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "latest"
         ]
@@ -513,7 +455,7 @@
     "tritonshell": {
       "inputs": {
         "devshell": "devshell_2",
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "latest"
         ]
diff --git a/flake.nix b/flake.nix
index f73b26b9..723ac6f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,10 +37,6 @@
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
-    nvfetcher.url = "github:berberman/nvfetcher";
-    nvfetcher.inputs.nixpkgs.follows = "nixos";
-    nvfetcher.inputs.flake-compat.follows = "flake-compat";
-
     # PubSolarOS additions
     triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra?ref=main&dir=vmtools";
     triton-vmtools.inputs.nixpkgs.follows = "latest";
@@ -58,7 +54,6 @@
     agenix,
     deploy,
     tritonshell,
-    nvfetcher,
     ...
   } @ inputs:
     digga.lib.mkFlake
@@ -98,7 +93,6 @@
           });
         })
         agenix.overlays.default
-        nvfetcher.overlays.default
 
         (import ./pkgs)
       ];
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 6c56feff..ec7088f2 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -4,6 +4,7 @@ channels: final: prev: {
   inherit
     (channels.latest)
     nixd
+    nvfetcher
     thunderbird
     ;