Merge pull request #17 from JaKooLit/Dev

Additional waybar tweaks. Added Catppuccin Mocha and Latte waybar themes. 

4 files changed, 58 insertions, 91 deletions

diff --git a/config/hypr/scripts/ChangeLayoutMenu.sh b/config/hypr/scripts/ChangeLayoutMenu.sh
deleted file mode 100755
index bebe0c0f..00000000
--- a/config/hypr/scripts/ChangeLayoutMenu.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Files
-#waybar
-CONFIG="$HOME/.config/waybar/configs"
-WCONFIG="$HOME/.config/waybar/config"
-
-menu(){
-printf "1. default\n" 
-printf "2. plasma-style\n" 
-printf "3. gnome-style\n"
-printf "4. simple panel\n"
-printf "5. simple 2 panel\n"
-printf "6. top & bot panel\n"
-printf "7. left panel\n"
-printf "8. right panel\n"
-printf "9. top & left panel\n"
-printf "10. top & right panel\n"
-printf "11. bottom & left panel\n"
-printf "12. bottom & right panel\n"
-printf "13. all sides\n"
-printf "14. no panel" 
-}
-
-main() {
-    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cut -d. -f1)
-    case $choice in
-    1)
-        ln -sf "$CONFIG/config-default" "$WCONFIG"
-        ;;
-    2)
-        ln -sf "$CONFIG/config-plasma" "$WCONFIG"
-        ;;
-    3)
-        ln -sf "$CONFIG/config-gnome" "$WCONFIG"
-        ;;
-    4)
-        ln -sf "$CONFIG/config-simple" "$WCONFIG"
-        ;;
-    5)
-        ln -sf "$CONFIG/config-simple2" "$WCONFIG"
-        ;;
-    6)
-        ln -sf "$CONFIG/config-dual" "$WCONFIG"
-        ;;
-    7)
-        ln -sf "$CONFIG/config-left" "$WCONFIG"
-        ;;
-    8)
-        ln -sf "$CONFIG/config-right" "$WCONFIG"
-        ;;
-    9)
-        ln -sf "$CONFIG/config-dual-TL" "$WCONFIG"
-        ;;
-    10)
-        ln -sf "$CONFIG/config-dual-TR" "$WCONFIG"
-        ;;
-    11)
-        ln -sf "$CONFIG/config-dual-BL" "$WCONFIG"
-        ;;
-    12)
-        ln -sf "$CONFIG/config-dual-BR" "$WCONFIG"
-        ;;
-    13)
-        ln -sf "$CONFIG/config-all" "$WCONFIG"
-        ;;
-	14)
-        if pgrep -x "waybar" >/dev/null; then
-        pkill waybar
-        exit
-        fi
-        ;;        
-        *)
-        ;;
-    esac
-}
-
-# Check if rofi is already running
-if pidof rofi >/dev/null; then
-    pkill rofi
-    exit 0
-else
-    main
-fi
-
-exec ~/.config/hypr/scripts/Refresh.sh &
-                
\ No newline at end of file
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index f20dc337..7cc061f1 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -41,7 +41,7 @@ fi
 path_param=$(echo $next_mode | sed 's/.*/\u&/')
 
 notify_user "$next_mode"
-ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css"
+#ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css"
 ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/styles/dunstrc"
 
 # Symlink for rofi theme
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
new file mode 100755
index 00000000..87af0fa5
--- /dev/null
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+CONFIG="$HOME/.config/waybar/configs"
+WCONFIG="$HOME/.config/waybar/config"
+
+menu() {
+    cat <<EOF
+default
+Top(gnome)
+Bottom(plasma)
+simple-long
+simple-short
+Top-&-Bottom
+Left
+Right
+Top-Left
+Top-Right
+Bottom-Left
+Bottom-Right
+all-sides
+no panel
+EOF
+}
+
+apply_config() {
+    ln -sf "$CONFIG/config-$1" "$WCONFIG"
+}
+
+main() {
+    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-waybar.rasi)
+
+    case $choice in
+        "no panel")
+            if pgrep -x "waybar" >/dev/null; then
+                pkill waybar
+                exit
+            fi
+            ;;
+        *)
+            apply_config "$choice"
+            ;;
+    esac
+}
+
+# Check if rofi is already running
+if pidof rofi >/dev/null; then
+    pkill rofi
+    exit 0
+else
+    main
+fi
+
+exec ~/.config/hypr/scripts/Refresh.sh &
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 111d16ef..0e714627 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -12,12 +12,13 @@ STYLES=(
 "colors" 
 "colors-border"
 "colors-line"
-"colorful" 
-"mauve" 
+"colorful"
+"catppuccin-mocha"
+"catppuccin-latte"  
 	)
 
 # Build ROFI
-SELECTED_STYLE=$(printf "%s\n" "${STYLES[@]}" | rofi -dmenu -p "Choose" -lines "${#STYLES[@]}")
+SELECTED_STYLE=$(printf "%s\n" "${STYLES[@]}" | rofi -dmenu -config ~/.config/rofi/config-waybar.rasi "${#STYLES[@]}")
 
 # Here you verify the selected theme
 if [[ " ${STYLES[@]} " =~ " $SELECTED_STYLE " ]]; then