curacao/hardware.nix

@@ -28,7 +28,6 @@
     };
     # Needs prefetched binary blobs, see https://nixos.wiki/wiki/Displaylink
     services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
-    # TODO See if nvidia and DL can work together.
   };
   imports = [
     nixos-hardware.nixosModules.dell-g3-3779

flake.lock

@@ -393,16 +393,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1715353627,
-        "narHash": "sha256-bt/KZsPUlQV1lOZU8vM3QT/05jHftCz88tA9+bXk83s=",
-        "ref": "fix-prefetch-npm-deps",
-        "rev": "1cb0b0434d83719d73946b4516475e5ca31a2f2d",
-        "revCount": 76,
+        "lastModified": 1715278311,
+        "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=",
+        "ref": "refs/heads/main",
+        "rev": "c8ab1e79ba0140bc75731c75177242089506260b",
+        "revCount": 75,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
       "original": {
-        "ref": "fix-prefetch-npm-deps",
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       }

hm/gaming/default.nix

@@ -13,14 +13,6 @@
 
         steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
         itch
-        (pkgs.python3Packages.ds4drv.overrideAttrs (old: {
-          src = fetchFromGitHub {
-            owner = "TheDrHax";
-            repo = "ds4drv-cemuhook";
-            rev = "a58f63b70f8d8efa33e5e82a8888a1e08754aeed";
-            sha256 = "sha256-oMvHw5zeO0skoiqLU+EdjUabTvkipeBh+m8RHJcWZP8=";
-          };
-        }))
       ];
       sessionVariables = {
         BOOT9_PATH = "${config.xdg.dataHome}/citra-emu/sysdata/boot9.bin";

os/desktop.nix

@@ -1,6 +1,9 @@
 { pkgs, lib, config, ... }:
 {
   config = lib.mkIf config.frogeye.desktop.xorg {
+    # Control external screen brightness
+    boot.extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
+
     services = {
       blueman.enable = true;
       xserver = {

os/gaming/default.nix

@@ -4,26 +4,5 @@
     {
       programs.steam.enable = true;
       hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
-      services = {
-        udev.packages = [ pkgs.python3Packages.ds4drv ];
-        xserver.config = ''
-          # Disable mouse support for joypad
-          Section "InputClass"
-                  Identifier "joystick catchall"
-                  MatchIsJoystick "on"
-                  MatchDevicePath "/dev/input/event*"
-                  Driver "joystick"
-                  Option "StartKeysEnabled" "False"
-                  Option "StartMouseEnabled" "False"
-          EndSection
-          # Same thing for DualShock 4 touchpad
-          Section "InputClass"
-                 Identifier   "ds4-touchpad"
-                 Driver       "libinput"
-                 MatchProduct "Wireless Controller Touchpad"
-                 Option       "Ignore" "True"
-          EndSection
-        '';
-      };
     };
 }

unprocessed/config/automatrop/roles/system/files/xorg/joystick.conf

@@ -0,0 +1,15 @@
+Section "InputClass"
+        Identifier "joystick catchall"
+        MatchIsJoystick "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "joystick"
+        Option "StartKeysEnabled" "False"       #Disable mouse
+        Option "StartMouseEnabled" "False"      #support
+EndSection
+# Same thing for DualShock 4 touchpad
+Section "InputClass"
+       Identifier   "ds4-touchpad"
+       Driver       "libinput"
+       MatchProduct "Wireless Controller Touchpad"
+       Option       "Ignore" "True"
+EndSection

unprocessed/config/automatrop/roles/system/tasks/main.yml

@@ -0,0 +1,9 @@
+# Xorg configuration
+
+- name: Configure Xorg joystick behaviour
+  ansible.builtin.copy:
+    src: xorg/joystick.conf
+    dest: "{{ item }}/50-joystick.conf"
+  become: true
+  when: display_server == 'x11'
+  loop: "{{ xorg_common_config_dirs }}"