home/jdigi/packages.nix

@@ -4,6 +4,7 @@
   home.packages = with pkgs; [
     blender
     btrfs-assistant
+    bottles
     darktable
     discord
     element-desktop

hosts/Joe-Desktop/hardware/default.nix

@@ -16,5 +16,8 @@
     "xhci_pci"
   ];
 
-  hardware.amd-graphics.enable = true;
+  hardware = {
+    amd-graphics.enable = true;
+    monitor-control.enable = true;
+  };
 }

modules/options/hardware/default.nix

@@ -4,6 +4,7 @@
   imports = [
     ./amd-graphics.nix
     ./intel-graphics.nix
+    ./monitor-control.nix
     ./nvidia.nix
     ./scsi-generic.nix
     ./xbox-one-controller.nix

modules/options/hardware/monitor-control.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config = lib.mkIf config.hardware.monitor-control.enable {
+    environment.systemPackages = with pkgs; [
+      ddcutil
+    ];
+
+    boot.kernelModules = [ "i2c-dev" ];
+  };
+
+  options.hardware.monitor-control.enable = lib.mkEnableOption "enable support for controlling monitor settings.";
+}

modules/options/hardware/nvidia.nix

@@ -9,5 +9,5 @@
     services.xserver.videoDrivers = [ "nvidia" ];
   };
 
-  options.hardware.nvidia.enable = lib.mkEnableOption "enable support for Intel Arc graphics cards.";
+  options.hardware.nvidia.enable = lib.mkEnableOption "enable support for Nvidia graphics.";
 }

modules/options/hardware/scsi-generic.nix

@@ -2,7 +2,7 @@
 
 {
   config = lib.mkIf config.hardware.scsi-generic.enable {
-    boot.initrd.kernelModules = [ "sg" ];
+    boot.kernelModules = [ "sg" ];
   };
 
   options.hardware.scsi-generic.enable = lib.mkEnableOption "enable support for SCSI Generic driver";

modules/options/hardware/xbox-one-controller.nix

@@ -2,17 +2,11 @@
 
 {
   config = lib.mkIf config.hardware.xbox-one-controller.enable {
-    boot = {
-      extraModulePackages = with config.boot.kernelPackages; [
-        xone
-        xpadneo
-      ];
-      kernelModules = [
-        "xone"
-        "xpadneo"
-      ];
+    hardware = {
+      xone.enable = true;
+      xpadneo.enable = true;
     };
   };
 
-  options.hardware.xbox-one-controller.enable = lib.mkEnableOption "enable support for AMD graphics.";
+  options.hardware.xbox-one-controller.enable = lib.mkEnableOption "enable support for Xbox One controllers.";
 }