From e29f3fe6441b21765966a4ea91cf18aeef591fe0 Mon Sep 17 00:00:00 2001
From: GaspardCulis <gaspard@gasdev.fr>
Date: Mon, 18 Nov 2024 09:55:20 +0100
Subject: [PATCH] refactor(Zephyrus): Hardware config now defined by
 `nixos-hardware` modules

---
 flake.lock                                | 11 ++++++-----
 flake.nix                                 |  5 ++---
 hosts/Zephyrus/hardware-configuration.nix | 19 -------------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e1f30f..6871b7f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -493,15 +493,16 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731403644,
-        "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
-        "owner": "nixos",
+        "lastModified": 1731797098,
+        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
+        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
+        "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 39f1389..0716ad8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -56,9 +57,6 @@
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    # Rasoberry PI
-    nixos-hardware.url = "github:nixos/nixos-hardware";
   };
 
   outputs = {
@@ -81,6 +79,7 @@
         modules = [
           ./hosts/Zephyrus
           disko.nixosModules.disko
+          nixos-hardware.nixosModules.asus-zephyrus-ga503
           home-manager.nixosModules.home-manager
           jovian.nixosModules.jovian
         ];
diff --git a/hosts/Zephyrus/hardware-configuration.nix b/hosts/Zephyrus/hardware-configuration.nix
index 8732245..d78da50 100644
--- a/hosts/Zephyrus/hardware-configuration.nix
+++ b/hosts/Zephyrus/hardware-configuration.nix
@@ -3,7 +3,6 @@
 # to /etc/nixos/configuration.nix instead.
 {
   pkgs,
-  config,
   lib,
   modulesPath,
   ...
@@ -88,23 +87,6 @@
     ];
   };
 
-  hardware.nvidia = {
-    modesetting.enable = true;
-
-    open = false; # Bruuh
-
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-
-      amdgpuBusId = "PCI:7:0:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
-  };
-  services.xserver.videoDrivers = ["nvidia"];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
@@ -115,5 +97,4 @@
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }