Merge pull request #33 from JaKooLit/main

Add recent changes to v2.1.9

4 files changed, 194 insertions, 4 deletions

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index c072b4d7..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/Wlogout.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..84d86433
--- /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(l)" "Suspend(u)" "Logout(e)" "Reboot(r)" "Shutdown(s)" "Hibernate(h)")
+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/rofi/config-powermenu.rasi b/config/rofi/config-powermenu.rasi
new file mode 100644
index 00000000..cf0592f8
--- /dev/null
+++ b/config/rofi/config-powermenu.rasi
@@ -0,0 +1,123 @@
+/* --- Configuration for Rofi Power ---- */
+
+/* ---- Configuration ---- */
+configuration {
+    show-icons:                     false;
+}
+
+/* ---- Load pywal colors (custom wal template) ---- */
+@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+
+/* ---- Global Properties ---- */
+* {
+    font:                           "Fira Code Medium 12";
+}
+
+/* ---- Main Window ---- */
+window {
+    location:                       center;
+    anchor:                         center;
+    fullscreen:                     false;
+    width:                          900px;
+    height:                         400px;
+    x-offset:                       0px;
+    y-offset:                       0px;
+    padding:                        0px;
+    border:                         2px;
+    border-radius:                  15px;
+    border-color:                   @active-background;
+    cursor:                         "default";
+    background-color:               @background-color;
+}
+
+/* ---- Main Box ---- */
+mainbox {
+    enabled:                        true;
+    spacing:                        0px;
+    margin:                         0px;
+    padding:                        0px;
+    border:                         0px solid;
+    border-radius:                  0px;
+    background-image:               url("~/.config/rofi/.current_wallpaper", width);
+    border-color:                   @active-background;
+    background-color:               @background-color;
+    children:                       [ "inputbar", "listview", "message" ];
+}
+
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                        true;
+	padding:						20px;
+    background-color:               transparent;
+    orientation:                    horizontal;
+    children:                       ["prompt"];
+}
+
+prompt {
+    enabled:                        true;
+	padding:						10px;
+	border-radius:					15px;
+    border-color:                   @foreground;
+    background-color:               @background-color;
+    text-color:                     @foreground;
+    cursor:                         text;
+	
+}
+
+/* ---- Listview ---- */
+listview {
+    enabled:                        true;
+    columns:                        3;
+    lines:                          2;
+    cycle:                          true;
+    dynamic:                        true;
+    scrollbar:                      false;
+    layout:                         vertical;
+    reverse:                        false;
+    fixed-height:                   false;
+    fixed-columns:                  true;
+    spacing:                        40px;
+    padding:                        4% 40px;
+    background-color:               transparent;
+    cursor:                         "default";
+    border:                         0px;
+	border-color:                   @active-background;
+}
+
+/* ---- Elements ---- */
+element {
+    enabled:                        true;
+    padding:                        20px;
+    border-radius:                  30px;
+    background-color:               transparent;
+    text-color:                     @foreground;
+    cursor:                         pointer;
+}
+element-text {
+    font:                           "Fira Code SemiBold 16";
+    background-color:               transparent;
+    text-color:                     inherit;
+    cursor:                         inherit;
+    vertical-align:                 0.5;
+    horizontal-align:               0.5;
+}
+element selected.normal {
+    background-color:               @selected-normal-background;
+    text-color:                     @background;
+}
+
+/* ---- Message ---- */
+message {
+    enabled:                        true;
+    margin:                         0px;
+    background-color:               transparent;
+    text-color:                     @foreground;
+    border:                         0px;
+}
+textbox {
+    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 b7b41d74..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/Wlogout.sh",
+    "on-click-right": "~/.config/hypr/scripts/RofiPower.sh",
   },
       
   "bluetooth": {
@@ -497,7 +497,7 @@
   "custom/power": {
     "format": "⏻ ",
     "tooltip": false,
-    "on-click": "~/.config/hypr/scripts/Wlogout.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/Wlogout.sh",
+    "on-click": "~/.config/hypr/scripts/RofiPower.sh",
     "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
   },