From cff1f34d05f0a09f4908b9a6fb214748576db22a Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Wed, 15 Mar 2023 09:13:40 +0100
Subject: [PATCH] [Hardware/Nvidia] Move nvidia.nix into nvidia/default.nix

---
 hardware/nvidia.nix         | 20 --------------------
 hardware/nvidia/default.nix | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 hardware/nvidia.nix

diff --git a/hardware/nvidia.nix b/hardware/nvidia.nix
deleted file mode 100644
index 363aea5..0000000
--- a/hardware/nvidia.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.aviallon.hardware.nvidia;
-in
-{
-  imports = [
-    ./nvidia
-  ];
-
-  options.aviallon.hardware.nvidia = {
-    enable = mkEnableOption "enable Nvidia hardware config";
-    useProprietary = mkEnableOption "nvidia proprietary drivers";
-    saveAllVram = mkEnableOption "back up all VRAM in /tmp before going to sleep. May reduce artifacts after resuming";
-  };
-
-  config = mkIf cfg.enable {
-    hardware.opengl.driSupport32Bit = true;
-  };
-}
diff --git a/hardware/nvidia/default.nix b/hardware/nvidia/default.nix
index 451b5cd..83831e1 100644
--- a/hardware/nvidia/default.nix
+++ b/hardware/nvidia/default.nix
@@ -1,8 +1,23 @@
-{config, ...}:
-{
+{config, pkgs, lib, ...}:
+with lib;
+let
+  cfg = config.aviallon.hardware.nvidia;
+in {
+
   imports = [
     ./vgpu.nix
     ./proprietary.nix
     ./opensource.nix
   ];
+
+  options.aviallon.hardware.nvidia = {
+    enable = mkEnableOption "enable Nvidia hardware config";
+    useProprietary = mkEnableOption "nvidia proprietary drivers";
+    saveAllVram = mkEnableOption "back up all VRAM in /tmp before going to sleep. May reduce artifacts after resuming";
+  };
+
+  config = mkIf cfg.enable {
+    hardware.opengl.driSupport32Bit = true;
+  };
+
 }