feat(hyprland): reconfigure for uwsm + systemd

rofi/applets/bin/apps.sh

@@ -22,11 +22,11 @@ elif [[ ( "$theme" == *'type-2'* ) || ( "$theme" == *'type-4'* ) ]]; then
 fi
 
 # CMDs (add your apps here)
-term_cmd='kitty'
-file_cmd='nautilus'
-text_cmd='gedit'
-web_cmd='flatpak run io.gitlab.librewolf-community'
-music_cmd=''
+term_cmd='uwsm app kitty'
+file_cmd='uwsm app nautilus'
+text_cmd='uwsm app gedit'
+web_cmd='uwsm app io.gitlab.librewolf-community.desktop'
+music_cmd='uwsm app com.github.iwalton3.jellyfin-mpv-shim.desktop'
 setting_cmd=''
 
 # Options

rofi/applets/bin/battery.sh

@@ -108,7 +108,7 @@ run_cmd() {
 	elif [[ "$1" == '--opt2' ]]; then
 		notify-send -u low "$ICON_CHRG Status : $status"
 	elif [[ "$1" == '--opt3' ]]; then
-		xfce4-power-manager-settings
+		uwsm app xfce4-power-manager-settings
 	elif [[ "$1" == '--opt4' ]]; then
 		${polkit_cmd} kitty -e powertop
 	fi

rofi/applets/bin/brightness.sh

@@ -83,7 +83,7 @@ run_cmd() {
 	elif [[ "$1" == '--opt3' ]]; then
 		light -U 5
 	elif [[ "$1" == '--opt4' ]]; then
-		xfce4-power-manager-settings
+		uwsm app xfce4-power-manager-settings
 	fi
 }
 

rofi/applets/bin/powermenu.sh

@@ -14,116 +14,116 @@ prompt="`hostname`"
 mesg="Uptime : `uptime -p | sed -e 's/up //g'`"
 
 if [[ ( "$theme" == *'type-1'* ) || ( "$theme" == *'type-3'* ) || ( "$theme" == *'type-5'* ) ]]; then
-	list_col='1'
-	list_row='6'
+    list_col='1'
+    list_row='6'
 elif [[ ( "$theme" == *'type-2'* ) || ( "$theme" == *'type-4'* ) ]]; then
-	list_col='6'
-	list_row='1'
+    list_col='6'
+    list_row='1'
 fi
 
 # Options
 layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`
 if [[ "$layout" == 'NO' ]]; then
-	option_1="󰍁 Lock"
-	option_2="󰗼 Logout"
-	option_3="󰒲 Suspend"
-	option_4="󰜗 Hibernate"
-	option_5="󰜉 Reboot"
-	option_6=" Shutdown"
-	yes=' Yes'
-	no=' No'
+    option_1="󰍁 Lock"
+    option_2="󰗼 Logout"
+    option_3="󰒲 Suspend"
+    option_4="󰜗 Hibernate"
+    option_5="󰜉 Reboot"
+    option_6=" Shutdown"
+    yes=' Yes'
+    no=' No'
 else
-	option_1="󰍁"
-	option_2="󰗼"
-	option_3="󰒲"
-	option_4="󰜗"
-	option_5="󰜉"
-	option_6=""
-	yes=''
-	no=''
+    option_1="󰍁"
+    option_2="󰗼"
+    option_3="󰒲"
+    option_4="󰜗"
+    option_5="󰜉"
+    option_6=""
+    yes=''
+    no=''
 fi
 
 # Rofi CMD
 rofi_cmd() {
-	rofi -theme-str "listview {columns: $list_col; lines: $list_row;}" \
-		-theme-str 'textbox-prompt-colon {str: "";}' \
-		-dmenu \
-		-p "$prompt" \
-		-mesg "$mesg" \
-		-markup-rows \
-		-theme ${theme}
+    rofi -theme-str "listview {columns: $list_col; lines: $list_row;}" \
+        -theme-str 'textbox-prompt-colon {str: "";}' \
+        -dmenu \
+        -p "$prompt" \
+        -mesg "$mesg" \
+        -markup-rows \
+        -theme ${theme}
 }
 
 # Pass variables to rofi dmenu
 run_rofi() {
-	echo -e "$option_1\n$option_2\n$option_3\n$option_4\n$option_5\n$option_6" | rofi_cmd
+    echo -e "$option_1\n$option_2\n$option_3\n$option_4\n$option_5\n$option_6" | rofi_cmd
 }
 
 # Confirmation CMD
 confirm_cmd() {
-	rofi -theme-str 'window {location: center; anchor: center; fullscreen: false; width: 350px;}' \
-		-theme-str 'mainbox {orientation: vertical; children: [ "message", "listview" ];}' \
-		-theme-str 'listview {columns: 2; lines: 1;}' \
-		-theme-str 'element-text {horizontal-align: 0.5;}' \
-		-theme-str 'textbox {horizontal-align: 0.5;}' \
-		-dmenu \
-		-p 'Confirmation' \
-		-mesg 'Are you Sure?' \
-		-theme ${theme}
+    rofi -theme-str 'window {location: center; anchor: center; fullscreen: false; width: 350px;}' \
+        -theme-str 'mainbox {orientation: vertical; children: [ "message", "listview" ];}' \
+        -theme-str 'listview {columns: 2; lines: 1;}' \
+        -theme-str 'element-text {horizontal-align: 0.5;}' \
+        -theme-str 'textbox {horizontal-align: 0.5;}' \
+        -dmenu \
+        -p 'Confirmation' \
+        -mesg 'Are you Sure?' \
+        -theme ${theme}
 }
 
 # Ask for confirmation
 confirm_exit() {
-	echo -e "$yes\n$no" | confirm_cmd
+    echo -e "$yes\n$no" | confirm_cmd
 }
 
 # Confirm and execute
-confirm_run () {	
-	selected="$(confirm_exit)"
-	if [[ "$selected" == "$yes" ]]; then
+confirm_run () {
+    selected="$(confirm_exit)"
+    if [[ "$selected" == "$yes" ]]; then
         ${1} && ${2} && ${3}
     else
         exit
-    fi	
+    fi
 }
 
 # Execute Command
 run_cmd() {
-	if [[ "$1" == '--opt1' ]]; then
-	  loginctl lock-session
-	elif [[ "$1" == '--opt2' ]]; then
-		confirm_run 'hyprctl dispatch exit'
-	elif [[ "$1" == '--opt3' ]]; then
-		confirm_run 'systemctl suspend'
-	elif [[ "$1" == '--opt4' ]]; then
-		confirm_run 'systemctl hibernate'
-	elif [[ "$1" == '--opt5' ]]; then
-		confirm_run 'systemctl reboot'
-	elif [[ "$1" == '--opt6' ]]; then
-		confirm_run 'systemctl poweroff'
-	fi
+    if [[ "$1" == '--opt1' ]]; then
+        loginctl lock-session
+    elif [[ "$1" == '--opt2' ]]; then
+        confirm_run 'uwsm stop'
+    elif [[ "$1" == '--opt3' ]]; then
+        confirm_run 'systemctl suspend'
+    elif [[ "$1" == '--opt4' ]]; then
+        confirm_run 'systemctl hibernate'
+    elif [[ "$1" == '--opt5' ]]; then
+        confirm_run 'systemctl reboot'
+    elif [[ "$1" == '--opt6' ]]; then
+        confirm_run 'systemctl poweroff'
+    fi
 }
 
 # Actions
 chosen="$(run_rofi)"
 case ${chosen} in
     $option_1)
-		run_cmd --opt1
+        run_cmd --opt1
         ;;
     $option_2)
-		run_cmd --opt2
+        run_cmd --opt2
         ;;
     $option_3)
-		run_cmd --opt3
+        run_cmd --opt3
         ;;
     $option_4)
-		run_cmd --opt4
+        run_cmd --opt4
         ;;
     $option_5)
-		run_cmd --opt5
+        run_cmd --opt5
         ;;
     $option_6)
-		run_cmd --opt6
+        run_cmd --opt6
         ;;
 esac
 

rofi/applets/bin/volume.sh

@@ -108,7 +108,7 @@ run_cmd() {
 	elif [[ "$1" == '--opt4' ]]; then
 		amixer set Capture toggle
 	elif [[ "$1" == '--opt5' ]]; then
-		pavucontrol
+		uwsm app pavucontrol
 	fi
 }
 

rofi/launchers/type-1/launcher.sh

@@ -18,3 +18,4 @@ theme='style-5'
 rofi \
     -show drun \
     -theme ${dir}/${theme}.rasi
+    -run-command "uwsm app -- {cmd}"