update things

3 files changed, 24 insertions, 7 deletions

diff --git a/home/config/sway/scripts.d/auto.sh b/home/config/sway/scripts.d/auto.sh
new file mode 100755
index 0000000..07a61fd
--- /dev/null
+++ b/home/config/sway/scripts.d/auto.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+nm-applet --indicator &
+autotiling-rs &
+
+/usr/bin/gnome-keyring-daemon --foreground &
+wl-clip-persist --clipboard both &
+
+#gtk-launch discord &
+#gtk-launch io.element.Element &
+#gtk-launch org.gajim.Gajim &
+#gtk-launch org.mozilla.Thunderbird &
+
+hypridle &
diff --git a/home-config/sway/scripts.d/project.sh b/home/config/sway/scripts.d/project.sh
index afb8507..84e1a8d 100755
--- a/home-config/sway/scripts.d/project.sh
+++ b/home/config/sway/scripts.d/project.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+PID=$$
+
 get_mode() {
     swaymsg -t get_outputs -r | jq ".[$1].modes[0]"
 }
@@ -56,24 +58,25 @@ get_id() {
     i=0
     while true; do
         NAME="$(get_name $i)"
-        if [ "$NAME" == "$1" ]; then
+        if [ $(echo "$NAME" | grep "^$1") ]; then
             echo "$i"
-            exit 0
+            return 0
         elif [ "$NAME" == "null" ]; then
-            exit 1
+            return 1
         fi
         ((i=i+1))
     done
 }
 
 die() {
-    notify-send -u critical -t 3000 "Sway" "Failed to get display"
+    notify-send -u critical -t 3000 "Sway" "$1"
+    kill $PID
 }
 
-PRIMARY=$(get_id "eDP-1")
-EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1")
+PRIMARY=$(get_id "eDP-1" || die "Failed to get primary display")
+EXTERNAL=$(get_id "DP" || get_id "HDMI" || die "Failed to get external display")
 
-PRIMARY_SCALE=1.5
+PRIMARY_SCALE=$2
 EXTERNAL_SCALE=1
 
 set_monitors() {
diff --git a/home-config/sway/scripts.d/scratchpads.sh b/home/config/sway/scripts.d/scratchpads.sh
index bb8e361..bb8e361 100755
--- a/home-config/sway/scripts.d/scratchpads.sh
+++ b/home/config/sway/scripts.d/scratchpads.sh