nixos, modules: rename myFlake.nixos.hardware.{cpu,gpu,misc} -> myFlake.nixos.hardware.components.{cpu,gpu,misc}

nixos/hardware/lenovo/legion/81fw/default.nix

@@ -7,7 +7,7 @@
     (modulesPath + "/installer/scan/not-detected.nix") # what is this
   ];
 
-  myFlake.nixos.hardware = {
+  myFlake.nixos.hardware.components = {
     cpu.intel.enable = true;
 
     gpu.intel.enable = true;

nixos/modules/hardware/components/cpu/intel.nix

@@ -3,10 +3,10 @@
   config,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.cpu.intel;
+  cfg = config.myFlake.nixos.hardware.components.cpu.intel;
 in {
   options = {
-    myFlake.nixos.hardware.cpu.intel.enable = lib.mkEnableOption "Whether to enable Intel CPU.";
+    myFlake.nixos.hardware.components.cpu.intel.enable = lib.mkEnableOption "Whether to enable Intel CPU.";
   };
 
   config = lib.mkIf cfg.enable {

nixos/modules/hardware/components/default.nix

@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ./cpu
+    ./gpu
+    ./misc
+  ];
+}

nixos/modules/hardware/components/gpu/amd.nix

@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.gpu.amd;
+  cfg = config.myFlake.nixos.hardware.components.gpu.amd;
 in {
   options = {
-    myFlake.nixos.hardware.gpu.amd.enable = lib.mkEnableOption "Whether to enable AMD GPU.";
+    myFlake.nixos.hardware.components.gpu.amd.enable = lib.mkEnableOption "Whether to enable AMD GPU.";
   };
 
   # https://nixos.wiki/wiki/AMD_GPU

nixos/modules/hardware/components/gpu/intel.nix

@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.gpu.intel;
+  cfg = config.myFlake.nixos.hardware.components.gpu.intel;
 in {
   options = {
-    myFlake.nixos.hardware.gpu.intel.enable = lib.mkEnableOption "Whether to enable Intel GPU.";
+    myFlake.nixos.hardware.components.gpu.intel.enable = lib.mkEnableOption "Whether to enable Intel GPU.";
   };
 
   # https://nixos.wiki/wiki/Intel_Graphics

nixos/modules/hardware/components/gpu/nvidia.nix

@@ -3,11 +3,11 @@
   config,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.gpu.nvidia;
+  cfg = config.myFlake.nixos.hardware.components.gpu.nvidia;
 in {
   options = {
-    myFlake.nixos.hardware.gpu.nvidia.enable = lib.mkEnableOption "Whether to enable NVIDIA GPU.";
+    myFlake.nixos.hardware.components.gpu.nvidia.enable = lib.mkEnableOption "Whether to enable NVIDIA GPU.";
-    myFlake.nixos.hardware.gpu.nvidia.prime = lib.mkEnableOption "Whether to enable NVIDIA Prime.";
+    myFlake.nixos.hardware.components.gpu.nvidia.prime = lib.mkEnableOption "Whether to enable NVIDIA Prime.";
   };
 
   # https://nixos.wiki/wiki/Nvidia

nixos/modules/hardware/components/misc/audio.nix

@@ -3,11 +3,11 @@
   config,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.misc.audio;
+  cfg = config.myFlake.nixos.hardware.components.misc.audio;
 in {
   options = {
-    myFlake.nixos.hardware.misc.audio.enable = lib.mkEnableOption "Whether to enable audio.";
+    myFlake.nixos.hardware.components.misc.audio.enable = lib.mkEnableOption "Whether to enable audio.";
-    myFlake.nixos.hardware.misc.audio.soundServer = lib.mkOption {
+    myFlake.nixos.hardware.components.misc.audio.soundServer = lib.mkOption {
       type = lib.types.enum ["pipewire" "pulseaudio"];
       default = "pipewire";
       example = "pulseaudio";

nixos/modules/hardware/components/misc/bluetooth.nix

@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.misc.bluetooth;
+  cfg = config.myFlake.nixos.hardware.components.misc.bluetooth;
 in {
   options = {
-    myFlake.nixos.hardware.misc.bluetooth.enable = lib.mkEnableOption "Whether to enable bluetooth.";
+    myFlake.nixos.hardware.components.misc.bluetooth.enable = lib.mkEnableOption "Whether to enable bluetooth.";
   };
 
   # https://nixos.wiki/wiki/Bluetooth

nixos/modules/hardware/components/misc/fstrim.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myFlake.nixos.hardware.components.misc.fstrim;
+in {
+  options = {
+    myFlake.nixos.hardware.components.misc.fstrim.enable = lib.mkEnableOption "Whether to enable SSD triming in background.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.fstrim.enable = true;
+  };
+}

nixos/modules/hardware/components/misc/tpm.nix

@@ -3,10 +3,10 @@
   config,
   ...
 }: let
-  cfg = config.myFlake.nixos.hardware.misc.tpm;
+  cfg = config.myFlake.nixos.hardware.components.misc.tpm;
 in {
   options = {
-    myFlake.nixos.hardware.misc.tpm.enable = lib.mkEnableOption "Whether to enable TPM.";
+    myFlake.nixos.hardware.components.misc.tpm.enable = lib.mkEnableOption "Whether to enable TPM.";
   };
 
   # https://nixos.wiki/wiki/TPM

nixos/modules/hardware/default.nix

@@ -1,8 +1,6 @@
 {...}: {
   imports = [
     ./accessories
-    ./cpu
+    ./components
-    ./gpu
-    ./misc
   ];
 }

nixos/modules/hardware/misc/fstrim.nix

@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.myFlake.nixos.hardware.misc.fstrim;
-in {
-  options = {
-    myFlake.nixos.hardware.misc.fstrim.enable = lib.mkEnableOption "Whether to enable SSD triming in background.";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.fstrim.enable = true;
-  };
-}

nixos/profiles/core/default.nix

@@ -44,10 +44,10 @@
     getty.greetingLine = lib.strings.concatLines [
       ''NixOS ${config.system.nixos.label} ${config.system.nixos.codeName} (\m) - \l''
 
-      (lib.strings.optionalString config.myFlake.nixos.hardware.gpu.nvidia.enable
+      (lib.strings.optionalString config.myFlake.nixos.hardware.components.gpu.nvidia.enable
         "--my-next-gpu-wont-be-nvidia")
 
-      (lib.strings.optionalString config.myFlake.nixos.hardware.gpu.amd.enable
+      (lib.strings.optionalString config.myFlake.nixos.hardware.components.gpu.amd.enable
         "[    5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init")
     ];