modules/nixos/keychron-keyboard/default.nix

@@ -10,10 +10,6 @@ in {
 
   config = lib.mkIf cfg.enable {
 
-    # Create the plugdev group and ensure users can access HID devices
-    users.groups.plugdev = {};
-
-    hardware.keyboard.qmk.keychronSupport = true;
     services.udev.packages = with pkgs; [ qmk qmk-udev-rules ];
 
 
@@ -89,10 +85,7 @@ in {
       SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 
       # hid_listen
-      KERNEL=="hidraw*", MODE="0666", TAG+="uaccess", TAG+="udev-acl"
+      KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-
-      # hidraw devices for WebHID (Keychron Launcher, VIA)
-      SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"
 
       # hid bootloaders
       ## QMK HID

modules/nixos/steam/default.nix

@@ -30,11 +30,8 @@
     # };
     environment.systemPackages = with pkgs; [
       steam
-      protonup-ng  # Tool to install and manage Proton-GE
+      # proton-ge-bin
       lutris
-      vkd3d
-      dxvk
-      corefonts
       protontricks
       mangohud
       vkbasalt

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -43,7 +43,7 @@ in
       users.users.andreas = {
         isNormalUser = true;
         description = "Andreas Schaafsma";
-        extraGroups = [ "networkmanager" "wheel" "libvirtd" "plugdev" ]    ;
+        extraGroups = [ "networkmanager" "wheel" "libvirtd" ]    ;
         packages = with pkgs; [
           # Packages from inputs
           inputs.game-of-life.packages.x86_64-linux.default
@@ -86,6 +86,7 @@ in
       ];
       # Or disable the firewall altogether.
       # networking.firewall.enable = false;
+      programs.steam.gamescopeSession.enable = true;
       programs.gamescope.enable = true;
       programs.steam.gamescopeSession = {
         enable = true;