diff --git a/flake.lock b/flake.lock index 2006279..c6b2f42 100644 --- a/flake.lock +++ b/flake.lock @@ -1093,16 +1093,16 @@ }, "locked": { "dir": "nix", - "lastModified": 1766418762, - "narHash": "sha256-TMEwb+kecsxOqFt3czzUWYOP+f154hZT2jXChmbjhAY=", - "owner": "AndyFilter", + "lastModified": 1767535906, + "narHash": "sha256-vWfL353H1wU7EkISZOTjhSZhlRkXgVz0szl81uOU2n8=", + "owner": "kitten", "repo": "yeetmouse", - "rev": "4e3247a4b0ae76bc2af5b8826febed8aeef8a742", + "rev": "9753ce8918a91273c8fae5a60a2127e196178ded", "type": "github" }, "original": { "dir": "nix", - "owner": "AndyFilter", + "owner": "kitten", "repo": "yeetmouse", "type": "github" } diff --git a/flake.nix b/flake.nix index 2e3a50d..7cc60cd 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ }; yeetmouse = { - url = "github:AndyFilter/yeetmouse?dir=nix"; + url = "github:kitten/yeetmouse?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/apps/games.nix b/modules/apps/games.nix index 6984916..251a3f5 100644 --- a/modules/apps/games.nix +++ b/modules/apps/games.nix @@ -11,13 +11,6 @@ in { description = "Whether to enable games."; type = types.bool; }; - - hdr = mkOption { - default = cfg.games.enable; - example = true; - description = "Whether to enable HDR."; - type = types.bool; - }; }; config = mkIf (cfg.enable && cfg.games.enable) { @@ -28,6 +21,7 @@ in { environment.sessionVariables = { PROTONPATH = "${pkgs.proton-ge-bin.steamcompattool}/"; + PROTON_ENABLE_WAYLAND = mkDefault 1; PROTON_USE_NTSYNC = mkDefault 1; }; @@ -50,30 +44,6 @@ in { programs = { gamemode.enable = true; - gamescope = { - enable = true; - package = pkgs.gamescope.overrideAttrs (old: { - enableWsi = true; - enableExecutable = true; - NIX_CFLAGS_COMPILE = [ "-fno-fast-math" "-fno-omit-frame-pointer" ]; - }); - env = { - PROTON_ENABLE_WAYLAND = "1"; - }; - args = [ - "--backend" "wayland" - "--adaptive-sync" - "--expose-wayland" - "--immediate-flips" - "--force-grab-cursor" - "--rt" - "-f" - "-S" "fit" - "-W" "2560" - "-H" "1440" - "-r" "360" - ]; - }; steam = { enable = true; package = pkgs.steam.override { diff --git a/modules/desktop/rawaccel.nix b/modules/desktop/rawaccel.nix index fa996b3..74f5546 100644 --- a/modules/desktop/rawaccel.nix +++ b/modules/desktop/rawaccel.nix @@ -17,14 +17,14 @@ in { hardware.yeetmouse = { enable = true; sensitivity = 0.56; - offset = 5.9; - inputCap = 35.0; - preScale = 0.17; - rotation.angle = 3.0; - mode.jump = { - acceleration = 3.97; - midpoint = 4.1; - smoothness = 1.0; + offset = 11.6; + inputCap = 35.4; + preScale = 800.0 / 1600.0; + rotation.angle = 5.0; + mode.classic = { + acceleration = 0.0398 * 1.3333; + exponent = 3.28; + smoothCap = 5.0; useSmoothing = true; }; };