From d21c7631abce87e80e7500173f34cbf9d8488357 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.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 47203015..10202a17 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
   inputs = {
     # Track channels with commits tested and built by hydra
     nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05";
-    nixos.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos.url = "github:nixos/nixpkgs/nixos-23.05";
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
     master.url = "github:nixos/nixpkgs/master";
 
@@ -37,6 +37,10 @@
 
     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";
@@ -54,6 +58,7 @@
     agenix,
     deploy,
     tritonshell,
+    nvfetcher,
     ...
   } @ inputs:
     digga.lib.mkFlake
@@ -69,20 +74,18 @@
       channels = {
         nixos = {
           imports = [(digga.lib.importOverlays ./overlays)];
-          overlays = [];
-        };
-        nixos-22-05 = {};
-        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;
               };
             })
           ];
         };
+        nixos-22-05 = {};
+        latest = {};
         master = {};
       };
 
@@ -96,6 +99,7 @@
           });
         })
         agenix.overlays.default
+        nvfetcher.overlays.default
 
         (import ./pkgs)
       ];
@@ -193,7 +197,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "pub-solar";
-            path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
+            path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
           };
         };
         powder = {
@@ -202,7 +206,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "pub-solar";
-            path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
+            path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
           };
         };
       };