From 76c477b6d46d921f2639984793492a9c0f859aec Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 16 Jun 2024 18:42:14 +0200 Subject: [PATCH 1/3] vscodium disabled extension autoUpdate --- users/willifan/graphical/dev/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/graphical/dev/vscodium.nix index 680c332..75af3bb 100644 --- a/users/willifan/graphical/dev/vscodium.nix +++ b/users/willifan/graphical/dev/vscodium.nix @@ -10,6 +10,7 @@ "[nix]"."editor.tabSize" = 2; "explorer.confirmDragAndDrop" = false; "cmake.showOptionsMovedNotification" = false; + "extensions.autoUpdate" = false; }; extensions = with pkgs.vscode-extensions; [ # System From 754fd5965b3e3c2ee9c45de5da7c8b5cbfbdfa1f Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 16 Jun 2024 18:54:19 +0200 Subject: [PATCH 2/3] override libratbag for asus pugio II --- users/willifan/graphical/steam.nix | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/steam.nix index 7f11bc9..bfe88a5 100644 --- a/users/willifan/graphical/steam.nix +++ b/users/willifan/graphical/steam.nix @@ -22,6 +22,30 @@ ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1906", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'" ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1908", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'" ''; - services.ratbagd.enable = true; + services.ratbagd = { + enable = true; + package = pkgs.libratbag.overrideAttrs (previousAttrs: rec { + postInstall = '' + # Ensure the target directory exists + mkdir -p $out/share/libratbag/ + # cat the custom configuration file + cat << EOF > $out/share/libratbag/asus-rog-pugio-II.device +[Device] +Name=ASUS ROG Pugio II +DeviceMatch=usb:0b05:1906;usb:0b05:1908 +Driver=asus + +[Driver/asus] +Profiles=3 +Buttons=10 +Leds=3 +Dpis=4 +Wireless=1 +DpiRange=100:16000@100 +ButtonMapping=f0;f1;f2;e4;e5;e6;0;e8;e9;e1;e2 +EOF + ''; + }); + }; } \ No newline at end of file From 0a8bb06aebe8f78a584b9ea5e730578226dfebec Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 16 Jun 2024 19:57:45 +0200 Subject: [PATCH 3/3] organize game related config --- users/willifan/graphical/default.nix | 3 +-- .../ROG_Pugio_II_fixes.nix} | 18 ++---------------- users/willifan/graphical/games/default.nix | 13 +++++++++++++ users/willifan/graphical/games/mangohud.nix | 6 ++++++ .../graphical/{ => games}/minecraft.nix | 0 users/willifan/graphical/games/steam.nix | 16 ++++++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) rename users/willifan/graphical/{steam.nix => games/ROG_Pugio_II_fixes.nix} (80%) create mode 100644 users/willifan/graphical/games/default.nix create mode 100644 users/willifan/graphical/games/mangohud.nix rename users/willifan/graphical/{ => games}/minecraft.nix (100%) create mode 100644 users/willifan/graphical/games/steam.nix diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix index 3761c7e..8877859 100644 --- a/users/willifan/graphical/default.nix +++ b/users/willifan/graphical/default.nix @@ -4,13 +4,12 @@ imports = [ ./dev + ./games ./hyprland ./theme ./firefox.nix ./kitty.nix - ./minecraft.nix - ./steam.nix ./thunar.nix ./thunderbird.nix ]; diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix similarity index 80% rename from users/willifan/graphical/steam.nix rename to users/willifan/graphical/games/ROG_Pugio_II_fixes.nix index bfe88a5..8a8c3f0 100644 --- a/users/willifan/graphical/steam.nix +++ b/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix @@ -1,27 +1,14 @@ -{ pkgs, home-manager, ... }: +{ pkgs, ... }: { - programs.steam = { - enable = true; - gamescopeSession = { - enable = true; - }; - }; - - environment.systemPackages = with pkgs; [ - mangohud - ]; - - hardware.steam-hardware.enable = true; services.udev.extraRules = '' - SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess" - # Disable mouse as gamepad ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1906", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-joystick'" ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1908", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-joystick'" ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1906", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'" ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1908", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'" ''; + services.ratbagd = { enable = true; package = pkgs.libratbag.overrideAttrs (previousAttrs: rec { @@ -47,5 +34,4 @@ EOF ''; }); }; - } \ No newline at end of file diff --git a/users/willifan/graphical/games/default.nix b/users/willifan/graphical/games/default.nix new file mode 100644 index 0000000..c084ee0 --- /dev/null +++ b/users/willifan/graphical/games/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + + imports = [ + + ./mangohud.nix + ./minecraft.nix + ./ROG_Pugio_II_fixes.nix + ./steam.nix + + ]; + +} \ No newline at end of file diff --git a/users/willifan/graphical/games/mangohud.nix b/users/willifan/graphical/games/mangohud.nix new file mode 100644 index 0000000..5277176 --- /dev/null +++ b/users/willifan/graphical/games/mangohud.nix @@ -0,0 +1,6 @@ +{ pkgs, homa-manager, ... }: +{ + environment.systemPackages = with pkgs; [ + mangohud + ]; +} \ No newline at end of file diff --git a/users/willifan/graphical/minecraft.nix b/users/willifan/graphical/games/minecraft.nix similarity index 100% rename from users/willifan/graphical/minecraft.nix rename to users/willifan/graphical/games/minecraft.nix diff --git a/users/willifan/graphical/games/steam.nix b/users/willifan/graphical/games/steam.nix new file mode 100644 index 0000000..85e8abb --- /dev/null +++ b/users/willifan/graphical/games/steam.nix @@ -0,0 +1,16 @@ +{ pkgs, home-manager, ... }: +{ + programs.steam = { + enable = true; + gamescopeSession = { + enable = true; + }; + }; + + hardware.steam-hardware.enable = true; + + services.udev.extraRules = '' + SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess" + ''; + +} \ No newline at end of file