From c85cd1a0c82c0bfafb7146801eccc56269b545ed Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Tue, 28 May 2024 11:34:36 -0400
Subject: [PATCH] Switch nixos-hardware back to upstream

---
 flake.lock                   | 26 +++++++++++++-------------
 flake.nix                    |  5 ++++-
 modules/services/forgejo.nix |  1 +
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 48c7dac..2e67468 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716506851,
-        "narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=",
+        "lastModified": 1716856858,
+        "narHash": "sha256-dfNGs2AW/V31nMVeEBSUJCMfT6bZAKJ5qsWgFHWhvUc=",
         "ref": "refs/heads/main",
-        "rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
-        "revCount": 83,
+        "rev": "38f31ee7c1a60adae58833789dd855c128b056c6",
+        "revCount": 85,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -265,18 +265,18 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1716588418,
-        "narHash": "sha256-3EpFUFlZjE+UkBlSXp2lC65ysgUmpAHl13kjh45+et0=",
+        "lastModified": 1716881121,
+        "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=",
         "ref": "master",
-        "rev": "80736f76ded618a54dce2db319247aeb902ce795",
-        "revCount": 1683,
+        "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf",
+        "revCount": 1694,
         "type": "git",
-        "url": "https://code.8bitbuddhism.com/aires/nixos-hardware"
+        "url": "https://github.com/NixOS/nixos-hardware"
       },
       "original": {
         "ref": "master",
         "type": "git",
-        "url": "https://code.8bitbuddhism.com/aires/nixos-hardware"
+        "url": "https://github.com/NixOS/nixos-hardware"
       }
     },
     "nixpkgs": {
@@ -313,11 +313,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716542732,
-        "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
+        "lastModified": 1716793392,
+        "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
+        "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 86b248b..f534246 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,8 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1";
 
     # Hardware configurations
-    nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master";
+    #nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master";
+	nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master";
 
     # Home-manager
     home-manager = {
@@ -98,6 +99,7 @@
           system = "x86_64-linux";
           modules = defaultModules ++ [
             nixos-hardware.nixosModules.common-cpu-intel
+			nixos-hardware.nixosModules.common-gpu-intel
             ./hosts/Dimaga
           ];
         };
@@ -106,6 +108,7 @@
           system = "x86_64-linux";
           modules = defaultModules ++ [
             nixos-hardware.nixosModules.common-cpu-amd-pstate
+            nixos-hardware.nixosModules.common-gpu-amd
             ./hosts/Haven
           ];
         };
diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix
index 6e43a35..e0a8ec8 100644
--- a/modules/services/forgejo.nix
+++ b/modules/services/forgejo.nix
@@ -72,6 +72,7 @@ in
           labels = [
             "nix:docker://nixos/nix" # Shoutout to Icewind 1991 for this syntax: https://icewind.nl/entry/gitea-actions-nix/
             "debian:docker://node:20-bullseye"
+			"ubuntu-latest:docker://ubuntu:latest"
           ];
           settings = {
             # For an example of configuring in Nix: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix