diff --git a/configs/fwbook/hypr/conf/general.lua b/configs/fwbook/hypr/conf/general.lua index b65a7da..560dc5a 100644 --- a/configs/fwbook/hypr/conf/general.lua +++ b/configs/fwbook/hypr/conf/general.lua @@ -1,5 +1,5 @@ -- ========================= --- General / Layout — Liquid Glass +-- General / Layout -- ========================= hl.config({ general = { @@ -22,10 +22,9 @@ hl.config({ }, scrolling = { - column_width = 0.5, fullscreen_on_one_column = true, - focus_fit_method = 0, follow_focus = true, + focus_fit_method = 1, }, cursor = { diff --git a/flake.lock b/flake.lock index 873a05b..e6c3e55 100644 --- a/flake.lock +++ b/flake.lock @@ -787,11 +787,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1788558695, - "narHash": "sha256-YKDsDJnhcDSAhyiSnvLPIn+Czu6BPChNwQ+mst5I6js=", + "lastModified": 1789765161, + "narHash": "sha256-VR3iI7qeJRfB0jXZo0gfXC9s6/hxg9k1IoMqEeKZBsg=", "owner": "flox", "repo": "flox", - "rev": "3ed82959ced2913ea47cb97331b404e7e80bab4d", + "rev": "486737b3e68b0f094e89b4b3e27260e9f6c91b4a", "type": "github" }, "original": { @@ -842,11 +842,11 @@ ] }, "locked": { - "lastModified": 1788267358, - "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", + "lastModified": 1790500375, + "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "27555e2624241fb116b49095df4caaee85a25691", + "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1790206168, - "narHash": "sha256-KnFEaWAxn9HNC0dfxQe683rAITFpDBf0GR9Mwui/2E0=", + "lastModified": 1790696013, + "narHash": "sha256-+PqYt5RoGmHAqTBIoWi7lqcHRetHKdD3PsO91muMSk8=", "ref": "refs/heads/main", - "rev": "d5afd6510f95650bf07cd89b8af77cd75a3114d5", - "revCount": 40, + "rev": "32edfbd1113c9ef0c3160c34e6954867b7675213", + "revCount": 41, "type": "git", "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" }, @@ -1754,11 +1754,11 @@ ] }, "locked": { - "lastModified": 1788680125, - "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=", + "lastModified": 1790499302, + "narHash": "sha256-Gbf/U9ptJhQh0qnDnJ/+a8MAcq1HXunbArUTHR2wNYk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "116ad1c2adb642405ef8916f6a94c8626f971344", + "rev": "161d7c91accd93034bb3c295224d9d895a778573", "type": "github" }, "original": { @@ -1904,11 +1904,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1789127271, - "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=", + "lastModified": 1790321948, + "narHash": "sha256-mZGHLGi217oLIwzDM4PNRZeCNa6g2WBXURyXbNMFs7Y=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e", + "rev": "30d48a0ec6035f8140d0125af274f0de95f1e9b5", "type": "github" }, "original": { @@ -2046,11 +2046,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "lastModified": 1789546076, + "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" }, "original": { "type": "tarball", diff --git a/hosts/fwbook/default.nix b/hosts/fwbook/default.nix index df856ab..0e71369 100644 --- a/hosts/fwbook/default.nix +++ b/hosts/fwbook/default.nix @@ -49,7 +49,7 @@ enable = true; configLink.enable = false; touchscreen-gestures = { - enable = true; + enable = false; touchOutput = "eDP-1"; }; }; diff --git a/hosts/fwbook/hardware-configuration/boot.nix b/hosts/fwbook/hardware-configuration/boot.nix index ed08c54..3de006e 100644 --- a/hosts/fwbook/hardware-configuration/boot.nix +++ b/hosts/fwbook/hardware-configuration/boot.nix @@ -20,9 +20,16 @@ "rtc_cmos.use_acpi_alarm=1" "acpi.prefer_microsoft_dsm_guid=1" "amd_pstate=active" - # Disable the old and new display power-saving features (PSR and Panel Replay). - "amdgpu.dcdebugmask=0x410" + # arms the hard-lockup detector + "nmi_watchdog=1" ]; + boot.kernel.sysctl = { + "kernel.panic_on_oops" = 1; + "kernel.panic" = 60; # currently 0 = hang forever after panic + "kernel.softlockup_panic" = 1; # CPU stuck >20s in kernel -> panic + "kernel.hardlockup_panic" = 1; # CPU wedged with IRQs off -> panic + "kernel.sysrq" = 1; # currently 16 (sync only) + }; boot.extraModulePackages = [ ]; boot.plymouth = { enable = true; diff --git a/hosts/fwbook/services.nix b/hosts/fwbook/services.nix index 06b9148..95bbf8d 100644 --- a/hosts/fwbook/services.nix +++ b/hosts/fwbook/services.nix @@ -53,4 +53,9 @@ "modesetting" "fbdev" ]; + + services.hermes-agent = { + enable = true; + addToSystemPackages = true; + }; } diff --git a/modules/nixos/desktop/tiler/niri-touchscreen-gestures.nix b/modules/nixos/desktop/tiler/niri-touchscreen-gestures.nix index b54bde4..695a92f 100644 --- a/modules/nixos/desktop/tiler/niri-touchscreen-gestures.nix +++ b/modules/nixos/desktop/tiler/niri-touchscreen-gestures.nix @@ -78,33 +78,18 @@ in environment.systemPackages = [ pkgs.niri-touchscreen-gestures - # dotool provides the absolute pointer positioning used to forward taps. - # ydotool is deliberately not used here: its `mousemove --absolute` is - # really a warp-to-corner plus a *relative* delta, so the compositor's - # pointer acceleration scales it (measured at exactly 2x on this layout, - # saturating at the screen edge). dotool registers a uinput device with a - # declared absolute axis range instead, which no acceleration curve can - # distort. pkgs.dotool ]; - - # dotool writes to /dev/uinput, which this makes group-accessible (0660, - # group "uinput") and loads the kernel module for. Note that dotool ships no - # udev rules of its own in nixpkgs, so this is the only thing granting access. hardware.uinput.enable = true; - - # "input" is already granted by tiler.enable (needed to read /dev/input for - # the touchscreen); "uinput" is what hardware.uinput.enable creates. users.users.${skygUser.name}.extraGroups = [ "input" "uinput" ]; systemd.user.services = { - # Registering a uinput device costs a noticeable startup delay, so keep one - # long-running daemon rather than paying it on every tap. dotoold = { description = "dotoold - uinput backend for absolute pointer positioning"; after = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; + unitConfig.ConditionEnvironment = "NIRI_SOCKET"; serviceConfig = { ExecStart = lib.getExe' pkgs.dotool "dotoold"; Restart = "on-failure"; @@ -114,16 +99,16 @@ in niri-touchscreen-gestures = { description = "Touchscreen gesture bridge for niri"; - # Needs the niri IPC socket, which only exists once the compositor is up, - # and dotoold's virtual device before it can forward a tap. after = [ "graphical-session.target" "dotoold.service" ]; wants = [ "dotoold.service" ]; partOf = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; + unitConfig.ConditionEnvironment = "NIRI_SOCKET"; serviceConfig = { ExecStart = "${lib.getExe pkgs.niri-touchscreen-gestures} ${lib.escapeShellArgs gestureArgs}"; Restart = "on-failure"; - RestartSec = 2; + RestartSec = 5; # widen the cycle + StartLimitBurst = 3; }; }; };