From f964dd38033ba7e0c92b206f854d1d18bb778681 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 31 May 2023 20:59:02 +0200
Subject: [PATCH] flake: use nixos-23.05

Use overlay for nvfetcher for recent fixes from master branch
---
 flake.lock | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  | 14 ++++++++-----
 2 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index dfb93ccb..f1d08d5c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -197,6 +197,24 @@
         "type": "github"
       }
     },
+    "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"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -281,6 +299,30 @@
         "type": "github"
       }
     },
+    "nvfetcher": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixos"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685158767,
+        "narHash": "sha256-vgyu3jsnGDDAEYg4y/oFk2IaTCXUlce0ZaLtQprhmFk=",
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "rev": "c5ae2cb436a04f4590306589e71638d023a33bd4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -291,7 +333,23 @@
         "home": "home",
         "latest": "latest",
         "nixos": "nixos",
-        "nixos-hardware": "nixos-hardware"
+        "nixos-hardware": "nixos-hardware",
+        "nvfetcher": "nvfetcher"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index d7f45cbe..868ee558 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,10 @@
     agenix.inputs.darwin.follows = "darwin";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
+
+    nvfetcher.url = "github:berberman/nvfetcher";
+    nvfetcher.inputs.nixpkgs.follows = "nixos";
+    nvfetcher.inputs.flake-compat.follows = "flake-compat";
   };
 
   outputs = {
@@ -44,6 +48,7 @@
     nixos-hardware,
     agenix,
     deploy,
+    nvfetcher,
     ...
   } @ inputs:
     digga.lib.mkFlake
@@ -59,19 +64,17 @@
       channels = {
         nixos = {
           imports = [(digga.lib.importOverlays ./overlays)];
-          overlays = [];
-        };
-        latest = {
           overlays = [
             deploy.overlay
             (self: super: {
               deploy-rs = {
-                inherit (inputs.latest.legacyPackages.x86_64-linux) deploy-rs;
+                inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
                 lib = super.deploy-rs.lib;
               };
             })
           ];
         };
+        latest = {};
       };
 
       lib = import ./lib {lib = digga.lib // nixos.lib;};
@@ -84,6 +87,7 @@
           });
         })
         agenix.overlays.default
+        nvfetcher.overlays.default
 
         (import ./pkgs)
       ];
@@ -167,7 +171,7 @@
         #  profilesOrder = ["system" "direnv"];
         #  profiles.direnv = {
         #    user = "bartender";
-        #    path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
+        #    path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
         #  };
         #};
       };