move most configurations to modules

2 files changed, 51 insertions, 0 deletions

diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
new file mode 100644
index 0000000..00f3169
--- /dev/null
+++ b/modules/hardware/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.myHardware;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.myHardware.enable = mkEnableOption "hardware module";
+
+  imports = [
+    ./nvidia.nix
+  ];
+
+  config = mkIf cfg.enable {
+    hardware.enableAllFirmware = true;
+  };
+}
diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
new file mode 100644
index 0000000..12f6550
--- /dev/null
+++ b/modules/hardware/nvidia.nix
@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.myHardware.nvidia;
+  inherit (lib) mkEnableOption mkIf;
+in {
+  options.myHardware.nvidia.enable = mkEnableOption "enable nvidia support";
+
+  config = mkIf cfg.enable {
+    myHardware.enable = true;
+
+    hardware = {
+      nvidia = {
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
+        modesetting.enable = true;
+      };
+
+      opengl = {
+        enable = true;
+        # make steam work
+        driSupport32Bit = true;
+        extraPackages = with pkgs; [
+          vaapiVdpau
+        ];
+      };
+    };
+
+    services.xserver.videoDrivers = ["nvidia"];
+  };
+}