Stable rewrite

README.md

···
 <!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
 <!-- Copyright (c) 2025 Shiloh Fen <[e-mail]> -->
 
-AtomicXR (axr)
-==============
+# AtomicXR #
+XR for Universal Blue and Fedora Atomic Desktops.
 
-Install and manage XR applications on Fedora Atomic Desktops.
+This repo contains the AtomicXR core libraries and CLI. Other AtomicXR repos can be found below:
+- [AtomicXR Homebrew Tap](https://codeberg.org/shiloh/homebrew-atomicxr): XR packaging for Fedora Atomic.
 
-Developed and tested on [Bluefin](https://projectbluefin.io/), but should work with:
+AtomicXR is developed and tested on [Bluefin](https://projectbluefin.io/), but should work with:
 - [Bazzite](https://bazzite.gg/)
 - [Fedora Silverblue](https://fedoraproject.org/atomic-desktops/silverblue/)
 - Other Fedora Atomic-based distros
 
-## Installing
+## Install ##
+Homebrew (reccomeneded): `brew tap shiloh/atomicxr https://codeberg.org/shiloh/homebrew-atomicxr.git; brew install atomic-xr`
 
 > NOTE: Developed with Nushell version `0.106.0`. Lower versions are not guaranteed to work.
 
-Using the install script:
-- bash: `bash <(curl -s https://codeberg.org/shiloh/atomic-xr/raw/branch/main/install.sh)`
-- nu: `nu -c (http get https://codeberg.org/shiloh/atomic-xr/raw/branch/main/install.nu)`
-
-From this repo:
-1. Install Nushell (for example with Homebrew: `brew install nushell`)
-2. `nu -c "use src/atomic-xr ; atomic-xr self install --local"`
-
-## Usage
+From this repo: `./install.sh`
 
+## Usage ##
 > NOTE: If you plan to use the SteamVR Lighthouse driver with:
 > - Flatpak Steam
 > - WiVRn without a lighthouse-tracked headset (for example if you want to use lighthouse body trackers, but don't own a lighthouse headset)
 >
-> ..you'll have to calibrate using AtomicXR instead of Envision: `axr calibrate steamvr-lh`
+> ..you can calibrate using AtomicXR instead of Envision: `axr steamvr-lh calibrate`
 
 CLI:
-- Configure: `axr icfg`
-- Apply configuration & update applications: `axr apply`
-- Update AtomicXR: `axr self update`
+- Install Envision: `axr envision install`
+- Update Envision: `axr envision upgrade`
+- Set up Steam Flatpak XR: `axr flatpak steam enable-xr`
+- Launch [OSC Avatar Manager](https://github.com/galister/oscavmgr): `axr oscavmgr start [babble | openxr | alvr]` (use `openxr` for WiVRn)
 - List avaliable CLI functions: `axr -l`
 
 Building Envision profiles:

install.nu

···
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright (c) 2025 Shiloh Fen <[e-mail]>
 
-const data: path = "~/.local/share/atomic-xr" | path expand
-const self: path = $data | path join "self"
-
-if ($self | path exists) {
-    cd $self
-    git pull
-} else {
-    mkdir $data
-    cd $data
-    git clone https://codeberg.org/shiloh/atomic-xr self
-    cd self
-}
-
-nu -c "use src/atomic-xr ; atomic-xr self install"
+let lib_dir = $NU_LIB_DIRS | first | path join atomic-xr
+rm -rf $lib_dir
+cp -r src/atomic-xr $lib_dir
+cp -f src/axr.nu ~/.local/bin/axr

install.sh

···
 
 if ! nu -v $>/dev/null; then
     brew install nushell \
-    || echo -e "\e[35mFailed to install Nushell using Homebrew. Please install Nushell or Homebrew and re-run this script.\e[0m"
+    || echo -e "\e[35mFailed to install Nushell using Homebrew. Please install Nushell or Homebrew, then re-run this script.\e[0m"
 fi
 
 if nu -v $>/dev/null; then
-    nu -c "$(curl -s https://codeberg.org/shiloh/atomic-xr/raw/branch/main/install.nu)"
+    nu ./install.nu
 fi

src/atomic-xr/applications.nu

···
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-
-use common.nu *
-use std log
-
-const repos = $data_path | path join repos
-
-def pull-or-clone [
-    name: string
-    url: string
-    branch: string
-] {
-    mkdir $repos
-    let repo = $repos | path join $name
-    if ($repo | path exists) {
-        cd $repo
-        git reset --hard # Reset manual patches
-        git switch $branch
-        git pull
-    } else {
-        git clone $url $repo
-        cd $repo
-    }
-
-    tag-or-branch $branch
-}
-
-def tag-or-branch [
-    branch: string
-] {
-    match (open $config_path).release_channel {
-        "stable" => (git switch --detach (git tag -l --sort=v:refname | lines | last))
-        "devel" => (git switch $branch)
-        _ => (error make {
-            msg: "Invalid release channel in config"
-            help: "If you manually edited the config, set the release channel to either `stable` or `devel`. If you used `axr icfg`, please report this issue at: https://codeberg.org/shiloh/atomic-xr/issues"
-        })
-    }
-}
-
-export def "install envision" [] {
-    pull-or-clone envision "https://gitlab.com/gabmus/envision.git" main
-    cd ($repos | path join envision)
-
-    if (rpm -q openxr-libs | complete | get exit_code) != 0 {
-        rpm-ostree install openxr-libs
-        # TODO: Notification actions
-        notify-send -u critical "Package Installed" "Please reboot or use `rpm-ostree ex apply-live` before attempting to launch Envision."
-    }
-
-    [
-        "Actions=BuildMode;"
-        ""
-        "[Desktop Action BuildMode]"
-        "Exec=toolbox run --container atomic-xr @CMD_NAME@"
-        "Name=Launch in Build Mode"
-    ]
-    | str join "\n"
-    | save -a data/org.gabmus.envision.desktop.in.in
-
-    container-exec {
-        if (rpm -q rpmfusion-free-release | complete | get exit_code) != 0 {
-            sudo dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-(rpm -E %fedora).noarch.rpm
-            sudo dnf swap -y ffmpeg-free ffmpeg --allowerasing
-        }
-
-        [
-            # Envision
-            @development-tools
-            meson
-            jq
-            gtk4-devel
-            libadwaita-devel
-            openxr-devel
-            mesa-libGL-devel
-            libdrm-devel
-            vulkan-loader-devel
-            wayland-devel
-            eigen3-devel
-            ninja-build
-            vulkan-headers
-            vte291-devel
-            polkit-devel
-            cargo
-            vte291-gtk4-devel
-            desktop-file-utils
-            openssl-devel
-
-            # WiVRn
-            avahi-devel
-            avahi-glib-devel
-            cli11-devel
-            glslang-devel
-            glslc
-            gstreamer1-plugins-base-devel
-            gstreamer1-devel
-            ffmpeg-devel
-            libnotify-devel
-            libva-devel
-            json-devel
-            x264-devel
-            pipewire-devel
-            cmake
-            gcc-c++
-            clang19-devel
-            openxr-devel
-            android-tools
-
-            # Monado
-            cmake
-            gcc-c++
-            glslang-devel
-            glslc
-            libbsd-devel
-            libusb1
-            libusb1-devel
-            SDL2-devel
-            wayland-protocols-devel
-            openxr-devel
-        ] | sudo dnf install -y ...$in
-        meson setup build -Dprefix=($env.HOME)/.local --reconfigure
-        ninja -C build
-        ninja -C build install
-    }
-}
-
-def brewed [application: string] {
-    (brew ls $application | complete).exit_code == 0
-}
-
-def install-not-brewed [application: string] {
-    if not (brewed $application) {
-        brew install $application
-    }
-}
-
-def uninstall-brewed [application: string] {
-    if (brewed $application) {
-        brew uninstall $application
-    }
-}
-
-export def "uninstall envision" [] {
-    rm -f ~/.local/bin/envision ~/.local/share/applications/org.gabmus.envision.Devel.desktop ~/.local/share/applications/org.gabmus.envision.Devel.desktop  ~/.local/share/bin/envision
-}
-
-export def "install wlx-overlay-s" [] {
-    install-not-brewed wlx-overlay-s
-}
-
-export def "uninstall wlx-overlay-s" [] {
-    uninstall-brewed wlx-overlay-s
-}
-
-export def "install wayvr-dashboard" [] {
-    install-not-brewed wayvr-dashboard
-}
-
-export def "uninstall wayvr-dashboard" [] {
-    uninstall-brewed wayr-dashboard
-}
-
-export def "install motoc" [] {
-   install-not-brewed motoc
-}
-
-export def "uninstall motoc" [] {
-    uninstall-brewed motoc
-}
-
-export def "install oscavmgr" [] {
-    install-not-brewed vrc-advert
-    install-not-brewed oscavmgr
-}
-
-export def "uninstall oscavmgr" [] {
-    uninstall-brewed vrc-advert
-    uninstall-brewed oscavmgr
-}
-
-export def "install stardust-xr" [] {
-    log warning "Stardust XR: Install not implemented. Please see https://stardustxr.org/docs/get-started/manual for installation instructions, or wait for it to be implemented in AtomicXR."
-}
-
-export def "uninstall stardust-xr" [] {
-    log debug "Stardust XR: Not implemented"
-}

src/atomic-xr/bin/oscavmgr-launch.sh

···
+#!/usr/bin/env bash
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+#
+# Portions of this file are derived from OscAvMgr, which is licensed under the MIT License
+# Copyright (c) 2023 galister
+
+trap 'jobs -p | xargs kill' EXIT
+
+VrcAdvert OscAvMgr 9402 9002 --tracking &
+
+oscavmgr "${@}"

src/atomic-xr/common.nu

···
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-
-use std log
-
-export const version = 5
-
-export const data_path: path = "~/.local/share/atomic-xr" | path expand
-export const config_path: path = "~/.config/atomic-xr.toml" | path expand
-export const envision_config_path: path = "~/.config/envision/envision.json" | path expand
-
-export def container-exec [
-    block: closure
-    --environment (-e): record = {}
-] {
-    try {log debug $"Running in container: (view source $block)"}
-    toolbox run --container=atomic-xr nu -c $"with-env ($environment) (view source $block)"
-}

src/atomic-xr/envision.nu

···
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+
+const repo = "~/.local/share/atomic-xr/envision" | path expand
+const envision_config_path = "~/.config/envision/envision.json" | path expand
+
+use std log
+
+export def install [] {
+    distrobox create envision --no-entry -Y -i registry.fedoraproject.org/fedora-toolbox:latest
+    distrobox enter envision -- sudo dnf install -y nu
+    upgrade
+    log info "Successfully installed Envision"
+}
+
+export def uninstall [] {
+    try {distrobox rm -f envision}
+    rm -f ~/.local/bin/envision ~/.local/share/applications/org.gabmus.envision.Devel.desktop ~/.local/share/applications/org.gabmus.envision.Devel.desktop  ~/.local/share/bin/envision
+    log info "Successfully uninstalled Envision"
+}
+
+export def upgrade [] {
+    distrobox upgrade envision
+
+    mkdir ($repo | path dirname)
+    if ($repo | path exists) {
+        cd $repo
+        git reset --hard # Reset manual patches
+        git switch main
+        git pull
+    } else {
+        git clone "https://gitlab.com/gabmus/envision.git" $repo
+        cd $repo
+    }
+    git switch --detach (git tag -l --sort=v:refname | lines | last)
+
+    if (rpm -q openxr-libs | complete | get exit_code) != 0 {
+        rpm-ostree install openxr-libs
+        # TODO: Notification actions
+        notify-send -u critical "Package Installed" "Please reboot or use `rpm-ostree ex apply-live` before attempting to launch Envision."
+    }
+
+    [
+        "Actions=BuildMode;"
+        ""
+        "[Desktop Action BuildMode]"
+        "Exec=distrobox enter envision -- @CMD_NAME@"
+        "Name=Launch in Build Mode"
+    ]
+    | str join "\n"
+    | save -a data/org.gabmus.envision.desktop.in.in
+
+    {
+        if (rpm -q rpmfusion-free-release | complete | get exit_code) != 0 {
+            sudo dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-(rpm -E %fedora).noarch.rpm
+            sudo dnf swap -y ffmpeg-free ffmpeg --allowerasing
+        }
+
+        sudo dnf builddep -y envision
+        sudo dnf install -y envision-wivrn envision-monado
+
+        meson setup build -Dprefix=($env.HOME)/.local --reconfigure
+        ninja -C build
+        ninja -C build install
+    }
+    | distrobox enter envision -- nu -c $"do (view source $in)"
+
+    log info "Successfully upgraded Envision"
+}
+
+export module plugins {
+    # Register AtomicXR envision plugins
+    export def register [] {
+        if ($envision_config_path | path exists) {
+            cp -f $envision_config_path $"($envision_config_path).bak"
+        }
+        let envision_config = try {open $envision_config_path} catch {
+            # TODO: Create default config file instead
+            error make {
+                msg: "Failed to open Envision config file"
+                label: {
+                    text: "Failed to open file"
+                    span: (metadata $envision_config_path).span
+                }
+                help: "You'll need to open Envision at least once before registering plugins."
+            }
+        }
+        let prefix = brew --prefix | path join bin
+        let plugins = $envision_config.plugins
+        | merge (
+            plugbuild wlx-overlay-s "WlxOverlay-S" ($prefix | path join wlx-overlay-s) "--openxr"
+            --plugins $envision_config.plugins
+            --screenshots ["https://github.com/galister/wlx-overlay-s/raw/guide/wlx-s.png"]
+            --icon-url "https://github.com/galister/wlx-overlay-s/raw/main/wlx-overlay-s.svg"
+            --homepage-url "https://github.com/galister/wlx-overlay-s"
+        )
+        | merge (
+            plugbuild motoc "Motoc" ($prefix | path join motoc) continue
+            --plugins $envision_config.plugins
+            --homepage-url "https://github.com/galister/motoc"
+            --description "Monado Tracking Origin Calibrator managed by AtomicXR"
+        )
+        | merge (
+            plugbuild oscavmgr.project-babble "oscavmgr (Project Babble)" ~/.local/bin/oscavmgr-launch babble
+            --plugins $envision_config.plugins
+            --homepage-url "https://github.com/galister/oscavmgr"
+            --description "OSC Avatar Manager (Project Babble) managed by AtomicXR"
+            --conflicts ["oscavmgr.wivrn"]
+        )
+        | merge (
+            plugbuild oscavmgr.wivrn "oscavmgr (WiVRn)" ~/.local/bin/oscavmgr-launch wivrn
+            --plugins $envision_config.plugins
+            --homepage-url "https://github.com/galister/oscavmgr"
+            --description "OSC Avatar Manager (WiVRn) managed by AtomicXR"
+            --conflicts ["oscavmgr.project-babble"]
+        )
+
+        $envision_config
+        | merge {plugins: $plugins}
+        | save -f $envision_config_path
+
+        log info "Envision plugins registered or updated successfully"
+    }
+
+    # Unegister AtomicXR envision plugins
+    export def unregister [] {
+        if ($envision_config_path | path exists) {
+            cp -f $envision_config_path $"($envision_config_path).bak"
+        }
+        let envision_config = try {open $envision_config_path} catch {
+            error make {
+                msg: "Failed to open Envision config file"
+                label: {
+                    text: "Failed to open file"
+                    span: (metadata $envision_config_path).span
+                }
+                help: "Envision's config file doesn't seem to exist, no AtomicXR plugins are registered."
+            }
+        }
+        let plugins = $envision_config.plugins
+        | reject -o ...(get-appids "wlx-overlay-s" "motoc" "oscavmgr.project-babble" "oscavmgr.wivrn")
+
+        $envision_config
+        | merge {plugins: $plugins}
+        | save -f $envision_config_path
+
+        log info "Envision plugins unregistered successfully"
+    }
+
+    def plugbuild [
+        id: string
+        name: string
+        exec_path: path
+        ...args
+        --description (-d): string
+        --author (-a): string
+        --icon-url (-i): string
+        --version (-v): string
+        --full-description (-f): string
+        --homepage-url (-h): string
+        --screenshots (-s): list<string> = []
+        --dependencies (-p): list<string> = [] # End with . for absolute id
+        --conflicts (-c): list<string> = [] # End with . for absolute id
+        --plugins: record # Plugin list to use instead of opening the config file
+    ]: nothing -> record {
+        let appid = get-appid $id
+
+        log debug $"Building Envision plugin: ($id)"
+
+        let description = $description | default $"($name) managed by AtomicXR"
+        let full_description = $full_description | default $description
+        let enabled = $plugins
+        | default (
+            try {
+                open $envision_config_path
+                | get plugins
+            } catch {
+                []
+            }
+        )
+        | transpose id data
+        | where id == $appid
+        | if ($in | length) == 0 {
+            false
+        } else {
+            $in
+            | get 0.data.enabled
+        }
+
+        let dependencies = get-appids ...$dependencies
+        let conflicts = get-appids ...$conflicts
+
+        {$appid: {
+            plugin: {
+                appid: $appid
+                name: $"AtomicXR: ($name)"
+                author: $author
+                icon_url: $icon_url
+                version: $version
+                short_description: $description
+                description: $full_description
+                homepage_url: $homepage_url
+                screenshots: $screenshots
+                exec_url: null
+                exec_path: $exec_path
+                args: $args
+                env_args: null
+                dependencies: $dependencies
+                conflicts: $conflicts
+                plugin_type: "Executable"
+            }
+            enabled: $enabled
+        }}
+    }
+
+    # Get absolute ids from relative
+    def get-appid [
+        id: string
+    ] {
+        if $id ends-with "." {
+            $id | str substring 0..-2
+        } else {
+            $"cc.dwagon.atomic-xr.($id)"
+        }
+    }
+
+    def get-appids [
+        ...ids: string
+    ] {
+        $ids
+        | each {|e|
+            get-appid $e
+        }
+    }
+}

src/atomic-xr/flatpak.nu

···
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+
+use std log
+
+def "permissions allow" [appid: string] {
+    flatpak override --user --filesystem="xdg-data/envision:ro" --filesystem="xdg-run/monado_comp_ipc" --filesystem="/var/lib/flatpak/app/io.github.wivrn.wivrn:ro" --filesystem="xdg-run/wivrn" --filesystem="xdg-config/openxr:ro" --filesystem="xdg-config/openvr:ro" $appid
+}
+
+def "permissions revoke" [appid: string] {
+    flatpak override --user --nofilesystem="xdg-data/envision" --nofilesystem="xdg-run/monado_comp_ipc" --nofilesystem="/var/lib/flatpak/app/io.github.wivrn.wivrn" --nofilesystem="xdg-run/wivrn" --nofilesystem="xdg-config/openxr" --nofilesystem="xdg-config/openvr" $appid
+}
+
+export module steam {
+    # Enable XR support for Steam Flatpak
+    export def enable-xr [] {
+        permissions allow com.valvesoftware.Steam
+
+        if not ("~/.steam" | path exists) {
+            ln -s ~/.var/app/com.valvesoftware.Steam/.steam ~/
+            log debug "Symlinked Steam Flatpak's .steam directory to ~/.steam."
+        } else if (ls -lD ~/.steam).0.target != ("~/.var/app/com.valvesoftware.Steam/.steam/" | path expand) {
+            error make {
+                msg: "Could not link Steam Flatpak's .steam directory to ~/.steam."
+                help: "Back up or remove your existing ~/.steam directory, then run this command again."
+            }
+        }
+
+        log info "Successfully set up Steam Flatpak XR."
+    }
+
+    # Disable XR support for Steam Flatpak
+    export def disable-xr [] {
+        permissions revoke com.valvesoftware.Steam
+
+        if not ("~/.steam" | path exists) {
+            log debug "~/.steam does not exist."
+        } else if (ls -lD ~/.steam).0.target == ("~/.var/app/com.valvesoftware.Steam/.steam/" | path expand) {
+            rm ~/.steam
+            if ("~/.steam.bak-axr" | path exists) {
+                mv ~/.steam.bak-axr ~/.steam
+            }
+        }
+
+        log info "Successfully reset Steam Flatpak XR."
+    }
+}
+
+export module gaiasky {
+    # Enable VR mode for Gaia Sky
+    export def enable-vr [] {
+        permissions allow space.gaiasky.GaiaSky
+        [
+            (open /var/lib/flatpak/app/space.gaiasky.GaiaSky/current/active/export/share/applications/space.gaiasky.GaiaSky.desktop
+            | str replace "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky" "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky -vr")
+            "Actions=DesktopMode;"
+            ""
+            "[Desktop Action DesktopMode]"
+            "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky"
+            "Name=Launch in Desktop Mode"
+        ]
+        | str join "\n"
+        | save -f ~/.local/share/applications/space.gaiasky.GaiaSky.desktop
+
+        log info "Successfully enabled Gaia Sky's VR mode."
+    }
+
+    # Disable VR mode for Gaia Sky
+    export def disable-vr [] {
+        permissions revoke space.gaiasky.GaiaSky
+        rm -f ~/.local/share/applications/space.gaiasky.GaiaSky.desktop
+
+        log info "Successfully disabled Gaia Sky's VR mode."
+    }
+}

src/atomic-xr/generators/envision-plugin.nu

···
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-
-use std log
-use ../common.nu *
-
-# Can't use "generate" because it will cause odd interaction with the `generate` builtin
-export def "gen" [
-    id: string
-    name: string
-    exec_path: path
-    ...args
-    --description (-d): string
-    --author (-a): string
-    --icon-url (-i): string
-    --version (-v): string
-    --full-description (-f): string
-    --homepage-url (-h): string
-    --screenshots (-s): list<string> = []
-    --dependencies (-p): list<string> = [] # End with . for absolute id
-    --conflicts (-c): list<string> = [] # End with . for absolute id
-    --plugins: record # Plugin list to use instead of opening the config file
-]: nothing -> record {
-    let appid = get-appid $id
-
-    log debug $"Generating Envision plugin: ($id)"
-
-    let description = $description | default $"($name) managed by AtomicXR"
-    let full_description = $full_description | default $description
-    let enabled = $plugins
-    | default (
-        try {
-            open $envision_config_path
-            | get plugins
-        } catch {
-            []
-        }
-    )
-    | transpose id data
-    | where id == $appid
-    | if ($in | length) == 0 {
-        false
-    } else {
-        $in
-        | get 0.data.enabled
-    }
-
-    let dependencies = get-appids ...$dependencies
-    let conflicts = get-appids ...$conflicts
-
-    {$appid: {
-        plugin: {
-            appid: $appid
-            name: $"AtomicXR: ($name)"
-            author: $author
-            icon_url: $icon_url
-            version: $version
-            short_description: $description
-            description: $full_description
-            homepage_url: $homepage_url
-            screenshots: $screenshots
-            exec_url: null
-            exec_path: $exec_path
-            args: $args
-            env_args: null
-            dependencies: $dependencies
-            conflicts: $conflicts
-            plugin_type: "Executable"
-        }
-        enabled: $enabled
-    }}
-}
-
-# Generate absolute ids from relative
-export def "get-appid" [
-    id: string
-] {
-    if $id ends-with "." {
-        $id | str substring 0..-2
-    } else {
-        $"cc.dwagon.atomic-xr.($id)"
-    }
-}
-
-export def "get-appids" [
-    ...ids: string
-] {
-    $ids
-    | each {|e|
-        get-appid $e
-    }
-}

src/atomic-xr/homebrew.nu

···
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+
+# Tap AtomicXR Homebrew
+export def tap [] {
+    brew tap shiloh/atomicxr https://codeberg.org/shiloh/homebrew-atomicxr.git
+}
+
+# Untap AtomicXR Homebrew
+export def untap [] {
+    brew untap shiloh/atomicxr
+}

src/atomic-xr/mod.nu

···
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright (c) 2025 Shiloh Fen <[e-mail]>
 
-use std log
-use common.nu *
-use sysconfig.nu
-
-export-env {
-    # See https://github.com/nushell/nushell/issues/13403
-    use std log
-
-    $env.AXR_MODULE_PATH = ($NU_LIB_DIRS | first | path join atomic-xr)
-}
-
-export use self.nu *
-
-# Interactive configuration tool
-export def icfg [] {
-    let applications = {
-        envision: "Envision"
-        wlx-overlay-s: "WlxOverlay-S"
-        wayvr-dashboard: "WayVR Dashboard"
-        motoc: "Monado Tracking Origin Calibrator"
-        oscavmgr: "OSC Avatar Manager"
-        stardust-xr: "Stardust XR (WIP)"
-    }
-    | transpose id name
-    | input list -md name "Which applications would you like to install?"
-    | get id
-
-    let release_channel = match (input "Would you like to install stable or development releases of applicaions? [(S)table/(d)evelopment]: " | str downcase) {
-        "s" | "stable" | "" => "stable"
-        "d" | "development" | "dev" | "devel" => "devel"
-        _ => (error make {
-            msg: "Invalid input."
-            help: "Run the command again, no config has been changed."
-        })
-    }
-
-    let sysconfigs = {
-        gaiasky-flatpak-vr: "Gaia Sky Flatpak: VR Mode"
-        steam-flatpak-permissions: "Steam Flatpak: Permissions for XR (works with WiVRn and Envision)"
-        steam-flaptak-symlink: "Steam Flatpak: Link .steam to home directory"
-        envision-plugins: "Envision: Register AtomicXR plugins"
-    }
-    | transpose id name
-    | input list -md name "Would you like to apply any system configurations?"
-    | get id
-
-    {
-        applications: $applications
-        release_channel: $release_channel
-        sysconfigs: $sysconfigs
-    }
-    | save -f $config_path
-
-    print "Run `axr apply` to apply this configuration!"
-}
-
-# Open the configuration file
-export def "config open" [
-    --terminal (-t) # Open in terminal editor
-] {
-    if $terminal {
-        run-external $env.EDITOR $config_path
-    } else {
-        start $config_path
-    }
-}
-
-def "ask yn" [prompt: string] {
-    loop {
-        match (input -n 1 $"($prompt) [y/n]: " | str downcase) {
-            "y" => (return true)
-            "n" => (return false)
-            _ => (log error "Invalid option, please choose `y` or `n`.")
-        }
-    }
-}
-
-# SteamVR Quick Calibration
-export def "calibrate steamvr-lh" [] {
-    if (ask yn "Do you own a lighthouse-tracked HMD? (e.g. Index, Vive Pro)") {
-        input -sn 1 "Please connect your headset and place it on the floor, then press any key to start the calibration."
-
-        log info "Starting SteamVR Lighthouse calibration"
-
-        # TODO: Support using native steam installation
-        log warning "This is intended for Flatpak Steam, if you're using native Steam, please use Envision instead."
-        log warning "If you'd like to see this functionality in AtomicXR, please open an issue on Codeberg."
-
-        let vrcmd_bin: path = $"($env.HOME)/.steam/root/steamapps/common/SteamVR/bin/linux64/vrcmd"
-        let environment = $"LD_LIBRARY_PATH=('~/.var/app/com.valvesoftware.Steam/.steam/root/steamapps/common/SteamVR/bin/linux64' | path expand)"
-
-        let server = job spawn {flatpak run --command=$"($vrcmd_bin)" --env=$"($environment)" com.valvesoftware.Steam --pollposes}
-        sleep 2sec # TODO: detect when the server is ready
-        try {
-            flatpak run --command=$"($vrcmd_bin)" --env=$"($environment)" com.valvesoftware.Steam --resetroomsetup
-        } catch {|err|
-            job kill $server
-            error make $err
-        }
-
-        job kill $server
-        log info "Calibration finished"
-    } else {
-        log info "Creating default Lighthouse Database"
-
-        if not ("~/.steam/root/config/lighthouse/" | path exists) {
-            error make {
-                msg: "Could not find lighthouse configuration directory."
-                help: "Make sure you have SteamVR installed, and .steam points to the correct location. You may need to select \"Symlink .steam directory\" in `axr icfg` if you're using the Steam Flatpak."
-            }
-        }
-
-        {
-            base_stations: []
-            known_objects: []
-            known_universes: []
-            revision: 1
-        }
-        | save -f ~/.steam/root/config/lighthouse/lighthousedb.json
-
-        log info "Created default Lighthouse Database"
-    }
-}
-
-# Open SteamVR's lighthouse_console
-#
-# Useful for pairing, dumping device configs, etc.
-export def "util steamvr-lh-console" [
-    ...args # Arguments to pass to lighthouse_console
-] {
-    # TODO: Support using native steam installation
-    log warning "This is intended for Flatpak Steam, if you're using native Steam, please use Envision instead."
-    log warning "If you'd like to see this functionality in AtomicXR, please open an issue on Codeberg."
-
-    flatpak run --command=$"($env.HOME)/.steam/root/steamapps/common/SteamVR/tools/lighthouse/bin/linux64/lighthouse_console" com.valvesoftware.Steam ...$args
-}
-
-# Apply current configuration (and update applications)
-export def apply [
-    --sysconfigs-only (-s)
-    --applications-only (-a)
-] {
-    if $sysconfigs_only and $applications_only {
-        error make {
-            msg: "Incompatible flags"
-            label: {
-                text: "Incompatible with --sysconfigs-only (-s)"
-                span: (metadata $applications_only).span
-            }
-            help: "Only sepecify 1 of: --sysconfigs-only (-s), --applications-only (-a)"
-        }
-    }
-    let config = try {open $config_path} catch {
-        error make {
-            msg: "Failed to open config file."
-            help: "Create a configuration file with `axr icfg` or `axr config open`."
-        }
-    }
-
-    if not $sysconfigs_only {
-        const applications_path = path self ./applications.nu
-        # HACK: `scope modules` doesn't work how you'd expect when executed from modules, so we have to do this
-        let application_commands = nu -c $"use ($applications_path) ; scope modules | where name == applications | get 0.commands.name | to nuon" | from nuon
-
-        let supported_applications = $application_commands
-        | where $it starts-with "install "
-        | str replace "install " ""
-        | where {|e| $"uninstall ($e)" in $application_commands}
-
-        log debug $"Supported applications: ($supported_applications | to text)"
-
-        $config.applications
-        | each {|e|
-            if $e not-in $supported_applications {
-                log warning $"Unkown application `($e)` found in configuration."
-            }
-        }
-
-        $supported_applications
-        | each {|application|
-            if $application in $config.applications {
-                nu -c $"use ($applications_path) ; applications install ($application)"
-            } else {
-                nu -c $"use ($applications_path) ; applications uninstall ($application)"
-            }
-        }
-    }
-
-    if not $applications_only {
-        const sysconfigs_path = path self ./sysconfig.nu
-        # HACK: `scope modules` doesn't work how you'd expect when executed from modules, so we have to do this
-        let sysconfig_commands = nu -c $"use ($sysconfigs_path) ; scope modules | where name == sysconfig | get 0.commands.name | to nuon" | from nuon
-
-        let supported_sysconfigs = $sysconfig_commands
-        | where $it starts-with "enable "
-        | str replace "enable " ""
-        | where {|e| $"disable ($e)" in $sysconfig_commands}
-
-        log debug $"Supported sysconfigs: ($supported_sysconfigs | to text)"
-
-        $config.sysconfigs
-        | each {|e|
-            if $e not-in $supported_sysconfigs {
-                log warning $"Unkown sysconfig `($e)` found in configuration."
-            }
-        }
-
-        $supported_sysconfigs
-        | each {|sysconfig|
-            if $sysconfig in $config.sysconfigs {
-                nu -c $"use ($sysconfigs_path) ; sysconfig enable ($sysconfig)"
-            } else {
-                nu -c $"use ($sysconfigs_path) ; sysconfig disable ($sysconfig)"
-            }
-        }
-    }
-
-    # Don't return an empty list from `each`
-    return
-}
+export use envision.nu
+export use flatpak.nu
+export use homebrew.nu
+export use steamvr-lh.nu

src/atomic-xr/oscavmgr.nu

···
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+
+# Start OSC Avatar Manager and advertise it using VrcAdvert
+export def start [
+    module: string # babble, openxr (WiVRn), alvr
+] {
+    run-external (path self ./bin/oscavmgr-launch.sh)
+}

src/atomic-xr/self.nu

···
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-
-use std log
-use common.nu *
-use applications.nu *
-use sysconfig.nu
-
-const self: path = $data_path | path join "self"
-const meta_path = $data_path | path join "metadata.nuon"
-
-# Install or update AtomicXR
-#
-# This command can only be safely used if the same module version that's loaded is the one being installed, which is never the case with `axr`
-export def "self install" [
-    --local (-l) # Install from local repo (make sure you cd to root of the repo you want to install from)
-    --update (-u)
-] {
-    migrate
-
-    mkdir $data_path
-
-    if not $local {
-        if not ($self | path exists) {
-            git clone https://codeberg.org/shiloh/atomic-xr.git ($data_path | path join self)
-        }
-        cd $self
-        git pull
-    }
-
-    log debug $"Installing from `(pwd)`"
-
-    if not $update {
-        try {toolbox create atomic-xr --distro fedora --release 42}
-        toolbox run --container atomic-xr sudo dnf install -y nu
-    }
-
-    log debug $"AXR_MODULE_PATH: ($env.AXR_MODULE_PATH)"
-
-    mkdir ~/.local/bin
-    mkdir ($env.AXR_MODULE_PATH | path dirname)
-
-    try {brew tap shiloh/atomicxr https://codeberg.org/shiloh/homebrew-atomicxr.git}
-    try {rm -r $env.AXR_MODULE_PATH o+e> /dev/null}
-    cp -r src/atomic-xr $env.AXR_MODULE_PATH
-    cp -f src/axr.nu ~/.local/bin/axr
-    chmod 744 ~/.local/bin/axr
-    cp -f src/oscavmgr-launch.sh ~/.local/bin/oscavmgr-launch
-    chmod 744 ~/.local/bin/oscavmgr-launch
-
-    write-version $version
-}
-
-# Update AtomicXR
-export def "self update" [
-    --local (-l) # Install from local repo (make sure you cd to root of the repo you want to install from)
-] {
-    mkdir $data_path
-
-    if not $local {
-        if not ($self | path exists) {
-            git clone https://codeberg.org/shiloh/atomic-xr.git ($data_path | path join self)
-        }
-        cd $self
-        git pull
-    }
-
-    # This is nessesary to install any new files and do migrations from the new version
-    # It runs the new version's `self install` instead of this version's
-    # It always uses --local, so the repo is not pulled an extra time.
-    nu -c $"use src/atomic-xr ; atomic-xr self install --update --local"
-}
-
-# Uninstall AtomicXR
-export def "self uninstall" [] {
-    log info "Removing manually installed applicaions"
-    uninstall envision
-
-    log info "Disabling system configurations"
-    sysconfig disable envision-plugins
-    sysconfig disable steam-flaptak-symlink
-    sysconfig disable steam-flatpak-permissions
-
-    log info "Removing AtomicXR container"
-    toolbox rm -f atomic-xr
-
-    log info "Uninstalling AtomicXR"
-    rm -r $env.AXR_MODULE_PATH
-    rm ~/.local/bin/oscavmgr-launch
-    rm ~/.local/bin/axr
-    rm -r ~/.local/share/atomic-xr
-}
-
-# Migrate version 1 to 2
-def "migrate 1" [] {
-    # Application exporting and installation was overhauled in this version
-    log info "Removing outdated container"
-    toolbox rm -f atomic-xr
-    log info "Uninstalling previously installed applications (don't worry, you can reinstall them later)"
-    rm -f ~/.local/bin/motoc ~/.local/bin/oscavmgr ~/.local/bin/wayvr-dashboard ~/.local/bin/wlx-overlay-s ~/.local/bin/envision ~/.local/share/applications/org.gabmus.envision.Devel.desktop ~/.local/share/applications/org.gabmus.envision.Devel.desktop  ~/.local/share/bin/envision
-}
-
-def "migrate 2" [] {
-    # steam-flatpak-envision and steam-flatpak-wivrn were merged into steam-flatpak-permissions
-    if not ($config_path | path exists) {
-        log warning "Config file not found, migration not attempted"
-        return
-    }
-
-    let config = open $config_path
-
-    let sysconfigs = if "steam-flaptak-envision" in $config.sysconfigs or "steam-flatpak-wivrn" in $config.sysconfigs {
-        $config.sysconfigs
-        | where $it != "steam-flaptak-envision" and $it != "steam-flatpak-wivrn"
-        | prepend "steam-flaptak-permissions"
-    } else {
-        $config.sysconfigs
-    }
-
-    $config
-    | merge {sysconfigs: $sysconfigs}
-    | save -f $config_path
-}
-
-def "migrate 3" [] {
-    # there was a bug in `icfg` that still set these values. after that was fixed, this migration had to be run again for some people that used it
-    migrate 2
-}
-
-def "migrate 4" [] {
-    # Switched to Homebrew for wlx-overlay-s, wayvr-dashboard, oscavmgr, vrcadvert, motoc, and openxr loader
-    log info "Removing manually installed applications: wlx-overlay-s, wayvr-dashboard, oscavmgr, vrcadvert, and motoc"
-    rm -f ~/.local/bin/wlx-overlay-s ~/.local/bin/wayvr-dashboard ~/.local/bin/motoc ~/.local/bin/oscavmgr ~/.local/bin/VrcAdvert
-    [
-        "wlx-overlay-s"
-        "wayvr-dashboard"
-        "motoc"
-        "oscavmgr"
-        "vrcadvert"
-    ]
-    | par-each {|e|
-        let repo = $data_path | path join repos $e
-        rm -rf $repo
-    }
-
-    log warning "Please run `axr apply` to apply the new configuration!"
-}
-
-# Migrate from installed version to current version
-def migrate [] {
-    log info "Checking for migrations"
-
-    if not ($data_path | path exists) {
-        log info "AtomicXR is not installed, no migrations neessesary."
-        return
-    }
-
-    let installed_version = if ($meta_path | path exists) {
-        open $meta_path | get version
-    } else {
-        log warning "No metadata file found, assuming fresh install. No migrations attempted."
-        return
-    }
-
-    if $installed_version == $version {
-        log info "No migrations neessesary."
-        return
-    }
-
-    $installed_version..($version - 1) | each {|e|
-        log info $"Starting migration: ($e) -> ($e + 1)"
-        match $e {
-            1 => (migrate 1)
-            2 => (migrate 2)
-            3 => (migrate 3)
-            4 => (migrate 4)
-            _ => (error make {
-                msg: $"Attempted to migrate from an unknown version: ($e)."
-                help: "Please report this issue at: https://codeberg.org/shiloh/atomic-xr/issues"
-            })
-        }
-        write-version ($e + 1)
-        log info $"Finished migration: ($e) -> ($e + 1)"
-    }
-}
-
-def write-version [version: int] {
-    if ($meta_path | path exists) {
-        open $meta_path
-        | merge {version: $version}
-        | collect
-        | save -f $meta_path
-    } else {
-        {version: $version}
-        | save $meta_path
-    }
-}

src/atomic-xr/steamvr-lh.nu

···
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2025 Shiloh Fen <[e-mail]>
+
+use std log
+
+def "ask yn" [prompt: string] {
+    loop {
+        match (input -n 1 $"($prompt) [y/n]: " | str downcase) {
+            "y" => (return true)
+            "n" => (return false)
+            _ => (log error "Invalid option, please choose `y` or `n`.")
+        }
+    }
+}
+
+# SteamVR Quick Calibration
+export def calibrate [] {
+    # TODO: Support using native steam installation
+    log warning "This is intended for Flatpak Steam, if you're using native Steam, please use Envision instead."
+    log warning "If you'd like to see native Steam functionality in AtomicXR, please open an issue on Codeberg."
+
+    if (ask yn "Do you own a lighthouse-tracked HMD? (e.g. Index, Vive Pro)") {
+        input -sn 1 "Please connect your headset and place it on the floor, then press any key to start the calibration."
+
+        log info "Starting SteamVR Lighthouse calibration"
+
+        let vrcmd_bin: path = $"($env.HOME)/.steam/root/steamapps/common/SteamVR/bin/linux64/vrcmd"
+        let environment = $"LD_LIBRARY_PATH=('~/.var/app/com.valvesoftware.Steam/.steam/root/steamapps/common/SteamVR/bin/linux64' | path expand)"
+
+        let server = job spawn {flatpak run --command=$"($vrcmd_bin)" --env=$"($environment)" com.valvesoftware.Steam --pollposes}
+        sleep 2sec # TODO: detect when the server is ready
+        try {
+            flatpak run --command=$"($vrcmd_bin)" --env=$"($environment)" com.valvesoftware.Steam --resetroomsetup
+        } catch {|err|
+            job kill $server
+            error make $err
+        }
+
+        job kill $server
+        log info "Calibration finished"
+    } else {
+        log info "Creating default Lighthouse Database"
+
+        if not ("~/.steam/root/config/lighthouse/" | path exists) {
+            error make {
+                msg: "Could not find lighthouse configuration directory."
+                help: "Make sure you have SteamVR installed, and .steam points to the correct location. You may need to select \"Symlink .steam directory\" in `axr icfg` if you're using the Steam Flatpak."
+            }
+        }
+
+        {
+            base_stations: []
+            known_objects: []
+            known_universes: []
+            revision: 1
+        }
+        | save -f ~/.steam/root/config/lighthouse/lighthousedb.json
+
+        log info "Created default Lighthouse Database"
+    }
+}
+
+# Open SteamVR's lighthouse_console
+#
+# Useful for pairing, dumping device configs, etc.
+export def console [
+    ...args # Arguments to pass to lighthouse_console
+] {
+    # TODO: Support using native steam installation
+    log warning "This is intended for Flatpak Steam, if you're using native Steam, please use Envision instead."
+    log warning "If you'd like to see this functionality in AtomicXR, please open an issue on Codeberg."
+
+    flatpak run --command=$"($env.HOME)/.steam/root/steamapps/common/SteamVR/tools/lighthouse/bin/linux64/lighthouse_console" com.valvesoftware.Steam ...$args
+}

src/atomic-xr/sysconfig.nu

···
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-
-use generators/envision-plugin.nu
-use common.nu *
-use std log
-
-def enable-flatpak-permissions [appid: string] {
-    flatpak override --user --filesystem="xdg-data/envision:ro" --filesystem="xdg-run/monado_comp_ipc" --filesystem="/var/lib/flatpak/app/io.github.wivrn.wivrn:ro" --filesystem="xdg-run/wivrn" --filesystem="xdg-config/openxr:ro" --filesystem="xdg-config/openvr:ro" $appid
-}
-
-def disable-flatpak-permissions [appid: string] {
-    flatpak override --user --nofilesystem="xdg-data/envision" --nofilesystem="xdg-run/monado_comp_ipc" --nofilesystem="/var/lib/flatpak/app/io.github.wivrn.wivrn" --nofilesystem="xdg-run/wivrn" --nofilesystem="xdg-config/openxr" --nofilesystem="xdg-config/openvr" $appid
-}
-
-export def "enable steam-flatpak-permissions" [] {
-    enable-flatpak-permissions com.valvesoftware.Steam
-}
-
-export def "disable steam-flatpak-permissions" [] {
-    disable-flatpak-permissions com.valvesoftware.Steam
-}
-
-export def "enable gaiasky-flatpak-vr" [] {
-    enable-flatpak-permissions space.gaiasky.GaiaSky
-    [
-        (open /var/lib/flatpak/app/space.gaiasky.GaiaSky/current/active/export/share/applications/space.gaiasky.GaiaSky.desktop
-        | str replace "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky" "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky -vr")
-        "Actions=DesktopMode;"
-        ""
-        "[Desktop Action DesktopMode]"
-        "Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gaiasky space.gaiasky.GaiaSky"
-        "Name=Launch in Desktop Mode"
-    ]
-    | str join "\n"
-    | save -f ~/.local/share/applications/space.gaiasky.GaiaSky.desktop
-}
-
-export def "disable gaiasky-flatpak-vr" [] {
-    disable-flatpak-permissions space.gaiasky.GaiaSky
-    rm -f ~/.local/share/applications/space.gaiasky.GaiaSky.desktop
-}
-
-export def "enable steam-flaptak-symlink" [] {
-    if not ("~/.steam" | path exists) {
-        ln -s ~/.var/app/com.valvesoftware.Steam/.steam/ ~/
-        return
-    }
-
-    if (ls -lD ~/.steam).0.target == ("~/.var/app/com.valvesoftware.Steam/.steam/" | path expand) {
-        rm -rf ~/.steam.bak-axr
-        mv ~/.steam ~/.steam.bak-axr
-        ln -s ~/.var/app/com.valvesoftware.Steam/.steam/ ~/
-    }
-}
-
-export def "disable steam-flaptak-symlink" [] {
-    if not ("~/.steam" | path exists) {
-        return
-    }
-
-    if (ls -lD ~/.steam).0.target == ("~/.var/app/com.valvesoftware.Steam/.steam/" | path expand) {
-        rm ~/.steam
-        if ("~/.steam.bak-axr" | path exists) {
-            mv ~/.steam.bak-axr ~/.steam
-        }
-    }
-}
-
-export def "enable envision-plugins" [] {
-    if ($envision_config_path | path exists) {
-        cp -f $envision_config_path $"($envision_config_path).bak"
-    }
-    let envision_config = try {open $envision_config_path} catch {
-        # TODO: Create default config file instead
-        log warning "You'll need to open Envision at least once before plugins can be registered."
-        return
-    }
-    let prefix = brew --prefix | path join bin
-    let plugins = $envision_config.plugins
-    | merge (
-        envision-plugin gen wlx-overlay-s "WlxOverlay-S" ($prefix | path join wlx-overlay-s) "--openxr"
-        --plugins $envision_config.plugins
-        --screenshots ["https://github.com/galister/wlx-overlay-s/raw/guide/wlx-s.png"]
-        --icon-url "https://github.com/galister/wlx-overlay-s/raw/main/wlx-overlay-s.svg"
-        --homepage-url "https://github.com/galister/wlx-overlay-s"
-    )
-    | merge (
-        envision-plugin gen motoc "Motoc" ($prefix | path join motoc) continue
-        --plugins $envision_config.plugins
-        --homepage-url "https://github.com/galister/motoc"
-        --description "Monado Tracking Origin Calibrator managed by AtomicXR"
-    )
-    | merge (
-        envision-plugin gen oscavmgr.project-babble "oscavmgr (Project Babble)" ~/.local/bin/oscavmgr-launch babble
-        --plugins $envision_config.plugins
-        --homepage-url "https://github.com/galister/oscavmgr"
-        --description "OSC Avatar Manager (Project Babble) managed by AtomicXR"
-        --conflicts ["oscavmgr.wivrn"]
-    )
-    | merge (
-        envision-plugin gen oscavmgr.wivrn "oscavmgr (WiVRn)" ~/.local/bin/oscavmgr-launch wivrn
-        --plugins $envision_config.plugins
-        --homepage-url "https://github.com/galister/oscavmgr"
-        --description "OSC Avatar Manager (WiVRn) managed by AtomicXR"
-        --conflicts ["oscavmgr.project-babble"]
-    )
-
-    $envision_config
-    | merge {plugins: $plugins}
-    | save -f $envision_config_path
-}
-
-export def "disable envision-plugins" [] {
-    if ($envision_config_path | path exists) {
-        cp -f $envision_config_path $"($envision_config_path).bak"
-    }
-    let envision_config = try {open $envision_config_path} catch {
-        log debug "Could not open Envision config, not attempting to remove plugins."
-        return
-    }
-    let plugins = $envision_config.plugins
-    | reject -o ...(envision-plugin get-appids "wlx-overlay-s" "motoc" "oscavmgr.project-babble" "oscavmgr.wivrn")
-
-    $envision_config
-    | merge {plugins: $plugins}
-    | save -f $envision_config_path
-}

src/axr.nu

···
 use atomic-xr
 
 def main [
+    # TODO: --choose (-c) # Interactively choose a function
     --list (-l) # List avaliable functions
     --interactive (-i) # Enter interactive shell with the module loaded
     ...function
 ] {
     let function = $function | str join ' '
-    if $list or ($function | is-empty) {
+    if $interactive {
+        exec nu -e "use atomic-xr; print $'(ansi yellow)AtomicXR module loaded.(ansi reset)'"
+    } else if $list or ($function | is-empty)  {
         print-functions
-    } else if $interactive {
-        nu -e "use atomic-xr"
     } else {
         # Make sure the function is valid to avoid unhelpful error messages (doesn't check flags)
-        if ($function | str replace -r  " -.*" '') in (get-functions) {
+        if ($function | str replace -r  " -.*" '') in (get-functions | append (get-aliases)) {
             nu -c $"use atomic-xr ; atomic-xr ($function)"
         } else {
             log error $"Invalid function: `($function)`"
···
     scope modules
     | where name == atomic-xr
     | get 0.commands.name
-    | where $it != "self install" # This command can only be safely used if the same module version that's loaded is the one being installed, which is never the case with `axr`
+}
+
+def get-aliases [] {
+    scope modules
+    | where name == atomic-xr
+    | get 0.aliases.name
 }
 
 def print-functions [] {
···
             $in
         }
 
-        let usage = $help
-        | get (
-            ($help | enumerate | where item == $"(ansi green)Usage(ansi reset):").0.index + 1
-        )
-        | str trim
+        # let usage = $help
+        # | get (
+        #     ($help | enumerate | where item == $"(ansi green)Usage(ansi reset):").0.index + 1
+        # )
+        # | str trim
 
-        [
-            $usage
-            (if $short_description == null {null} else {
-                $"(ansi blue)- ($short_description)(ansi reset)"
-            })
-        ] | str join ' '
+        {
+            command: $"(ansi cyan)($function)(ansi reset)"
+            description: $"(ansi lp)($short_description)(ansi reset)"
+        }
     }
-    | prepend "Avaliable functions:"
-    | append "\n" # Fixes some shell prompts not displaying on a new line
-    | str join "\n"
+    | table --index false --theme rounded
 }

src/oscavmgr-launch.sh

···
-#!/usr/bin/env bash
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2025 Shiloh Fen <[e-mail]>
-#
-# Portions of this file are derived from OscAvMgr, which is licensed under the MIT License
-# Copyright (c) 2023 galister
-
-
-trap 'jobs -p | xargs kill' EXIT
-
-VrcAdvert OscAvMgr 9402 9002 --tracking &
-
-oscavmgr "${@}"