From 36b42b716f6b80ee81a705b2cb45b8bd64ab93fd Mon Sep 17 00:00:00 2001 From: tulili Date: Sat, 22 Jul 2023 12:08:59 -0300 Subject: [PATCH] feat(yafti): add waydroid setup procedure into default yafti file --- usr/share/ublue-os/firstboot/yafti.yml | 6 +++++- usr/share/ublue-os/just/setup.just | 12 ++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/usr/share/ublue-os/firstboot/yafti.yml b/usr/share/ublue-os/firstboot/yafti.yml index eeab452cfb..1fdc734464 100644 --- a/usr/share/ublue-os/firstboot/yafti.yml +++ b/usr/share/ublue-os/firstboot/yafti.yml @@ -33,6 +33,11 @@ screens: default: false packages: - Install Nix Package Support: pkexec ublue-nix-install + Waydroid: + description: Android support with GApps, ARM translation, and Widevine out of the box + default: true + packages: + - Setup remotes: just --unstable setup waydroid Remote: description: Sets up proper remote access to this system! default: true @@ -43,7 +48,6 @@ screens: default: true packages: - Setup remotes: just --unstable setup dotfiles - Ubuntu Theming: description: Makes it so the Ubuntu theming is properly set up default: true diff --git a/usr/share/ublue-os/just/setup.just b/usr/share/ublue-os/just/setup.just index 4ceb2ab8f4..86df749d72 100644 --- a/usr/share/ublue-os/just/setup.just +++ b/usr/share/ublue-os/just/setup.just @@ -1,5 +1,9 @@ +waydroid: + pkexec waydroid init -s GAPPS -c https://ota.waydro.id/system -v https://ota.waydro.id/vendor + pkexec sh -c 'git clone https://github.com/casualsnek/waydroid_script /tmp/wrscript && python3 -m venv /tmp/wrscript/venv && /tmp/wrscript/venv/bin/pip install -r /tmp/wrscript/requirements.txt && /tmp/wrscript/venv/bin/python3 /tmp/wrscript/main.py -a 11 install smartdock libndk widevine && /tmp/wrscript/venv/bin/python3 /tmp/wrscript/main.py -a 11 hack hidestatusbar' + fish: - sudo usermod -s /usr/bin/fish $USER + pkexec usermod -s /usr/bin/fish $USER curl https://raw.githubusercontent.com/oh-my-fish/oh-my-fish/master/bin/install | fish fish -c 'omf install bobthefish' @@ -16,10 +20,10 @@ remotes: pkexec tailscale up dconf: - sudo dconf update + pkexec dconf update positivo-touchscreen: - printf 'SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{WL_OUTPUT}="silead_ts", ENV{LIBINPUT_CALIBRATION_MATRIX}="2.0994971271086835 0.0 -0.009475882227217559 0.0 3.2251959199264215 -0.002555450541782298 0.0 0.0 1.0"' | sudo tee -a /etc/udev/rules.d/99-positivo-touchscreen.rules + printf 'SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{WL_OUTPUT}="silead_ts", ENV{LIBINPUT_CALIBRATION_MATRIX}="2.0994971271086835 0.0 -0.009475882227217559 0.0 3.2251959199264215 -0.002555450541782298 0.0 0.0 1.0"' | pkexec tee -a /etc/udev/rules.d/99-positivo-touchscreen.rules nimbus: distrobox create -i ghcr.io/tulilirockz/nimbus:latest -n nimbus -Y @@ -28,4 +32,4 @@ nimbus: gamebox: distrobox create -i ghcr.io/ublue-os/bazzite-arch:latest -n gamebox -Y - distrobox-enter -n gamebox -- 'distrobox-export --app steam ; distrobox export --app lutris ; distrobox-export --bin protontricks ; distrobox-export --bin lutris' \ No newline at end of file + distrobox-enter -n gamebox -- 'distrobox-export --app steam ; distrobox export --app lutris ; distrobox-export --bin protontricks ; distrobox-export --bin lutris'