diff --git a/flake.lock b/flake.lock index d80a1c1..f7131c1 100755 --- a/flake.lock +++ b/flake.lock @@ -242,11 +242,11 @@ }, "intel-hard": { "locked": { - "lastModified": 1787487613, - "narHash": "sha256-BL9uzuvNE2wfdNzDp4STRLHfRRR2LOtKPiB+J+/s2DQ=", + "lastModified": 1789831823, + "narHash": "sha256-WrXIEDe55m9DIiMzKSQmrzEW7npWDRX9JtssxoG0M3M=", "owner": "elwrcl", "repo": "intel-hard", - "rev": "45dabaa129000f55a48fc44637ca7b61a5006af9", + "rev": "2c57be0074b0721622c0e5f43ba60b2954be79f5", "type": "github" }, "original": { diff --git a/modules/home/niri/desktop-niri-execs.ulu.nix b/modules/home/niri/desktop-niri-execs.ulu.nix index aa955d2..93da118 100644 --- a/modules/home/niri/desktop-niri-execs.ulu.nix +++ b/modules/home/niri/desktop-niri-execs.ulu.nix @@ -7,7 +7,6 @@ "prefer-no-csd" = true; spawn-at-startup = [ { command = [ "noctalia" ]; } - { command = [ "xwayland-satellite" ]; } ]; }; }; diff --git a/modules/home/niri/desktop-niri-general.ulu.nix b/modules/home/niri/desktop-niri-general.ulu.nix index 12a0579..e9af445 100644 --- a/modules/home/niri/desktop-niri-general.ulu.nix +++ b/modules/home/niri/desktop-niri-general.ulu.nix @@ -23,6 +23,7 @@ click-method = "clickfinger"; }; focus-follows-mouse = { + enable = true; max-scroll-amount = "0%"; }; }; diff --git a/modules/nixos/desktop/desktop-niri.ulu.nix b/modules/nixos/desktop/desktop-niri.ulu.nix index f8000a0..f566a65 100644 --- a/modules/nixos/desktop/desktop-niri.ulu.nix +++ b/modules/nixos/desktop/desktop-niri.ulu.nix @@ -4,6 +4,19 @@ { pkgs, ... }: { programs.niri.enable = true; + nixpkgs.overlays = [ + (final: prev: { + xwayland-satellite = prev.xwayland-satellite.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (final.fetchpatch { + name = "no-focus-for-override-redirect-popups.patch"; + url = "https://github.com/Supreeeme/xwayland-satellite/pull/494.diff"; + hash = "sha256-X7v6rAyTGE0e1UIbhL7XoYx5puZ0C9b+YAwIgT4Gyzk="; + }) + ]; + }); + }) + ]; environment.systemPackages = with pkgs; [ xwayland-satellite diff --git a/modules/nixos/gaming/gaming-steam.ulu.nix b/modules/nixos/gaming/gaming-steam.ulu.nix index 7c868ff..316a14f 100644 --- a/modules/nixos/gaming/gaming-steam.ulu.nix +++ b/modules/nixos/gaming/gaming-steam.ulu.nix @@ -15,7 +15,7 @@ programs.gamescope = { enable = true; - capSysNice = true; + capSysNice = false; env = { INTEL_DEBUG = "noccs"; };