flake: Update inputs

nifoc · Sep 12, 2023 · 1b4c9d6 · 1b4c9d6
1 parent a7f2ea7
commit 1b4c9d6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 45 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixos-stable.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     # Tools
@@ -24,7 +24,7 @@
 
     disko = {
       url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
 
     nix-darwin = {
@@ -34,15 +34,18 @@
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     agenix = {
       url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.darwin.follows = "nix-darwin";
+      inputs = {
+        nixpkgs.follows = "nixos-unstable";
+        darwin.follows = "nix-darwin";
+        home-manager.follows = "home-manager";
+      };
     };
 
     attic = {
@@ -71,27 +74,37 @@
           };
 
           tanker = import ./system/flakes/tanker.nix {
-            inherit (inputs) nixpkgs nixos-stable disko deploy-rs home-manager agenix attic;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) disko deploy-rs home-manager agenix attic;
             inherit inputs;
           };
 
           mediaserver = import ./system/flakes/mediaserver.nix {
-            inherit (inputs) nixpkgs deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           argon = import ./system/flakes/argon.nix {
-            inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) nixos-hardware deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           weather-sdr = import ./system/flakes/weather-sdr.nix {
-            inherit (inputs) nixpkgs deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           adsb-antenna = import ./system/flakes/adsb-antenna.nix {
-            inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) nixos-hardware deploy-rs home-manager;
             inherit inputs;
           };
         in

diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix
@@ -1,15 +1,13 @@
-{ nixpkgs, nixos-stable, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
+{ nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
 
 let
   default-system = "x86_64-linux";
 
-  overlay-stable = _: _: { pkgs-stable = import nixos-stable { system = default-system; }; };
   # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
-      overlay-stable
       # overlay-master
       overlay-nifoc
     ];