Skip to content

nixos/monado: init#245005

Merged
Atemu merged 7 commits intoNixOS:masterfrom
Scrumplex:nixos-monado
Feb 27, 2024
Merged

nixos/monado: init#245005
Atemu merged 7 commits intoNixOS:masterfrom
Scrumplex:nixos-monado

Conversation

@Scrumplex
Copy link
Copy Markdown
Member

@Scrumplex Scrumplex commented Jul 23, 2023 •
edited
Loading

Description of changes

Closes #275107

This module ensures that we have a monado.service that has CAP_SYS_NICE to utilize asynchronous reprojection. (See #217119) for details about asynchronous reprojection)

This effectively shadows the unit files packaged in monado. Maybe it is desirable to remove those from the packages.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions Bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 23, 2023
@ofborg ofborg Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 23, 2023
Atemu
Atemu reviewed Jul 23, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untested but diff looks pretty good to me.

A couple things:

Comment thread nixos/modules/services/hardware/monado.nix Outdated
Comment thread nixos/modules/services/hardware/monado.nix Outdated
@Scrumplex Scrumplex mentioned this pull request Jul 28, 2023
Merged
12 tasks
@Scrumplex Scrumplex force-pushed the nixos-monado branch 2 times, most recently from 29dba97 to 67d5332 Compare September 7, 2023 07:03
@h7x4 h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Oct 19, 2023
ashkitten
ashkitten reviewed Oct 23, 2023
View reviewed changes
Comment thread nixos/modules/services/hardware/monado.nix Outdated
@nixos-discourse
Copy link
Copy Markdown

nixos-discourse commented Dec 13, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3097

SuperSandro2000
SuperSandro2000 approved these changes Dec 13, 2023
View reviewed changes
Comment thread nixos/modules/services/hardware/monado.nix Outdated
@Scrumplex Scrumplex mentioned this pull request Dec 18, 2023
Closed
@ofborg ofborg Bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Dec 18, 2023
@loco-choco
Copy link
Copy Markdown
Member

loco-choco commented Dec 18, 2023

It would be nice if the service would also set a symlink for ~/.config/openxr/1/active_runtime.json from share/openxr/1/openxr_monado.json. Correct me if I am wrong, but I feel like the setupHook should help with this, but for some reason, if I have the monado pkg in environment.systemPackages, openxr_runtime_list can't find the runtime file.

@Scrumplex
Copy link
Copy Markdown
Member Author

Scrumplex commented Dec 18, 2023

It would be nice if the service would also set a symlink for ~/.config/openxr/1/active_runtime.json from share/openxr/1/openxr_monado.json. Correct me if I am wrong, but I feel like the setupHook should help with this, but for some reason, if I have the monado pkg in environment.systemPackages, openxr_runtime_list can't find the runtime file.

The setupHook of monado does not affect packages you install using environment.systemPackages. But I could add an option to this module to make Monado the default runtime on the system. Note that that option might not work if for example SteamVR defines a default runtime in ~/.config/openxr

@Scrumplex
Copy link
Copy Markdown
Member Author

Scrumplex commented Dec 18, 2023 •
edited
Loading

I tried to make the test more precise by querying the active OpenXR runtime using openxr_runtime_list from openxr-loader, but for some reason I couldn't get it to detect Monado's socket properly

Edit: Got it working! :D

@Scrumplex Scrumplex force-pushed the nixos-monado branch 2 times, most recently from 476f52c to 3df6e04 Compare December 18, 2023 17:24
Atemu
Atemu reviewed Dec 18, 2023
View reviewed changes
Comment thread nixos/modules/services/hardware/monado.nix Outdated
Atemu
Atemu reviewed Dec 18, 2023
View reviewed changes
Comment thread nixos/modules/services/hardware/monado.nix Outdated
Atemu
Atemu approved these changes Dec 18, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to enable the user socket manually after switch (a general NixOS issue I believe) and explicitly declare the XR runtime but was then able to run xrgears:

XR_RUNTIME_JSON=/run/current-system/sw/share/openxr/1/openxr_monado.json xrgears

A few nits, questions and remarks.

Comment thread nixos/modules/services/hardware/monado.nix Outdated
Comment thread nixos/tests/monado.nix Outdated
Comment thread nixos/tests/monado.nix Outdated
Comment thread nixos/modules/services/hardware/monado.nix Outdated
@Atemu
Copy link
Copy Markdown
Member

Atemu commented Dec 18, 2023

Hold on, just hit this:

Dec 18 20:45:28 HEPHAISTOS systemd[2711]: monado.service: Main process exited, code=exited, status=255/EXCEPTION
Dec 18 20:45:28 HEPHAISTOS systemd[2711]: monado.service: Failed with result 'exit-code'.
Dec 18 20:45:28 HEPHAISTOS systemd[2711]: monado.service: Start request repeated too quickly.
Dec 18 20:45:28 HEPHAISTOS systemd[2711]: monado.service: Failed with result 'exit-code'.
Dec 18 20:45:28 HEPHAISTOS systemd[2711]: Failed to start Monado XR runtime service module.
Dec 18 20:45:28 HEPHAISTOS systemd[2711]: monado.socket: Failed with result 'service-start-limit-hit'.

The socket should probably be configured to get back up in this case.

Atemu
Atemu reviewed Dec 29, 2023
View reviewed changes
Comment thread nixos/modules/services/hardware/monado.nix Outdated
@Scrumplex
Copy link
Copy Markdown
Member Author

Scrumplex commented Jan 6, 2024 •
edited
Loading

The security wrapper for CAP_SYS_NICE is now configurable. Someone told me that they had issues running Monado with it enabled on an NVIDIA system

@Scrumplex Scrumplex requested a review from Atemu January 12, 2024 10:35
@Scrumplex Scrumplex mentioned this pull request Jan 26, 2024
Merged
6 tasks
@nixos-discourse
Copy link
Copy Markdown

nixos-discourse commented Feb 10, 2024

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3416

@nixos-discourse
Copy link
Copy Markdown

nixos-discourse commented Feb 21, 2024

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nixpkgs-xr-nightly-packages-for-xr-ar-vr-tools-and-apps/40083/1

@Atemu
Copy link
Copy Markdown
Member

Atemu commented Feb 21, 2024

I had intended to test this but had not found the time yet. If I haven't tested in a week, please ping me again and I'll just merge because the diff does LGTM.

@jsw08
Copy link
Copy Markdown

jsw08 commented Feb 24, 2024

Hey would it be possible for you to add an option to compile monado with basalt for wmr controller tracking? I tried to package it myself and failed.

@Scrumplex
Copy link
Copy Markdown
Member Author

Scrumplex commented Feb 24, 2024

I could look into it, but it wouldn't be in scope for this PR I think

@jsw08
Copy link
Copy Markdown

jsw08 commented Feb 24, 2024

I could look into it, but it wouldn't be in scope for this PR I think

Okay, thank you. I'll look into it a bit more myself.

Atemu
Atemu approved these changes Feb 27, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing work, thank you so much!

@Atemu Atemu merged commit 97f445e into NixOS:master Feb 27, 2024
@loco-choco
Copy link
Copy Markdown
Member

loco-choco commented Mar 3, 2024

I could look into it, but it wouldn't be in scope for this PR I think

Okay, thank you. I'll look into it a bit more myself.

I was able to get a build of monado's version of basalt here, it uses an older version of pangolin, and some packages that aren't packaged in nix like Sophus. I just need to test it with monado to see if it is actually working.

This was referenced Mar 10, 2024
Closed
Merged
@Scrumplex Scrumplex mentioned this pull request May 2, 2024
Closed
@Scrumplex Scrumplex deleted the nixos-monado branch September 29, 2024 09:01
@Scrumplex Scrumplex mentioned this pull request Oct 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@Atemu Atemu Atemu approved these changes

@puckipedia puckipedia Awaiting requested review from puckipedia

+1 more reviewer

@ashkitten ashkitten ashkitten left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Missing udev rules in Monado Package

8 participants

@Scrumplex @nixos-discourse @loco-choco @Atemu @jsw08 @SuperSandro2000 @ashkitten @h7x4