From d518e9ffe4ffa31579779b04a5a8f91305fe5c8e Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Tue, 2 Jul 2024 22:22:26 +0200
Subject: [PATCH] flake update and move all back to nixos-hardware master

---
 flake.lock        | 17 -----------------
 flake.nix         |  7 +++----
 hosts/default.nix |  4 ++--
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index fbbbaf3..3a328f2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -331,22 +331,6 @@
       }
     },
     "nixos-hardware": {
-      "locked": {
-        "lastModified": 1718893823,
-        "narHash": "sha256-Dc8I6HV5EfCgPFXXpA23AunvwA+Jg++Z0X5gm7BXeZI=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "2f893e185c850bcd6dbf4fbc0c61b1b90d23ff79",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "2f893e185c850bcd6dbf4fbc0c61b1b90d23ff79",
-        "type": "github"
-      }
-    },
-    "nixos-hardware-master": {
       "locked": {
         "lastModified": 1719895800,
         "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
@@ -447,7 +431,6 @@
         "lanzaboote": "lanzaboote",
         "microvm": "microvm",
         "nixos-hardware": "nixos-hardware",
-        "nixos-hardware-master": "nixos-hardware-master",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index 212c21b..f535c36 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,7 @@
     {
       nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";                  # Nix Packages
       nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-      nixos-hardware-master.url = "github:NixOS/nixos-hardware/master";
-      nixos-hardware.url = "github:NixOS/nixos-hardware/2f893e185c850bcd6dbf4fbc0c61b1b90d23ff79";
+      nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
       microvm = {
         url = "github:astro/microvm.nix";
@@ -50,12 +49,12 @@
 
     };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nixos-hardware-master, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:   # Function that tells my flake which to use and what do what to do with the dependencies.
     rec {
         nixosConfigurations = (                                               # NixOS configurations
           import ./hosts {                                                    # Imports ./hosts/default.nix
             inherit (nixpkgs) lib;
-            inherit inputs nixpkgs nixpkgs-unstable nixos-hardware nixos-hardware-master home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
+            inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote;   # Also inherit home-manager so it does not need to be defined here.
             nix.allowedUsers = [ "@wheel" ];
             security.sudo.execWheelOnly = true;
           }
diff --git a/hosts/default.nix b/hosts/default.nix
index 98ab8e6..bdd95c2 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -11,7 +11,7 @@
 #            └─ ./home.nix 
 #
 
-{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, nixos-hardware-master, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:
+{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:
 
 let
   user = "kabbone";
@@ -82,7 +82,7 @@ in
 
   steamdeck = nixpkgs-unstable.lib.nixosSystem {            # steamdeck profile
     inherit system;
-    specialArgs = { inherit inputs user location nixos-hardware-master agenix jovian-nixos lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; };
     modules = [
       agenix.nixosModules.default
       jovian-nixos.nixosModules.default