Update with Ja Suggestions

5 files changed, 89 insertions, 89 deletions

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 8ad56515..26a32f55 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -30,7 +30,7 @@ bind = $mainMod, Q, killactive,
 bind = $mainMod, Return, exec, $term
 bind = $mainMod, T, exec, $files
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
-bind = CTRL ALT, P, exec, $scriptsDir/rofipower.sh
+bind = CTRL ALT, P, exec, $scriptsDir/RofiPower.sh
 bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh
 bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh
 bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh
diff --git a/config/hypr/scripts/RofiPower.sh b/config/hypr/scripts/RofiPower.sh
new file mode 100755
index 00000000..824cffa3
--- /dev/null
+++ b/config/hypr/scripts/RofiPower.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+SwayLock=$HOME/.config/hypr/scripts/LockScreen.sh
+
+# CMDs
+uptime_info=$(uptime -p | sed -e 's/up //g')
+host=$(hostnamectl hostname)
+
+# Options with Icons and Text
+options=("Lock" "Suspend" "Logout" "Reboot" "Shutdown" "Hibernate")
+icons=("" "" "󰿅" "󱄌" "" "󰒲")
+
+# Rofi CMD
+rofi_cmd() {
+    options_with_icons=()
+    for ((i = 0; i < ${#options[@]}; i++)); do
+        options_with_icons+=("${icons[$i]} ${options[$i]}")
+    done
+
+    chosen_option=$(printf "%s\n" "${options_with_icons[@]}" | \
+	rofi -dmenu -i -p " $USER@$host" -mesg " Uptime: $uptime_info" \
+	-kb-select-1 "l" \
+	-kb-select-2 "u" \
+	-kb-select-3 "e" \
+	-kb-select-4 "r" \
+	-kb-select-5 "s" \
+	-kb-select-6 "h" \
+	-theme ~/.config/rofi/config-powermenu.rasi | awk '{print $1}')
+    echo "$chosen_option"
+}
+
+# Pass variables to rofi dmenu
+run_rofi() {
+    chosen_option=$(rofi_cmd)
+    echo "$chosen_option"
+}
+
+# Execute Command
+run_cmd() {
+    case $1 in
+        "")
+            $SwayLock &
+            ;;
+        "")
+            systemctl suspend
+            ;;
+        "󰿅")
+            hyprctl dispatch exit 0
+            ;;
+        "󱄌")
+            systemctl reboot
+            ;;
+        "")
+            systemctl poweroff
+            ;;
+        "󰒲")
+            systemctl hibernate
+            ;;
+        *)
+            echo "choose: $1"
+            ;;
+    esac
+}
+
+# Actions
+chosen_option=$(run_rofi)
+run_cmd "${chosen_option% *}"
\ No newline at end of file
diff --git a/config/hypr/scripts/rofipower.sh b/config/hypr/scripts/rofipower.sh
deleted file mode 100755
index 7bb70e9c..00000000
--- a/config/hypr/scripts/rofipower.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-
-# Swayconfig
-SWAYCONFIG="$HOME/.config/swaylock/config"
-
-# CMDs
-uptime="`uptime -p | sed -e 's/up //g'`"
-host=`hostnamectl hostname`
-
-# Options
-shutdown='	Shutdown'
-reboot=' Reboot'
-lock=' Lock'
-suspend=' Suspend'
-logout=' Logout'
-hibernate=' Hibernate'
-
-# Rofi CMD
-rofi_cmd() {
-	rofi -dmenu -p " $USER@$host" -mesg " Uptime: $uptime" -sep '|' -eh 2 -theme ~/.config/rofi/config-powermenu.rasi
-}
-
-# Pass variables to rofi dmenu
-run_rofi() {
-	echo -e "$lock\0meta\x1fl|$suspend\0meta\x1fu|$logout\0meta\x1fe|$reboot\0meta\x1fr|$shutdown\0meta\x1fs|$hibernate\0meta\x1fh" | rofi_cmd
-}
-
-# Execute Command
-run_cmd() {
-	if [[ $1 == '--shutdown' ]]; then
-		systemctl poweroff
-	elif [[ $1 == '--reboot' ]]; then
-		systemctl reboot
-	elif [[ $1 == '--suspend' ]]; then
-		systemctl suspend
-	elif [[ $1 == '--logout' ]]; then
-		hyprctl dispatch exit 0
-	elif [[ $1 == '--hibernate' ]]; then
-		systemctl hibernate
-	fi
-}
-
-# Actions
-chosen="$(run_rofi)"
-case ${chosen} in
-    $shutdown)
-		run_cmd --shutdown
-        ;;
-    $reboot)
-		run_cmd --reboot
-        ;;
-    $hibernate)
-		run_cmd --hibernate
-        ;;
-    $lock)
-        sleep 0.5s; swaylock --config ${SWAYCONFIG} & disown
-        ;;
-    $suspend)
-		run_cmd --suspend
-        ;;
-    $logout)
-		run_cmd --logout
-        ;;
-	$hibernate)
-		run_cmd --hibernate
-		;;
-esac
\ No newline at end of file
diff --git a/config/rofi/config-powermenu.rasi b/config/rofi/config-powermenu.rasi
index 61d7262d..a3babe62 100644
--- a/config/rofi/config-powermenu.rasi
+++ b/config/rofi/config-powermenu.rasi
@@ -3,6 +3,7 @@
 /* ---- Configuration ---- */
 configuration {
     show-icons:                     false;
+    auto-select:                    true;
 }
 
 /* ---- Load pywal colors (custom wal template) ---- */
@@ -10,21 +11,20 @@ configuration {
 
 /* ---- Global Properties ---- */
 * {
-    font:                           "JetBrains Mono Nerd Font 14";
+    font:                           "Fira Code Medium 12";
 }
 
 /* ---- Main Window ---- */
 window {
-    transparency:                   "real";
     location:                       center;
     anchor:                         center;
     fullscreen:                     false;
-    width:                          25%;
-    height:                         25%;
+    width:                          38%;
+    /*height:                         30%;*/
     x-offset:                       0px;
     y-offset:                       0px;
     padding:                        0px;
-    border:                         2px solid;
+    border:                         2px;
     border-radius:                  15px;
     border-color:                   @active-background;
     cursor:                         "default";
@@ -48,20 +48,21 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                        true;
-    padding:                        10px 6.5%;
+	padding:						10px;
     background-color:               transparent;
-    orientation:                    vertical;
+    orientation:                    horizontal;
     children:                       ["prompt"];
 }
 
 prompt {
     enabled:                        true;
-    padding:                        1% 2.5%;
-    border-radius:                  100% 100% 100% 100%;
+	padding:						10px;
+	border-radius:					15px;
     border-color:                   @foreground;
     background-color:               @background-color;
     text-color:                     @foreground;
     cursor:                         text;
+	
 }
 
 /* ---- Listview ---- */
@@ -74,10 +75,10 @@ listview {
     scrollbar:                      false;
     layout:                         vertical;
     reverse:                        false;
-    fixed-height:                   true;
+    fixed-height:                   false;
     fixed-columns:                  true;
-    spacing:                        20px;
-    padding:                        1% 30px;
+    spacing:                        30px;
+    padding:                        2% 30px;
     background-color:               transparent;
     cursor:                         "default";
     border:                         0px;
@@ -86,14 +87,14 @@ listview {
 /* ---- Elements ---- */
 element {
     enabled:                        true;
-    padding:                        10px;
+    padding:                        20px;
     border-radius:                  30px;
     background-color:               transparent;
     text-color:                     @foreground;
     cursor:                         pointer;
 }
 element-text {
-    font:                           "JetBrains Mono Nerd Font 18";
+    font:                           "Fira Code SemiBold 16";
     background-color:               transparent;
     text-color:                     inherit;
     cursor:                         inherit;
@@ -109,15 +110,14 @@ element selected.normal {
 message {
     enabled:                        true;
     margin:                         0px;
-    padding:                        15px;
-    border-radius:                  0px;
     background-color:               transparent;
     text-color:                     @foreground;
     border:                         0px;
 }
 textbox {
-    background-color:               inherit;
-    text-color:                     inherit;
+    font:                           "Fira Code SemiBold 8";
+    background-color:               @background;
+    text-color:                     @foreground;
     vertical-align:                 0.5;
     horizontal-align:               0.5;
 }
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index 45668c3a..43a6bab2 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -199,7 +199,7 @@
     "tooltip": true,
     "tooltip-format": "{timeTo} {power}w",
     "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-    "on-click-right": "~/.config/hypr/scripts/rofipower.sh",
+    "on-click-right": "~/.config/hypr/scripts/RofiPower.sh",
   },
       
   "bluetooth": {
@@ -497,7 +497,7 @@
   "custom/power": {
     "format": "⏻ ",
     "tooltip": false,
-    "on-click": "~/.config/hypr/scripts/rofipower.sh",
+    "on-click": "~/.config/hypr/scripts/RofiPower.sh",
     "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
   },
   
@@ -652,7 +652,7 @@
   "custom/power_vertical": {
     "format": "⏻",
     "tooltip": false,
-    "on-click": "~/.config/hypr/scripts/rofipower.sh",
+    "on-click": "~/.config/hypr/scripts/RofiPower.sh",
     "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
   },