Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

espanso: add wayland support #5930

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

phanirithvij
Copy link
Contributor

@phanirithvij phanirithvij commented Oct 4, 2024

Tested on kde plasma x11 and wayland sessions. and inside niri wm (wayland). works ok

@phanirithvij
Copy link
Contributor Author

phanirithvij commented Oct 4, 2024

Edit: I don't know why the test is failing, espanso-wayland is in nixpkgs and nix-shell -p espanso-wayland works fine.

@phanirithvij phanirithvij marked this pull request as draft October 4, 2024 17:18
@phanirithvij phanirithvij force-pushed the espanso-wl branch 2 times, most recently from 62b4610 to 82dc0c3 Compare October 4, 2024 18:00
@phanirithvij
Copy link
Contributor Author

phanirithvij commented Oct 5, 2024

One thing is clear, for it to work seamlessly without explicitly requiring user to choose wayland or x11 the only solution is the upstream espanso package should provide a fat binary (not possible currently).

In this pr the fat binary is package-bin which brings in both the verisons of espanso (x11, wayland) into the store.

But I guess on darwin there is no such thing as wayland and thus the pkgs.espanso should be chosen always. (edit: made the change, someone with darwin system can try it out)

more things to consider

  • tty (using espanso makes no sense in a tty, I think)
  • shell completions
  • update news.nix
  • override wayland package fix

@phanirithvij phanirithvij force-pushed the espanso-wl branch 3 times, most recently from 1b29b51 to 8c87251 Compare October 5, 2024 11:41
@phanirithvij phanirithvij force-pushed the espanso-wl branch 3 times, most recently from b569a52 to 892521f Compare October 15, 2024 04:47
@phanirithvij phanirithvij changed the title espanso: try adding wayland support espanso: add wayland support Oct 15, 2024
@phanirithvij

This comment was marked as resolved.

@phanirithvij
Copy link
Contributor Author

phanirithvij commented Oct 16, 2024

Fixed the test (with the @espanso@ stub) but I don't know how to fix the espanso.override attribute missing error.

@phanirithvij phanirithvij force-pushed the espanso-wl branch 2 times, most recently from 674a6a8 to 13c09bd Compare October 20, 2024 06:52
@phanirithvij phanirithvij marked this pull request as ready for review October 20, 2024 06:54
@phanirithvij
Copy link
Contributor Author

@rycee I need some help, please have a look at it when you're free.

$ nix build .#test-espanso-basic-configuration
error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|while evaluating derivation 'nmt-test-espanso-basic-configuration'
         whose name attribute is located at /nix/store/riqkpszjqk02bi1wppfg8ip5xvh102qd-source/pkgs/stdenv/generic/make-derivation.nix:336:7

       … while evaluating attribute 'buildCommand' of derivation 'nmt-test-espanso-basic-configuration'
         at /nix/store/riqkpszjqk02bi1wppfg8ip5xvh102qd-source/pkgs/build-support/trivial-builders/default.nix:59:17:
           58|         enableParallelBuilding = true;
           59|         inherit buildCommand name;
             |                 ^
           60|         passAsFile = [ "buildCommand" ]

       … while evaluating the option `home.activation.installPackages.data':

       … while evaluating definitions from `/nix/store/vv3xqpi8hwcciy7labjysw3s6qwafch4-source/modules/home-environment.nix':

while evaluating the option `services.espanso.package-wayland':

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: attribute 'override' missing
       at /nix/store/riqkpszjqk02bi1wppfg8ip5xvh102qd-source/pkgs/top-level/all-packages.nix:4857:21:
         4856|   };
         4857|   espanso-wayland = espanso.override {
             |                     ^
         4858|     x11Support = false;

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant