From f03e4b12a15f6815761c85020c7c4904522665c9 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 15 Jul 2023 15:21:33 +0200
Subject: [PATCH] Fix issues in autostart

---
 .bin/autostart-manage  | 9 +++++----
 .config/autostart.toml | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.bin/autostart-manage b/.bin/autostart-manage
index d168ead..7923b87 100755
--- a/.bin/autostart-manage
+++ b/.bin/autostart-manage
@@ -12,7 +12,7 @@ _query_autostart_toml() {
         (.value.hosts | contains([$host])) or
         ([.value.group] | inside($groups))
     ) | '"$1" \
-    "$HOME/.config/autostart.toml"
+    "$XDG_CONFIG_HOME/autostart.toml"
 }
 
 _list () {
@@ -22,10 +22,11 @@ _list () {
 _echo_table () {
 	for unit in "$@"
 	do
-		printf "%s\t%s\t%s\n" \
+		printf "%s\t%s\t%s\t%s\n" \
 			"$unit" \
 			"$(_systemctl "$unit" is-enabled)" \
-			"$(_systemctl "$unit" is-active)"
+			"$(_systemctl "$unit" is-active)" \
+			"$(_get_autostart_cmd "$unit")"
 	done
 }
 
@@ -40,7 +41,7 @@ _autostart_manage_info () {
 		autostart_units+=("$line")
 	done < <(_list)
 
-	_echo_table "${autostart_units[@]}" | column -t -s$'\t' --table-columns 'Unit,Enabled?,Active?'
+	_echo_table "${autostart_units[@]}" | column -t -s$'\t' --table-columns 'Unit,Enabled?,Active?,Command'
 }
 
 _autostart_manage_log () {
diff --git a/.config/autostart.toml b/.config/autostart.toml
index ecaaafa..3d2ca9c 100644
--- a/.config/autostart.toml
+++ b/.config/autostart.toml
@@ -27,7 +27,7 @@ hosts = []
 group = 'conky'
 
 [apps.discord]
-command = 'flatpak run com.discordapp.discord'
+command = 'flatpak run com.discordapp.Discord'
 hosts = []
 group = 'chat'
 
@@ -37,12 +37,12 @@ hosts = []
 group = 'common'
 
 [apps.element]
-command = 'flatpak run im.riot.riot'
+command = 'flatpak run im.riot.Riot'
 hosts = []
 group = 'chat'
 
 [apps.hyprland-handler]
-command = 'hyprland-handler'
+command = '$XDG_CONFIG_HOME/hypr/handler'
 hosts = []
 group = 'wayland'