diff --git a/configs/niri/fusuma.yml b/configs/niri/fusuma.yml deleted file mode 100644 index b34a583..0000000 --- a/configs/niri/fusuma.yml +++ /dev/null @@ -1,49 +0,0 @@ -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 fb51deb..755ea89 100644 --- a/configs/niri/shared/startup.kdl +++ b/configs/niri/shared/startup.kdl @@ -1,4 +1,2 @@ -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 96a0ab9..3d12b6c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -61,8 +61,6 @@ 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,11 +243,15 @@ in # claude-desktop.packages.x86_64-linux.default claude-code + touchegg + # My Own niri-touchscreen-gestures - fusuma ]); + + + services.touchegg.enable = true; services.usbmuxd.enable = true; services.flatpak.packages = [ "com.cassidyjames.butler" diff --git a/modules/core/default.nix b/modules/core/default.nix index d1517b3..9f0c800 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -21,8 +21,6 @@ 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/pkgs/fusuma/Gemfile b/pkgs/fusuma/Gemfile deleted file mode 100644 index 6e6b3cc..0000000 --- a/pkgs/fusuma/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' -gem 'fusuma' -gem 'fusuma-plugin-appmatcher' -gem 'fusuma-plugin-keypress' -gem 'fusuma-plugin-sendkey' diff --git a/pkgs/fusuma/Gemfile.lock b/pkgs/fusuma/Gemfile.lock deleted file mode 100644 index a0d27ae..0000000 --- a/pkgs/fusuma/Gemfile.lock +++ /dev/null @@ -1,42 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - fusuma (3.12.0) - fusuma-plugin-appmatcher (0.12.0) - fusuma (>= 3.0) - rexml - ruby-dbus - fusuma-plugin-keypress (0.11.0) - fusuma (>= 3.1) - fusuma-plugin-sendkey (0.14.0) - fusuma (>= 3.1) - revdev - logger (1.7.0) - revdev (0.2.1) - rexml (3.4.4) - ruby-dbus (0.25.0) - logger - rexml - -PLATFORMS - ruby - x86_64-linux - -DEPENDENCIES - fusuma - fusuma-plugin-appmatcher - fusuma-plugin-keypress - fusuma-plugin-sendkey - -CHECKSUMS - fusuma (3.12.0) sha256=2115b5522797b0c61215bbd37fb0fc8cf52b4c7d4c1a036aef20cb6ae049fca6 - fusuma-plugin-appmatcher (0.12.0) sha256=30e397eb4a62debb14ce70bf71d3a1d54a4ad552bdd77665b5979a3f0f2be246 - fusuma-plugin-keypress (0.11.0) sha256=341acb8ca7b167ec398006e3b42e18d979ed4ef18b1543f7422bf9928c6c9a99 - fusuma-plugin-sendkey (0.14.0) sha256=12729afc260359b17f64b48af89d541122a8d45f7e63a709de6e2b3fc57fc0bf - logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 - revdev (0.2.1) sha256=e9eb8b015d0189637050c37342ad6ccf4d8b49839df58edd08332a8ab779dfac - rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142 - ruby-dbus (0.25.0) sha256=fe431ca96a61f7c87a5177a43c9fe0a50eafe174c1d108421e38bb5165ea4814 - -BUNDLED WITH - 2.7.2 diff --git a/pkgs/fusuma/default.nix b/pkgs/fusuma/default.nix deleted file mode 100644 index 1c5fa1d..0000000 --- a/pkgs/fusuma/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, ruby -, bundlerEnv -, runCommand -, makeWrapper -, ... -}: - -let - env = bundlerEnv { - name = "fusuma-3.12.0"; - inherit ruby; - gemdir = ./.; - }; - - pluginLib = "${../fusuma-plugin-niri-appmatcher}/lib"; -in -runCommand "fusuma-3.12.0" -{ - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/bin - makeWrapper ${env}/bin/fusuma $out/bin/fusuma \ - --set RUBYLIB "${pluginLib}:$RUBYLIB" -'' diff --git a/pkgs/fusuma/gemset.nix b/pkgs/fusuma/gemset.nix deleted file mode 100644 index ace23c2..0000000 --- a/pkgs/fusuma/gemset.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - fusuma = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19pw97h6mjr0xxm066jcgm62pxcczjq7zlxv2l9cdc4p4x9ba591"; - type = "gem"; - }; - version = "3.12.0"; - }; - fusuma-plugin-appmatcher = { - dependencies = [ "fusuma" "rexml" "ruby-dbus" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ip25c7kz6lpnmjpdmxxaballjnml79p3gvhrqabppk29bmrgqrh"; - type = "gem"; - }; - version = "0.12.0"; - }; - fusuma-plugin-keypress = { - dependencies = [ "fusuma" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "sha256-NBrLjKexZ+w5gAbjtC4Y2XntTvGLFUP3Qiv5koxsmpk="; - type = "gem"; - }; - version = "0.11.0"; - }; - fusuma-plugin-sendkey = { - dependencies = [ "fusuma" "revdev" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gy0gz2kyavfvq4sfqvybzaah8hiajfzi2mlcizv2n834vy9lwhj"; - type = "gem"; - }; - version = "0.14.0"; - }; - logger = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; - type = "gem"; - }; - version = "1.7.0"; - }; - revdev = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b6zg6vqlaik13fqxxcxhd4qnkfgdjnl4wy3a1q67281bl0qpsz9"; - type = "gem"; - }; - version = "0.2.1"; - }; - rexml = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; - type = "gem"; - }; - version = "3.4.4"; - }; - ruby-dbus = { - dependencies = [ "logger" "rexml" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0528x9jm3frq3r10ilf1fkhsy3m5w2gkr93pa5xcixv1daliqhzy"; - type = "gem"; - }; - version = "0.25.0"; - }; -}