From 1dedbbb489d6e2088d02d879d6ad70dadb644f5f Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Thu, 8 Feb 2024 15:08:16 +0100
Subject: [PATCH] Rename some common options to hardware

---
 system/hardware/bluetooth.nix | 4 ++--
 system/hardware/nvidia.nix    | 6 +++---
 system/hardware/opengl.nix    | 4 ++--
 system/hardware/sound.nix     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/system/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
index 1a8c7fb..a6916aa 100644
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ...}:
 let
-  cfg = config.nixfiles.common.bluetooth;
+  cfg = config.nixfiles.hardware.bluetooth;
 in
 {
-  options.nixfiles.common.bluetooth = {
+  options.nixfiles.hardware.bluetooth = {
     enable = lib.mkEnableOption "Bluetooth";
   };
 
diff --git a/system/hardware/nvidia.nix b/system/hardware/nvidia.nix
index 1011b96..7b36584 100644
--- a/system/hardware/nvidia.nix
+++ b/system/hardware/nvidia.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ...}:
 let
-  cfg = config.nixfiles.common.nvidia;
+  cfg = config.nixfiles.hardware.nvidia;
 in
 {
   # imports = [
@@ -8,13 +8,13 @@ in
   # ];
 
   # Load nvidia driver for Xorg and Wayland
-  options.nixfiles.common.nvidia = {
+  options.nixfiles.hardware.nvidia = {
     modesetting.enable = lib.mkEnableOption "NVIDIA configuration with modesetting";
   };
   config = lib.mkIf cfg.modesetting.enable {
     services.xserver.videoDrivers = ["nvidia"];
 
-    nixfiles.common.opengl.enable = true;
+    nixfiles.hardware.opengl.enable = true;
 
     hardware.nvidia = {
 
diff --git a/system/hardware/opengl.nix b/system/hardware/opengl.nix
index afad162..b48a19b 100644
--- a/system/hardware/opengl.nix
+++ b/system/hardware/opengl.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ...}:
 let
-  cfg = config.nixfiles.common.opengl;
+  cfg = config.nixfiles.hardware.opengl;
 in
 {
-  options.nixfiles.common.opengl.enable = lib.mkEnableOption "OpenGL configuration";
+  options.nixfiles.hardware.opengl.enable = lib.mkEnableOption "OpenGL configuration";
   config = lib.mkIf cfg.enable {
     # Enable OpenGL
     hardware.opengl = {
diff --git a/system/hardware/sound.nix b/system/hardware/sound.nix
index cf52088..ab264bd 100644
--- a/system/hardware/sound.nix
+++ b/system/hardware/sound.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ...}:
 let
-  cfg = config.nixfiles.common.sound;
+  cfg = config.nixfiles.hardware.sound;
   inherit (lib) mkEnableOption mkIf mkDefault;
 in
 {
@@ -8,7 +8,7 @@ in
   # sound.enable = true;
   # hardware.pulseaudio.enable = true;
 
-  options.nixfiles.common.sound = {
+  options.nixfiles.hardware.sound = {
     enable = mkEnableOption "sound configuration";
   };