Merge branch 'main' into 24.04-builder

.gitignore

@@ -3,4 +3,4 @@
 flatpaks_with_deps
 flatpak.*
 
-scripts/files/home/ublue-os/*
+scripts/files/home/ublue-os/*

aurora_flatpaks/flatpaks

@@ -14,4 +14,4 @@ app/io.github.flattool.Warehouse/x86_64/stable
 app/org.fedoraproject.MediaWriter/x86_64/stable
 app/io.missioncenter.MissionCenter/x86_64/stable
 app/org.gnome.DejaDup/x86_64/stable
-app/org.gnome.World.PikaBackup/x86_64/stable
+app/org.gnome.World.PikaBackup/x86_64/stable

build_files/base/bluefin-changes.sh

@@ -10,4 +10,4 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
         sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop
     fi
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop
-fi
+fi

build_files/base/branding.sh

@@ -13,4 +13,4 @@ elif test "$BASE_IMAGE_NAME" = "kinoite"; then
 fi
 
 # Watermark for Plymouth
-cp /usr/share/plymouth/themes/spinner/{"$BASE_IMAGE_NAME"-,}watermark.png
+cp /usr/share/plymouth/themes/spinner/{"$BASE_IMAGE_NAME"-,}watermark.png

build_files/base/build-base.sh

@@ -16,4 +16,4 @@ set -ouex pipefail
 . /tmp/build/aurora-changes.sh
 . /tmp/build/branding.sh
 . /tmp/build/initramfs.sh
-. /tmp/build/cleanup.sh
+. /tmp/build/cleanup.sh

build_files/base/fetch-install.sh

@@ -28,4 +28,4 @@ rpm-ostree install ublue-update
 find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
 
 # Copy over ublue-update config
-cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
+cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml

build_files/base/font-install.sh

@@ -10,4 +10,4 @@ if [[ "${BASE_IMAGE_NAME}" =~ "kinoite" ]]; then
 fi
 
 fc-cache -f /usr/share/fonts/ubuntu 
-fc-cache -f /usr/share/fonts/inter
+fc-cache -f /usr/share/fonts/inter

build_files/base/nvidia.sh

@@ -8,4 +8,4 @@ if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then
     if [[ "${BASE_IMAGE_NAME}" =~ "kinoite" && "${FEDORA_MAJOR_VERSION}" -gt "39" ]]; then
         rpm-ostree install plasma-workspace-x11
     fi
-fi
+fi

build_files/base/systemd.sh

@@ -11,4 +11,4 @@ systemctl enable ublue-system-setup.service
 systemctl enable ublue-etc-merge.service
 systemctl enable ublue-guest-user.service
 systemctl --global enable ublue-user-setup.service
-systemctl --global enable podman-auto-update.timer
+systemctl --global enable podman-auto-update.timer

build_files/dx/branding-dx.sh

@@ -9,4 +9,4 @@ elif test "$BASE_IMAGE_NAME" = "kinoite"; then
     sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release
     sed -i 's/Aurora/Aurora-dx/' /usr/etc/yafti.yml
     sed -i 's/Aurora/Aurora-DX/' /usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc
-fi
+fi

build_files/dx/cleanup-dx.sh

@@ -15,4 +15,4 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 
 for i in /etc/yum.repos.d/rpmfusion-*; do
     sed -i 's@enabled=1@enabled=0@g' "$i"
-done
+done

build_files/dx/fetch-install-dx.sh

@@ -4,4 +4,4 @@ set -ouex pipefail
 
 curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64"
 chmod +x ./kind
-mv ./kind /usr/bin/kind
+mv ./kind /usr/bin/kind

build_files/dx/systemd-dx.sh

@@ -8,4 +8,4 @@ systemctl enable swtpm-workaround.service
 systemctl enable bluefin-dx-groups.service
 systemctl enable --global bluefin-dx-user-vscode.service
 systemctl disable pmie.service
-systemctl disable pmlogger.service
+systemctl disable pmlogger.service

scripts/base-image.sh

@@ -9,4 +9,4 @@ elif [[ ${image} =~ "aurora" ]]; then
     echo kinoite
 else
     exit 1
-fi
+fi

scripts/build-image.sh

@@ -29,4 +29,4 @@ $container_mgr build -f Containerfile \
     --build-arg="IMAGE_VENDOR=localhost" \
     --tag localhost/"${tag}":"${version}" \
     --target "${target}" \
-    "${project_root}"
+    "${project_root}"

scripts/build-iso-ghcr.sh

@@ -26,4 +26,4 @@ ${container_mgr} run --rm --privileged \
     ISO_NAME="build/${ghcr_tag}-${version}-ghcr.iso" \
     SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \
     VARIANT="${variant}" \
-    VERSION="${version}"
+    VERSION="${version}"

scripts/build-iso.sh

@@ -34,4 +34,4 @@ ${container_mgr} run --rm --privileged  \
     ISO_NAME="build/${tag}-${version}.iso" \
     SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \
     VARIANT="${variant}" \
-    VERSION="${version}"
+    VERSION="${version}"

scripts/cleanup-dir.sh

@@ -9,4 +9,4 @@ set -euox pipefail
 rm -f "${project_root}"/scripts/files/output/* #ISOs
 rm -f "${project_root}"/*_flatapks/flatpaks_with_deps #Flatpak Deps
 rm -rf "${project_root}"/flatpak.* #Flatpak Tempdir
-rm -rf "${project_root}"/scripts/files/home/ublue-os/* #Test User Home
+rm -rf "${project_root}"/scripts/files/home/ublue-os/* #Test User Home

scripts/cleanup-images.sh

@@ -12,4 +12,4 @@ for i in "${container_mgr[@]}"; do
         xargs -I {} "${i}" image rm {} <<< "$ID"
         echo ""
     fi
-done
+done

scripts/common-build-iso.sh

@@ -108,4 +108,4 @@ rm -rf "${TEMP_FLATPAK_INSTALL_DIR}"
 
 # Remove old ISO if present
 rm -f "${project_root}/scripts/files/output/${tag}-${version}.iso"
-rm -f "${project_root}/scripts/files/output/${tag}-${version}.iso-CHECKSUM"
+rm -f "${project_root}/scripts/files/output/${tag}-${version}.iso-CHECKSUM"

scripts/files/build-iso-makefile-patch

@@ -8,4 +8,4 @@ FILES=$(filter-out Makefile,$(wildcard *))
 clean:
 ifneq ($(FILES),)
 	rm -Rf $(FILES)
-endif
+endif

scripts/files/etc/hostname

@@ -1 +1 @@
-ContainerTestUblueOS
+ContainerTestUblueOS

scripts/files/etc/passwd

@@ -7,4 +7,4 @@ saslauth:x:974:76:Saslauthd user:/run/saslauthd:/sbin/nologin
 libvirtdbus:x:973:961:Libvirt D-Bus bridge:/:/sbin/nologin
 qemu:x:107:107:qemu user:/:/usr/sbin/nologin
 pcp:x:960:960:Performance Co-Pilot:/var/lib/pcp:/usr/sbin/nologin
-ublue-os:x:1000:1000:ublue-os:/home/ublue-os:/usr/bin/bash
+ublue-os:x:1000:1000:ublue-os:/home/ublue-os:/usr/bin/bash

scripts/files/etc/shadow

@@ -56,4 +56,4 @@ libvirtdbus:!:19686::::::
 qemu:!*:19686::::::
 pcp:!*:19686::::::
 sddm:!:::::::
-ublue-os:$y$j9T$uQkZGY3QpPmddmtkavB0Z/$c2rwYgbGPq6lcdpTeof0S7YjOGgfKaKXWxoKy3HjKhC:19816:0:99999:7:::
+ublue-os:$y$j9T$uQkZGY3QpPmddmtkavB0Z/$c2rwYgbGPq6lcdpTeof0S7YjOGgfKaKXWxoKy3HjKhC:19816:0:99999:7:::

scripts/get-defaults.sh

@@ -35,4 +35,4 @@ elif [[ ${version} =~ "gts" ]]; then
     version=${gts}
 elif [[ ${version} =~ "latest" ]]; then
     version=${latest}
-fi
+fi

scripts/list-images.sh

@@ -11,4 +11,4 @@ for i in "${container_mgr[@]}"; do
         ${i} images --filter "reference=localhost/bluefin*-build" --filter "reference=localhost/aurora*-build"
         echo ""
     fi
-done
+done

scripts/make-tag.sh

@@ -9,4 +9,4 @@ if [[ "${target}" =~ "base" ]]; then
     echo "${image}-build"
 elif [[ "${target}" =~ "dx" ]]; then
     echo "${image}-${target}-build"
-fi
+fi

scripts/run-booted-guest.sh

@@ -87,4 +87,4 @@ fi
 if [[ -z ${project_root} ]]; then
     project_root=$(git rev-parse --show-toplevel)
 fi
-rm -rf "${project_root}/scripts/files/home/ublue-os"
+rm -rf "${project_root}/scripts/files/home/ublue-os"

scripts/run-booted-home.sh

@@ -72,4 +72,4 @@ fi
 # Boot the container
 "$container_mgr" "${run_cmd[@]}" "localhost/${tag}:${version}" /sbin/init
 
-exit 0
+exit 0

scripts/run-image.sh

@@ -24,4 +24,4 @@ if [[ -z ${ID} ]]; then
 fi
 
 # Run image
-"${container_mgr}" run -it --rm localhost/"${tag}":"${version}" /usr/bin/bash
+"${container_mgr}" run -it --rm localhost/"${tag}":"${version}" /usr/bin/bash

scripts/run-iso.sh

@@ -35,4 +35,4 @@ ${container_mgr} run --rm --cap-add NET_ADMIN \
     --env "BOOT_MODE=uefi" \
     --device=/dev/kvm \
     --volume "${workspace}/scripts/files/output/${tag}-${version}.iso":/boot.iso \
-    docker.io/qemux/qemu-docker
+    docker.io/qemux/qemu-docker

system_files/dx/usr/lib/systemd/system/bluefin-dx-groups.service

@@ -9,4 +9,4 @@ RestartSec=30
 StartLimitInterval=0
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target

system_files/dx/usr/lib/systemd/user/bluefin-dx-user-vscode.service

@@ -11,4 +11,4 @@ RestartSec=30
 StartLimitInterval=0
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target

system_files/dx/usr/lib/tmpfiles.d/incus-workaround.conf

@@ -1,3 +1,3 @@
 C /usr/local/bin/overrides/incus - - - - /usr/bin/incus
 C /usr/local/bin/overrides/incus-agent - - - - /usr/bin/incus-agent
-C /usr/local/lib/overrides/incus - - - - /usr/lib/incus
+C /usr/local/lib/overrides/incus - - - - /usr/lib/incus

system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf

@@ -1,2 +1,2 @@
 C /usr/local/bin/overrides/swtpm - - - - /usr/bin/swtpm
-d /var/lib/swtpm-localca 0750 tss tss - -
+d /var/lib/swtpm-localca 0750 tss tss - -

system_files/dx/usr/libexec/bluefin-incus

@@ -86,4 +86,4 @@ else
     fi
 fi
 echo ""
-echo "Incus has been installed. You can now run 'incus' to manage your containers."
+echo "Incus has been installed. You can now run 'incus' to manage your containers."

system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/sh
 
-alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"
+alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"

system_files/kinoite/usr/etc/profile.d/ksshaskpass.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 SSH_ASKPASS=/usr/bin/ksshaskpass
-export SSH_ASKPASS
+export SSH_ASKPASS

system_files/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service

@@ -17,4 +17,4 @@ ExecStop=/usr/bin/rm /usr/local/libexec/.ksysguard/ksgrd_network_helper
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

system_files/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf

@@ -1 +1 @@
-C /usr/local/libexec/.ksysguard/ksgrd_network_helper - - - - /usr/libexec/ksysguard/ksgrd_network_helper
+C /usr/local/libexec/.ksysguard/ksgrd_network_helper - - - - /usr/libexec/ksysguard/ksgrd_network_helper

system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Meta+Return
+X-KDE-Shortcuts=Meta+Return

system_files/kinoite/usr/share/applications/quadlet-fedora.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Ctrl+Alt+F
+X-KDE-Shortcuts=Ctrl+Alt+F

system_files/kinoite/usr/share/applications/quadlet-ubuntu.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Ctrl+Alt+U
+X-KDE-Shortcuts=Ctrl+Alt+U

system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish

@@ -1 +1 @@
-alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"
+alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"

system_files/kinoite/usr/share/icons/default/index.theme

@@ -1,2 +1,2 @@
 [Icon Theme]
-Inherits=breeze_cursors,breeze-dark
+Inherits=breeze_cursors,breeze-dark

system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc

@@ -2,4 +2,4 @@
 LogoPath=/usr/share/pixmaps/system-logo.png
 Name=Aurora
 Website=https//getaurora.dev
-Variant=Aurora
+Variant=Aurora

system_files/kinoite/usr/share/kde-settings/kde-profile/default/xdg/krunnerrc

@@ -1,2 +1,2 @@
 [General]
-FreeFloating=true
+FreeFloating=true

system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Meta+Return
+X-KDE-Shortcuts=Meta+Return

system_files/kinoite/usr/share/kglobalaccel/quadlet-fedora.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Ctrl+Alt+F
+X-KDE-Shortcuts=Ctrl+Alt+F

system_files/kinoite/usr/share/kglobalaccel/quadlet-ubuntu.desktop

@@ -5,4 +5,4 @@ NoDisplay=true
 StartupNotification=false
 Type=Application
 X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Ctrl+Alt+U
+X-KDE-Shortcuts=Ctrl+Alt+U

system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js

@@ -1,4 +1,4 @@
 applet.wallpaperPlugin = 'org.kde.image'
 applet.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]
 applet.writeConfig("Image", "/usr/share/wallpapers/jonatan-pie-aurora.jpg")
-applet.reloadConfig()
+applet.reloadConfig()

system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js

@@ -3,4 +3,4 @@ if (systemtrayId) {
     const systrayContainer = desktopById(systemtrayId);
     systrayContainer.currentConfigGroup = ["General"];
     systrayContainer.writeConfig("scaleIconsToFit", true);
-}
+}

system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml

@@ -81,4 +81,4 @@ Rectangle {
         duration: PlasmaCore.Units.veryLongDuration * 2
         easing.type: Easing.InOutQuad
     }
-}
+}

system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.desktop

@@ -13,4 +13,4 @@ X-KDE-PluginInfo-Name=dev.getaurora.aurora.desktop
 X-KDE-PluginInfo-Version=0.01
 X-KDE-PluginInfo-Website=https://getauorora.dev
 X-Plasma-MainScript=defaults
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPLv2+

system_files/kinoite/usr/share/ublue-os/aurora-logo.txt

@@ -26,4 +26,4 @@ $3          $4++++    $3+++++++++++++   ++++++$2+++
 $3                +++++++++++   ++++++$2+++             
 $3                  +++++    ++++++$2+++                 
 $3                        ++++++$2++                    
-$3                        +++++                       
+$3                        +++++                       

system_files/shared/usr/etc/profile.d/askpass.sh

@@ -8,4 +8,4 @@ if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
 elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
   SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
 fi
-export SUDO_ASKPASS
+export SUDO_ASKPASS

system_files/shared/usr/etc/profile.d/brew.sh

@@ -1 +1,2 @@
+#!/bin/sh
 [[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"

system_files/shared/usr/etc/profile.d/neofetch.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-alias neofetch=fastfetch
+alias neofetch=fastfetch

system_files/shared/usr/etc/profile.d/nix-app-icons.sh

@@ -1 +1,2 @@
-XDG_DATA_DIRS="$HOME/.nix-profile/share:/nix/var/nix/profiles/default/share:$XDG_DATA_DIRS"
+#!/bin/sh
+XDG_DATA_DIRS="$HOME/.nix-profile/share:/nix/var/nix/profiles/default/share:$XDG_DATA_DIRS"

system_files/shared/usr/etc/skel/.local/share/flatpak/overrides/com.google.Chrome

@@ -1,2 +1,2 @@
 [Context]
-filesystems=~/.local/share/applications;~/.local/share/icons
+filesystems=~/.local/share/applications;~/.local/share/icons