From ad0f2e5459f7f819f7b4f9c4cd7a77db40e63ef1 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 28 Jul 2026 13:43:20 -0400 Subject: [PATCH] simpler fusuma --- configs/niri/fusuma.yml | 49 +++++++++++++++++++++++++++ configs/niri/shared/startup.kdl | 2 ++ hosts/fwbook.nix | 3 ++ modules/core/default.nix | 2 ++ modules/nixos/common/fusuma.nix | 59 --------------------------------- pkgs/fusuma/default.nix | 3 +- pkgs/fusuma/gemset.nix | 56 +++++++++++++++---------------- 7 files changed, 86 insertions(+), 88 deletions(-) create mode 100644 configs/niri/fusuma.yml delete mode 100644 modules/nixos/common/fusuma.nix diff --git a/configs/niri/fusuma.yml b/configs/niri/fusuma.yml new file mode 100644 index 0000000..b34a583 --- /dev/null +++ b/configs/niri/fusuma.yml @@ -0,0 +1,49 @@ +swipe: + 3: + left: + command: "niri msg action FocusColumnRight" + right: + command: "niri msg action FocusColumnLeft" + up: + command: "niri msg action FocusWorkspaceDown" + down: + command: "niri msg action FocusWorkspaceUp" + 4: + up: + command: "niri msg action ToggleOverview" + down: + command: "niri msg action ToggleOverview" +pinch: + 2: + in: + keypress: + LEFTCTRL: press + MINUS: press + out: + keypress: + LEFTCTRL: press + EQUAL: press +app: + zed: + match: + class: "dev.zed.Zed" + swipe: + 2: + left: + keypress: + ALT: press + LEFT: press + right: + keypress: + ALT: press + RIGHT: press + pinch: + 2: + in: + keypress: + LEFTCTRL: press + MINUS: press + out: + keypress: + LEFTCTRL: press + EQUAL: press diff --git a/configs/niri/shared/startup.kdl b/configs/niri/shared/startup.kdl index 755ea89..fb51deb 100644 --- a/configs/niri/shared/startup.kdl +++ b/configs/niri/shared/startup.kdl @@ -1,2 +1,4 @@ +spawn-at-startup "fusuma" "--daemon" "--config" "/home/ari/nixos-setup/configs/niri/fusuma.yml" + // spawn-at-startup "niri-touchscreen-gestures" diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 8e597e2..96a0ab9 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -61,6 +61,8 @@ in }; virtualisation.waydroid.enable = true; hardware.enableRedistributableFirmware = true; + # Fusuma needs raw input device access to read touchpad/touchscreen gestures. + users.users.${user.name}.extraGroups = [ "input" ]; # Tailscale services.tailscale.enable = true; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; @@ -245,6 +247,7 @@ in # My Own niri-touchscreen-gestures + fusuma ]); services.usbmuxd.enable = true; diff --git a/modules/core/default.nix b/modules/core/default.nix index 9f0c800..d1517b3 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -21,6 +21,8 @@ ds4-cuda = final.callPackage ../../pkgs/ds4 { backend = "cuda"; }; # Touchscreen gesture bridge for niri, see pkgs/niri-touchscreen-gestures. niri-touchscreen-gestures = final.callPackage ../../pkgs/niri-touchscreen-gestures { }; + # Fusuma + niri plugin, see pkgs/fusuma. + fusuma = final.callPackage ../../pkgs/fusuma { }; }) (final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ diff --git a/modules/nixos/common/fusuma.nix b/modules/nixos/common/fusuma.nix deleted file mode 100644 index 5e00251..0000000 --- a/modules/nixos/common/fusuma.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.skyg.nixos.common.fusuma; - configFile = - if cfg.configFile != null then - cfg.configFile - else - pkgs.writeText "fusuma-config.yml" (lib.generators.toYAML { } cfg.settings); -in -{ - options.skyg.nixos.common.fusuma = { - enable = lib.mkEnableOption "Fusuma multi-touch gesture daemon (niri + per-app support)"; - - package = lib.mkPackageOption pkgs "fusuma" { }; - - settings = lib.mkOption { - type = with lib.types; attrsOf anything; - default = { }; - example = { - swipe."3".left.command = "niri msg action FocusColumnRight"; - app.zed = { - match.class = "dev.zed.Zed"; - swipe."2".left.keypress = { ALT = "press"; LEFT = "press"; }; - }; - }; - description = '' - Fusuma configuration as a Nix attribute set. - Converted to YAML and passed to the daemon. - ''; - }; - - configFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = "Path to an existing Fusuma config.yml (overrides generated settings)"; - }; - }; - - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - - # Ensure the user can read raw input devices - users.users.${config.skyg.user.name}.extraGroups = lib.mkIf config.skyg.user.enable [ "input" ]; - - systemd.user.services.fusuma = { - description = "Fusuma multi-touch gesture daemon"; - partOf = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - wantedBy = [ "graphical-session.target" ]; - - serviceConfig = { - ExecStart = "${lib.getExe cfg.package} --daemon --config ${configFile}"; - Restart = "on-failure"; - RestartSec = 2; - }; - }; - }; -} diff --git a/pkgs/fusuma/default.nix b/pkgs/fusuma/default.nix index 6a7aa78..1c5fa1d 100644 --- a/pkgs/fusuma/default.nix +++ b/pkgs/fusuma/default.nix @@ -15,7 +15,8 @@ let pluginLib = "${../fusuma-plugin-niri-appmatcher}/lib"; in -runCommand "fusuma-3.12.0" { +runCommand "fusuma-3.12.0" +{ nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/fusuma/gemset.nix b/pkgs/fusuma/gemset.nix index f2177aa..ace23c2 100644 --- a/pkgs/fusuma/gemset.nix +++ b/pkgs/fusuma/gemset.nix @@ -1,83 +1,83 @@ { fusuma = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "19pw97h6mjr0xxm066jcgm62pxcczjq7zlxv2l9cdc4p4x9ba591"; type = "gem"; }; version = "3.12.0"; }; fusuma-plugin-appmatcher = { - dependencies = ["fusuma" "rexml" "ruby-dbus"]; - groups = ["default"]; - platforms = []; + dependencies = [ "fusuma" "rexml" "ruby-dbus" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0ip25c7kz6lpnmjpdmxxaballjnml79p3gvhrqabppk29bmrgqrh"; type = "gem"; }; version = "0.12.0"; }; fusuma-plugin-keypress = { - dependencies = ["fusuma"]; - groups = ["default"]; - platforms = []; + dependencies = [ "fusuma" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "sha256-NBrLjKexZ+w5gAbjtC4Y2XntTvGLFUP3Qiv5koxsmpk="; type = "gem"; }; version = "0.11.0"; }; fusuma-plugin-sendkey = { - dependencies = ["fusuma" "revdev"]; - groups = ["default"]; - platforms = []; + dependencies = [ "fusuma" "revdev" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1gy0gz2kyavfvq4sfqvybzaah8hiajfzi2mlcizv2n834vy9lwhj"; type = "gem"; }; version = "0.14.0"; }; logger = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; version = "1.7.0"; }; revdev = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1b6zg6vqlaik13fqxxcxhd4qnkfgdjnl4wy3a1q67281bl0qpsz9"; type = "gem"; }; version = "0.2.1"; }; rexml = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; version = "3.4.4"; }; ruby-dbus = { - dependencies = ["logger" "rexml"]; - groups = ["default"]; - platforms = []; + dependencies = [ "logger" "rexml" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0528x9jm3frq3r10ilf1fkhsy3m5w2gkr93pa5xcixv1daliqhzy"; type = "gem"; };