rebase to sericea

recipe.yml

@@ -6,7 +6,7 @@ name: usway
 
 # The native container image to build on top of.
 # Warning: Non-uBlue images might not work properly, due to missing components.
-base-image: quay.io/fedora-ostree-desktops/base
+base-image: quay.io/fedora-ostree-desktops/sericea
 
 # What Fedora version to use. Use an explicit version or `latest`.
 # If you use `latest`, you will be automatically updated to the next major
@@ -139,6 +139,7 @@ rpm:
     # - fontawesome5-free-fonts
     # replaced with distrobox
     - toolbox
+    - sway-config-fedora
 
 # Configuration for the "first boot" experience, which is available after login.
 firstboot:

scripts/pre/1-install-local-rpms.sh

@@ -5,6 +5,8 @@
 # builds actually ran successfully without any errors!
 set -oue pipefail
 
+rpm-ostree override remove jack-audio-connection-kit
+
 # fetch mullvad vpn RPM
 curl -Lo /tmp/rpms/mullvad-vpn.rpm https://mullvad.net/en/download/app/rpm/latest --max-redirs 1
 

usr/etc/homedir/.config/fish/config.fish

@@ -7,5 +7,6 @@ end
 
 alias mpv="flatpak run io.mpv.Mpv"
 alias ls="exa --icons --sort type"
+alias just="just --unstable -f $HOME/.config/just/justfile"
 set PATH "$HOME"/.local/bin:$PATH
 

usr/share/ublue-os/firstboot/launcher/login-profile.sh

@@ -1,23 +1,23 @@
 # Only process users with home directories, but skip the "root" user.
-if [ "$(id -u)" != "0" ] && [ ! -z "$HOME" ] && [ -d "$HOME" ]; then
+# if [ "$(id -u)" != "0" ] && [ ! -z "$HOME" ] && [ -d "$HOME" ]; then
 
-    if [ ! -f "$HOME"/.config/ublue-firstboot ]; then
-        echo "Starting First Time Setup, Please wait..."
-        # copy config files
-        cp -r /usr/etc/homedir/.* "$HOME"/
-        cp -r /usr/etc/homedir/* "$HOME"/
-        # copy justfile
-        echo "Setting up just"
-        mkdir -p "$HOME"/.config/just
-        cp -r /usr/share/ublue-os/just/custom.just "$HOME"/.config/just/justfile
-
-    fi
+#    if [ ! -f "$HOME"/.config/ublue-firstboot ]; then
+#        echo "Starting First Time Setup, Please wait..."
+#        # copy config files
+#        cp -r /usr/etc/homedir/.* "$HOME"/
+#        cp -r /usr/etc/homedir/* "$HOME"/
+#        # copy justfile
+#        echo "Setting up just"
+#        mkdir -p "$HOME"/.config/just
+#        cp -r /usr/share/ublue-os/just/custom.just "$HOME"/.config/just/justfile
+#        
+#    fi
+#
+#    if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+#        echo "Starting Sway"
+#        source "$HOME"/.profile
+#        sway > /dev/null
+#    fi
 
-    if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-        echo "Starting Sway"
-        source "$HOME"/.profile
-        sway > /dev/null
-    fi
-
-fi
+# fi
 

usr/share/ublue-os/just/00-custom.just

@@ -1,5 +1,5 @@
 default:
-    @just --list
+  @just --list
 
 setup-distrobox:
   echo "Setting up distrobox git ..."