From 5484b1d3ae72dc09eace8f80add3493733730303 Mon Sep 17 00:00:00 2001
From: gerblesh <101901964+gerblesh@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:34:02 -0700
Subject: [PATCH] update, rebase to sericea

---
 recipe.yml                                             | 5 ++++-
 scripts/post/setup-systemd-services.sh                 | 1 +
 usr/bin/emoji-menu.sh                                  | 2 +-
 usr/share/ublue-os/firstboot/launcher/login-profile.sh | 9 ---------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/recipe.yml b/recipe.yml
index 81a10eb580..ba043837fd 100644
--- a/recipe.yml
+++ b/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
@@ -135,6 +135,9 @@ rpm:
     # - fontawesome5-free-fonts
     # replaced with distrobox
     - toolbox
+    - sway-config-fedora
+    - dunst
+    - rofi-wayland
 
 # Configuration for the "first boot" experience, which is available after login.
 firstboot:
diff --git a/scripts/post/setup-systemd-services.sh b/scripts/post/setup-systemd-services.sh
index 48bfa2c4b0..a32994edf3 100644
--- a/scripts/post/setup-systemd-services.sh
+++ b/scripts/post/setup-systemd-services.sh
@@ -6,3 +6,4 @@ echo "Setup systemd units"
 systemctl enable getty@tty1
 systemctl disable rpm-ostree-countme.service
 systemctl enable power-profiles-daemon
+
diff --git a/usr/bin/emoji-menu.sh b/usr/bin/emoji-menu.sh
index 02e436cc58..bf702df2a8 100755
--- a/usr/bin/emoji-menu.sh
+++ b/usr/bin/emoji-menu.sh
@@ -13,5 +13,5 @@ filter='.[] | (.emoji + " " + .description + " (" + (.aliases | join(", ")) + ")
 sel="$(jq -r "$filter" <"$data_file" | fuzzel --dmenu --prompt " Select Emoji:  " | cut -d ' ' -f 1 | tr -d '\n')"
 if [ -n "$sel" ]; then
     wl-copy "$sel"
-    wtype "$sel"
+    sleep 0.2 && wtype "$sel"
 fi
diff --git a/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
index 9b484d6621..7f1e7fa578 100644
--- a/usr/share/ublue-os/firstboot/launcher/login-profile.sh
+++ b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
@@ -1,6 +1,5 @@
 # Only process users with home directories, but skip the "root" user.
 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
@@ -10,14 +9,6 @@ if [ "$(id -u)" != "0" ] && [ ! -z "$HOME" ] && [ -d "$HOME" ]; then
         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
-
 fi