-
-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add flatpak installer, system setup, and user setup services fr…
…om Bazzite (#544)
- Loading branch information
Showing
10 changed files
with
263 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Script Version | ||
| VER=1 | ||
| VER_FILE="/etc/ublue/flatpak_manager_version" | ||
| VER_RAN=$(cat $VER_FILE) | ||
|
|
||
| # Run script if updated | ||
| if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then | ||
| echo "Flatpak manager v$VER has already ran. Exiting..." | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Opt out of and remove Fedora's flatpak repo | ||
| if grep -qz 'fedora' <<< $(flatpak remotes); then | ||
| /usr/lib/fedora-third-party/fedora-third-party-opt-out | ||
| /usr/bin/fedora-third-party disable | ||
| flatpak remote-delete fedora --force | ||
| fi | ||
|
|
||
| # Lists of flatpaks | ||
| FLATPAK_LIST=$(flatpak list --columns=application) | ||
| INSTALL_LIST=$(cat /usr/etc/flatpak/install) | ||
| REMOVE_LIST=$(cat /usr/etc/flatpak/remove) | ||
|
|
||
| # Install flatpaks in list | ||
| if [[ -n $INSTALL_LIST ]]; then | ||
| for flatpak in $INSTALL_LIST; do | ||
| if grep -qvz $flatpak <<< $FLATPAK_LIST; then | ||
| flatpak install --system --noninteractive flathub $flatpak | ||
| fi | ||
| done | ||
| fi | ||
|
|
||
| # Remove flatpaks in list | ||
| if [[ -n $REMOVE_LIST ]]; then | ||
| for flatpak in $REMOVE_LIST; do | ||
| if grep -qz $flatpak <<< $FLATPAK_LIST; then | ||
| flatpak remove --system --noninteractive $flatpak | ||
| fi | ||
| done | ||
| fi | ||
|
|
||
| mkdir -p /etc/ublue | ||
| echo $VER > $VER_FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| IMAGE_INFO="/usr/share/ublue-os/image-info.json" | ||
| IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) | ||
| IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO) | ||
|
|
||
| # SCRIPT VERSION | ||
| HWS_VER=1 | ||
| HWS_VER_FILE="/etc/ublue/hws_version" | ||
| HWS_VER_RAN=$(cat $HWS_VER_FILE) | ||
|
|
||
| # IMAGE IDENTIFIERS | ||
| KNOWN_IMAGE_NAME_FILE="/etc/ublue/image_name" | ||
| KNOWN_IMAGE_NAME=$(cat $KNOWN_IMAGE_NAME_FILE) | ||
| KNOWN_IMAGE_FLAVOR_FILE="/etc/ublue/image_flavor" | ||
| KNOWN_IMAGE_FLAVOR=$(cat $KNOWN_IMAGE_FLAVOR_FILE) | ||
|
|
||
| # Run script if updated | ||
| if [[ -f $HWS_VER_FILE && $HWS_VER = $HWS_VER_RAN ]]; then | ||
| if [[ -f $KNOWN_IMAGE_NAME_FILE && -f $KNOWN_IMAGE_FLAVOR_FILE ]]; then | ||
| # Run script if image has been rebased | ||
| if [[ $IMAGE_NAME = $KNOWN_IMAGE_NAME && $IMAGE_FLAVOR = $KNOWN_IMAGE_FLAVOR ]]; then | ||
| echo "Hardware setup has already run. Exiting..." | ||
| exit 0 | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| # GLOBAL | ||
| SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" | ||
| GPU_ID=$(lspci -k | grep -A 3 -E "(VGA|3D)") | ||
| KARGS=$(rpm-ostree kargs) | ||
| NEEDED_KARGS="" | ||
| echo "Current kargs: $KARGS" | ||
| mkdir -p /etc/ublue | ||
|
|
||
| if grep -qz "Kernel driver in use: radeon" <<< $GPU_ID; then | ||
| echo "Legacy AMD hardware detected, enabling CIK and SI support in AMDGPU" | ||
| if [[ ! $KARGS =~ "radeon.si_support" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=radeon.si_support=0" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "radeon.cik_support" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=radeon.cik_support=0" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "amdgpu.si_support" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.si_support=1" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "amdgpu.cik_support" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.cik_support=1" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ $IMAGE_FLAVOR = "nvidia" ]]; then | ||
| echo "Checking for needed karg changes (Nvidia)" | ||
|
|
||
| if [[ ! $KARGS =~ "rd.driver.blacklist" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=rd.driver.blacklist=nouveau" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "modprobe.blacklist" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=modprobe.blacklist=nouveau" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "nvidia-drm.modeset" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=nvidia-drm.modeset=1" | ||
| fi | ||
| else | ||
| echo "Checking for needed karg changes" | ||
|
|
||
| if [[ $KARGS =~ "rd.driver.blacklist" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --delete=rd.driver.blacklist=nouveau" | ||
| fi | ||
|
|
||
| if [[ $KARGS =~ "modprobe.blacklist" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --delete=modprobe.blacklist=nouveau" | ||
| fi | ||
|
|
||
| if [[ $KARGS =~ "nvidia-drm.modeset" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --delete=nvidia-drm.modeset=1" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ $KARGS =~ "nomodeset" ]]; then | ||
| echo "Removing nomodeset" | ||
| NEEDED_KARGS="$NEEDED_KARGS --delete=nomodeset" | ||
| fi | ||
|
|
||
| if [[ ! $KARGS =~ "rd.luks.options" ]]; then | ||
| NEEDED_KARGS="$NEEDED_KARGS --append=rd.luks.options=discard" | ||
| fi | ||
|
|
||
| if [[ -n "$NEEDED_KARGS" ]]; then | ||
| echo "Found needed karg changes, applying the following: $NEEDED_KARGS" | ||
| rpm-ostree kargs ${NEEDED_KARGS} --reboot || exit 1 | ||
| else | ||
| echo "No karg changes needed" | ||
| fi | ||
|
|
||
| echo $HWS_VER > $HWS_VER_FILE | ||
| echo $IMAGE_NAME > $KNOWN_IMAGE_NAME_FILE | ||
| echo $IMAGE_FLAVOR > $KNOWN_IMAGE_FLAVOR_FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # SCRIPT VERSION | ||
| USER_SETUP_VER=1 | ||
| USER_SETUP_VER_FILE="$HOME/.ublue-configured" | ||
| USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE) | ||
|
|
||
| # Run script if updated | ||
| if [[ -f $USER_SETUP_VER_FILE && $USER_SETUP_VER = $USER_SETUP_VER_RAN ]]; then | ||
| echo "User setup has already run. Exiting..." | ||
| exit 0 | ||
| fi | ||
|
|
||
| IMAGE_INFO="/usr/share/ublue-os/image-info.json" | ||
| IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) | ||
|
|
||
| # Enable NTP | ||
| timedatectl set-ntp true | ||
|
|
||
| # Setup Flathub | ||
| if grep -qz 'fedora' <<< $(flatpak remotes); then | ||
| flatpak remote-delete --user fedora --force | ||
| fi | ||
| flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo | ||
|
|
||
| # Prevent future executions | ||
| echo "Writing state file" | ||
| echo $USER_SETUP_VER > $USER_SETUP_VER_FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| org.mozilla.firefox | ||
| com.mattjakeman.ExtensionManager | ||
| io.missioncenter.MissionCenter | ||
| org.gnome.Calculator | ||
| org.gnome.Calendar | ||
| org.gnome.Characters | ||
| org.gnome.Contacts | ||
| org.gnome.Evince | ||
| org.gnome.Logs | ||
| org.gnome.Loupe | ||
| org.gnome.Maps | ||
| org.gnome.NautilusPreviewer | ||
| org.gnome.TextEditor | ||
| org.gnome.Weather | ||
| org.gnome.baobab | ||
| org.gnome.Totem | ||
| org.gnome.clocks | ||
| org.gnome.font-viewer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| org.gnome.Cheese | ||
| org.gnome.eog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| [Unit] | ||
| Description=Manage system flatpaks | ||
| Documentation=https://github.com/ublue-os/endlish-oesque/issues/10 | ||
| Wants=network-online.target | ||
| After=network-online.target ublue-hardware-setup.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStart=/usr/bin/ublue-flatpak-manager | ||
| Restart=on-failure | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [Unit] | ||
| Description=Configure system for current hardware | ||
| After=rpm-ostreed.service | ||
| Before=systemd-user-sessions.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| RemainAfterExit=yes | ||
| ExecStart=/usr/bin/ublue-hardware-setup | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| [Unit] | ||
| Description=Configure system for current user | ||
| Requires=xdg-desktop-autostart.target | ||
|
|
||
| [Service] | ||
| Type=simple | ||
| ExecStart=/usr/bin/ublue-user-setup | ||
|
|
||
| [Install] | ||
| WantedBy=default.target |