general updates

scripts/emacslof

@@ -2,11 +2,12 @@
 
 # Check to see if an emacsclient is running
 if [ $(pgrep -c emacsclient) -gt 0 ]; then
+    echo hi
     
-    if [ $XDG_SESSION_TYPE = "x11" ]; then
+    if [ "$XDG_SESSION_TYPE" == "x11" ]; then
         #X11
         emacsrg=$(wmctrl -lx | rg emacs.Emacs | rg -v org-agenda | awk '{print $1}')
-        # echo $emacsrg
+        echo $emacsrg
 
         if [ -z $emacsrg ]; then
             exec emacsclient -c &
@@ -16,15 +17,15 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then
             exit
         fi
     else
-        if [ $KDE_FULL_SESSION = "true" ]; then
+        if [ "$KDE_FULL_SESSION" == "true" ]; then
             exec /home/chris/bin/ww -fa Emacs -c emacsclient
             exit
         else
             # WAYLAND
-            emacsrg=$(wlrctl window list | rg -v 'emacs:\sorg-agenda' | rg 'emacs:')
+            emacsrg=$(wlrctl window list | rg -v 'Emacs:\sorg-agenda' | rg 'Emacs:')
 
             emacswin=$(echo $emacsrg | sed 's/.*\: //')
-            # echo $emacswin
+            echo $emacswin
 
             exec wlrctl toplevel focus title:"$emacswin"
             exit

scripts/fflof

@@ -6,7 +6,7 @@ echo $MOZ_ENABLE_WAYLAND
 if [ $(pgrep -c firefox) -gt 0 ]; then
     echo "ff running"
 
-    if [ $XDG_SESSION_TYPE = "x11" ]; then
+    if [ "$XDG_SESSION_TYPE" = "x11" ]; then
         #X11
         ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}')
         # echo $emacsrg
@@ -19,7 +19,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
             exit
         fi
     else
-        if [ $KDE_FULL_SESSION = "true" ]; then
+        if [ "$KDE_FULL_SESSION" = "true" ]; then
             echo "KDE"
             exec /home/chris/bin/ww -f firefox -c firefox
             exit
@@ -30,7 +30,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
             ffwin=$(echo $ffrg | sed 's/.*\: //')
             # echo $ffwin
 
-            exec wlrctl toplevel focus title:"$ffwin"
+            exec wlrctl toplevel focus firefox
             exit
         fi
     fi

scripts/startup.sh

@@ -2,9 +2,9 @@
 
 waybar &
 rbw-agent &
-killall jellyfin-mpv-shim && jellyfin-mpv-shim &
+systemctl --user restart jellyfin-mpv-shim.service &
+systemctl --user restart nextcloud-client.service &
+systemctl --user restart emacs.service &
 /usr/lib/kdeconnectd &
-emacs --daemon &
 nm-applet &
-nextcloud --background &
 greenclip daemon &