systems: use nixos-hardware

5 files changed, 20 insertions, 6 deletions

diff --git a/flake.lock b/flake.lock
index 87c3d0a..77f5468 100644
--- a/flake.lock
+++ b/flake.lock
@@ -343,6 +343,21 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1699159446,
+        "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "627bc9b88256379578885a7028c9e791c29fb581",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": [
@@ -499,6 +514,7 @@
         "lanzaboote": "lanzaboote",
         "nix-index-database": "nix-index-database",
         "nixinate": "nixinate",
+        "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
diff --git a/flake.nix b/flake.nix
index 22c6d5b..2a1fb35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,6 +96,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+
     nixos-wsl = {
       url = "github:nix-community/NixOS-WSL";
       inputs = {
diff --git a/systems/common.nix b/systems/common.nix
index ac7fcde..b1a4159 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -22,7 +22,6 @@ in {
     ])
     ++ [
       self.nixosModules.default
-      self.nixosModules.hardware
       self.nixosModules.features
 
       hmSetup
diff --git a/systems/default.nix b/systems/default.nix
index 31e9004..323d361 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -38,6 +38,8 @@ in {
         modules =
           [
             inputs.lanzaboote.nixosModules.lanzaboote
+            inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
+            inputs.nixos-hardware.nixosModules.common-pc-ssd
           ]
           ++ nixos;
       };
diff --git a/systems/glados/default.nix b/systems/glados/default.nix
index d79b6e1..bd62702 100644
--- a/systems/glados/default.nix
+++ b/systems/glados/default.nix
@@ -25,11 +25,6 @@
     virtualisation.enable = true;
   };
 
-  hardware = {
-    nvidia.enable = true;
-    ssd.enable = true;
-  };
-
   home-manager.users.seth = {
     desktop.enable = true;
   };