5 files changed, 1 insertions, 43 deletions
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index aadc5bd..80b0ae1 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -8,6 +8,5 @@
     budgie = ./desktop/budgie;
     server = ./server;
     services = ./services;
-    hardware = ./hardware;
   };
 }
diff --git a/modules/nixos/features/virtualisation.nix b/modules/nixos/features/virtualisation.nix
index 2c9c527..3ecc9a5 100644
--- a/modules/nixos/features/virtualisation.nix
+++ b/modules/nixos/features/virtualisation.nix
@@ -13,7 +13,7 @@ in {
   config.virtualisation = lib.mkIf cfg.enable {
     podman = {
       enable = true;
-      enableNvidia = lib.mkDefault (config.hardware.nvidia.enable or false);
+      enableNvidia = lib.mkDefault (builtins.elem "nvidia" (config.services.xserver.videoDrivers or []));
       extraPackages = with pkgs; [podman-compose];
       autoPrune.enable = true;
     };
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
deleted file mode 100644
index b939953..0000000
--- a/modules/nixos/hardware/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{lib, ...}: {
-  imports = [
-    ./ssd.nix
-    ./nvidia.nix
-  ];
-
-  hardware.enableAllFirmware = lib.mkDefault true;
-}
diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix
deleted file mode 100644
index fac9150..0000000
--- a/modules/nixos/hardware/nvidia.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.hardware.nvidia;
-  inherit (lib) mkEnableOption mkIf;
-in {
-  options.hardware.nvidia.enable = mkEnableOption "enable nvidia support";
-
-  config = mkIf cfg.enable {
-    hardware.nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      modesetting.enable = true;
-    };
-
-    services.xserver.videoDrivers = ["nvidia"];
-  };
-}
diff --git a/modules/nixos/hardware/ssd.nix b/modules/nixos/hardware/ssd.nix
deleted file mode 100644
index 7279a12..0000000
--- a/modules/nixos/hardware/ssd.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.hardware.ssd;
-  inherit (lib) mkEnableOption mkIf;
-in {
-  options.hardware.ssd.enable = mkEnableOption "ssd settings";
-
-  config = mkIf cfg.enable {
-    services.fstrim.enable = true;
-  };
-}