From 2adb94e2db44d1f5bfbe20810d13564cf95bff44 Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Wed, 3 Jul 2024 21:50:02 -0300
Subject: [PATCH] radio: files: river: Move the 'Autostart applications'
 section to the begin of the file, also avoid using `riverctl spawn` when not
 necessary

---
 .../radio/files/.config/river/init            | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/home-environments/radio/files/.config/river/init b/home-environments/radio/files/.config/river/init
index 7a4173e..e5a64c2 100755
--- a/home-environments/radio/files/.config/river/init
+++ b/home-environments/radio/files/.config/river/init
@@ -9,6 +9,23 @@ for mode in locked normal wlrctl; do
     riverctl map-switch $mode lid close "doas zzz"
 done
 
+# Autostart applications ______________________________________________________
+
+spawn () {
+    $1 >> ~/.local/state/log/$(basename $1).log 2>&1 &
+}
+
+# xdg-desktop-portal
+dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river
+spawn ~/.guix-home/profile/libexec/xdg-desktop-portal-wlr
+spawn ~/.guix-home/profile/libexec/xdg-desktop-portal
+
+for application in gammastep waybar fnott keepassxc; do
+    spawn $application
+done
+
+wayneko --background-colour 0x606060 --layer overlay &
+
 # Decorations _________________________________________________________________
 
 # wallpaper
@@ -278,18 +295,3 @@ riverctl map passthrough Super F12 enter-mode normal
 # initial view tags
 # riverctl rule-add -app-id 'TelegramDesktop' ${scratch_tag}
 
-# Autostart applications ______________________________________________________
-
-spawn () {
-    riverctl spawn "$1 >> ~/.local/state/log/$(basename $1).log 2>&1" &
-}
-
-dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river
-spawn ~/.guix-home/profile/libexec/xdg-desktop-portal-wlr
-spawn ~/.guix-home/profile/libexec/xdg-desktop-portal
-
-for application in gammastep waybar fnott keepassxc; do
-    spawn $application
-done
-
-riverctl spawn "wayneko --background-colour 0x606060 --layer overlay"