From 75854e14559667a7dec084f311f36b273721118f Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Fri, 16 Aug 2024 23:05:45 +0200
Subject: [PATCH] I am going insane

---
 hosts/vali/hermit/configuration.nix             | 7 +------
 modules/options/system/hardware.nix             | 9 ++-------
 modules/options/system/module.nix               | 6 ++++++
 modules/system/hardware/graphics.nix            | 7 +++----
 modules/system/os/networking/networkmanager.nix | 2 +-
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix
index 7e90314..bf68b61 100644
--- a/hosts/vali/hermit/configuration.nix
+++ b/hosts/vali/hermit/configuration.nix
@@ -25,6 +25,7 @@
   programs.dconf.enable = true;
   virtualisation.docker.enable = true;
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+
   modules = {
     system = {
       hardware = {
@@ -108,7 +109,6 @@
       newsboat.enable = true;
       fish.enable = true;
       nh.enable = true;
-      steam.enable = true;
       waybar.enable = true;
     };
     services = {
@@ -116,11 +116,6 @@
     };
     theming = {
       quickshell.enable = true;
-      qt = {
-        enable = false;
-        package = pkgs.kde-gruvbox;
-        name = "Gruvbox-Dark";
-      };
     };
   };
   system.stateVersion = "23.11";
diff --git a/modules/options/system/hardware.nix b/modules/options/system/hardware.nix
index 064d49a..6fc8b87 100644
--- a/modules/options/system/hardware.nix
+++ b/modules/options/system/hardware.nix
@@ -1,15 +1,10 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
+{lib, ...}: let
   inherit (lib) mkOption mkEnableOption;
-  inherit (lib.types) str package int;
 in {
   options.modules.system.hardware = {
     nvidia = {
       enable = mkEnableOption "Nvidia Nvidia graphics drivers";
     };
+    amd.enable = mkEnableOption "AMD graphics drivers";
   };
 }
diff --git a/modules/options/system/module.nix b/modules/options/system/module.nix
index bdbe821..144ed91 100644
--- a/modules/options/system/module.nix
+++ b/modules/options/system/module.nix
@@ -97,6 +97,12 @@ in {
       nvidia = mkEnableOption "Nvidia graphics drivers";
       amd = mkEnableOption "AMD graphics drivers";
     };
+    hardware = {
+      nvidia = {
+        enable = mkEnableOption "Nvidia Nvidia graphics drivers";
+      };
+      amd.enable = mkEnableOption "AMD graphics drivers";
+    };
 
     hardware.bluetooth = {
       enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";
diff --git a/modules/system/hardware/graphics.nix b/modules/system/hardware/graphics.nix
index f138b4f..a320151 100644
--- a/modules/system/hardware/graphics.nix
+++ b/modules/system/hardware/graphics.nix
@@ -4,8 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.system.hardware;
-  inherit (cfg) amd nvidia;
+  inherit (config.modules.system.hardware) nvidia amd;
   inherit (lib) mkIf;
 in {
   config = {
@@ -16,7 +15,7 @@ in {
           mkIf amd.enable [
             mesa
             libva
-            vaapiVdpau
+            vaapiVdpa
           ];
       };
     };
@@ -27,7 +26,7 @@ in {
         enable = true;
         finegrained = false;
         nvidiaSettings = false;
-        package = config.boot.kernelPackges.nvidiaPackages.beta;
+        package = config.boot.kernelPackages.nvidiaPackages.beta;
       };
     };
     boot.initrd.kernelModules = mkIf amd.enable ["amdgpu"];
diff --git a/modules/system/os/networking/networkmanager.nix b/modules/system/os/networking/networkmanager.nix
index 08e715d..63efdf8 100644
--- a/modules/system/os/networking/networkmanager.nix
+++ b/modules/system/os/networking/networkmanager.nix
@@ -13,7 +13,7 @@ in {
     ];
     wifi = {
       # Generate a randomized value upon each connect
-      macAdress = "random";
+      macAddress = "random";
 
       # Enable Wi-Fi power saving
       powersave = true;