Merge pull request #116 from JaKooLit/development

Development

config/hypr/UserConfigs/00-Readme

@@ -1,9 +1,16 @@
+www.github.com/JaKooLit
+
 Hyprland-Dots v2.2.2
 
-1.) Suggest not to rename files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr
+1.) Suggest not to rename any files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr
 
 2.) This folder, along with UserScripts folder will NOT be touch during update.
 
 3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change.
 
+4.) Guidance on the keybinds. Suggest NOT to assign a keybind which I set on the default Keybinds. Else will conflict. Once Hyprland decided to have a global keybinds, then I will adjust.
+
+5.) If you think that the default keybinds SHOULD be adjusted, open an issue on my github page and present me a valid argument. Like conflicting to GLOBAL keybinds, etc etc etc.
+
+
 I will update the Hyprland-Dots wiki for guidance. Make sure to check out changelogs as well

config/hypr/UserConfigs/Laptops.conf

@@ -3,10 +3,9 @@
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
 # These configs are mostly for laptops. This is addemdum to Keybinds.conf
 
-$configs = $HOME/.config/hypr/configs
-$UserConfigs = $HOME/.config/hypr/UserConfigs
 $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
+$UserConfigs = $HOME/.config/hypr/UserConfigs
 
 bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
 bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up

config/hypr/UserConfigs/Monitors.conf

@@ -15,7 +15,7 @@ monitor=,preferred,auto,1
 
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
-#monitor = DP-2, preferred, auto, 1 
+#monitor = DP-3, 1920x1080@240, auto, 1 
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
 

config/hypr/UserConfigs/Startup_Apps.conf

@@ -2,15 +2,15 @@
 #Commands & Apps to be executed at launch
 
 $scriptsDir = $HOME/.config/hypr/scripts
-$UserscriptsDir = $HOME/.config/hypr/UserScripts
+$UserScripts = $HOME/.config/hypr/UserScripts
-$lock = $scriptsDir/LockScreen.sh
-$SwwwRandom = $scriptsDir/WallpaperRandom.sh
-$WallpaperPath = $HOME/Pictures/wallpapers
 
+$wallDIR=$HOME/Pictures/wallpapers
+$lock = $scriptsDir/LockScreen.sh
+$SwwwRandom = $UserscriptsDir/WallpaperAutoChange.sh
 
 # wallpaper stuff / More wallpaper options below
 exec-once = swww query || swww init
-exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes 
+exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes 
 
 # Startup
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP

config/hypr/UserScripts/QuickEdit.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+# Rofi menu for Quick Edit / View of Settings (SUPER E)
 
-defaultDir="$HOME/.config/hypr/configs"
+configs="$HOME/.config/hypr/configs"
-userDir="$HOME/.config/hypr/UserConfigs"
+UserConfigs="$HOME/.config/hypr/UserConfigs"
 
 menu(){
   printf "1. view Env-variables\n"
@@ -19,31 +20,31 @@ main() {
     choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
-            kitty -e nano "$userDir/ENVariables.conf"
+            kitty -e nano "$UserConfigs/ENVariables.conf"
             ;;
         2)
-            kitty -e nano "$userDir/WindowRules.conf"
+            kitty -e nano "$UserConfigs/WindowRules.conf"
             ;;
         3)
-            kitty -e nano "$userDir/Startup_Apps.conf"
+            kitty -e nano "$UserConfigs/Startup_Apps.conf"
             ;;
         4)
-            kitty -e nano "$userDir/UserKeybinds.conf"
+            kitty -e nano "$UserConfigs/UserKeybinds.conf"
             ;;
         5)
-            kitty -e nano "$userDir/Monitors.conf"
+            kitty -e nano "$UserConfigs/Monitors.conf"
             ;;
         6)
-            kitty -e nano "$userDir/Laptops.conf"
+            kitty -e nano "$UserConfigs/Laptops.conf"
             ;;
         7)
-            kitty -e nano "$userDir/UserSettings.conf"
+            kitty -e nano "$UserConfigs/UserSettings.conf"
             ;;
         8)
-            kitty -e nano "$defaultDir/Settings.conf"
+            kitty -e nano "$configs/Settings.conf"
             ;;
         9)
-            kitty -e nano "$defaultDir/Keybinds.conf"
+            kitty -e nano "$configs/Keybinds.conf"
             ;;
         *)
             ;;

config/hypr/UserScripts/Sunset.sh

@@ -1,2 +1,7 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+
+# wlsunset project page
+# https://sr.ht/~kennylevinsen/wlsunset/
+
 wlsunset -t 4000 -T 6500 -d 900 -S 07:00 -s 19:00

config/hypr/UserScripts/WallpaperAutoChange.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# source https://wiki.archlinux.org/title/Hyprland#Using_a_script_to_change_wallpaper_every_X_minutes
 
 # This script will randomly go through the files of a directory, setting it
 # up as the wallpaper at regular intervals

config/hypr/UserScripts/WallpaperRandom.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for Random Wallpaper ( CTRL ALT W)
+
+wallDIR="$HOME/Pictures/wallpapers"
+scriptsDir="$HOME/.config/hypr/scripts"
+
+PICS=($(find ${wallDIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \)))
+RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]}
+
+
+# Transition config
+FPS=60
+TYPE="random"
+DURATION=1
+BEZIER=".43,1.19,1,.4"
+SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
+
+
+swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS
+
+
+${scriptsDir}/PywalSwww.sh
+sleep 1
+${scriptsDir}/Refresh.sh 
+

config/hypr/UserScripts/WallpaperSelect.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# This script for selecting wallpapers (SUPER W)
 
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
 
 # WALLPAPERS PATH
-DIR="$HOME/Pictures/wallpapers"
+wallDIR="$HOME/Pictures/wallpapers"
 
 # Transition config
 FPS=30
@@ -18,18 +20,18 @@ if pidof swaybg > /dev/null; then
 fi
 
 # Retrieve image files
-PICS=($(ls "${DIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$"))
+PICS=($(ls "${wallDIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$"))
 RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME="${#PICS[@]}. random"
 
 # Rofi command
-rofi_command="rofi -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
+rofi_command="rofi -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
 menu() {
   for i in "${!PICS[@]}"; do
     # Displaying .gif to indicate animated images
     if [[ -z $(echo "${PICS[$i]}" | grep .gif$) ]]; then
-      printf "$(echo "${PICS[$i]}" | cut -d. -f1)\n"
+      printf "$(echo "${PICS[$i]}" | cut -d. -f1)\x00icon\x1f${wallDIR}/${PICS[$i]}\n"
     else
       printf "${PICS[$i]}\n"
     fi
@@ -50,7 +52,7 @@ main() {
 
   # Random choice case
   if [ "$choice" = "$RANDOM_PIC_NAME" ]; then
-    swww img "${DIR}/${RANDOM_PIC}" $SWWW_PARAMS
+    swww img "${wallDIR}/${RANDOM_PIC}" $SWWW_PARAMS
     exit 0
   fi
 
@@ -65,7 +67,7 @@ main() {
   done
 
   if [[ $pic_index -ne -1 ]]; then
-    swww img "${DIR}/${PICS[$pic_index]}" $SWWW_PARAMS
+    swww img "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS
   else
     echo "Image not found."
     exit 1

config/hypr/configs/Keybinds.conf

@@ -1,34 +1,40 @@
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Default Keybinds
+# visit https://wiki.hyprland.org/Configuring/Binds/ for more info
 
 $mainMod = SUPER
+# Default
 $scriptsDir = $HOME/.config/hypr/scripts
+$configs = $HOME/.config/hypr/configs
+# User
+$UserConfigs = $HOME/.config/hypr/UserConfigs
+$UserScripts = $HOME/.config/hypr/UserScripts
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
+bind = $mainMod, Q, killactive,
+bind = $mainMod, F, fullscreen
 bind = $mainMod SHIFT, Q, closewindow, 
 bind = $mainMod SHIFT, F, togglefloating,
 bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat
-bind = $mainMod, F, fullscreen
-bind = $mainMod, Q, killactive,
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
 bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
 
 # FEATURES / EXTRAS
+bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file
 bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi
-bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh # online music
 bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji
-bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file
-bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh # Quick Edit Hyprland Settings
 bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
 bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
 bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
-bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
+bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
 bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
 
-# Wallpaper related keybinds
+# FEATURES / EXTRAS (UserScripts)
-bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply
+bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
-bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers
+bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music
+bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply
+bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
 
 # Waybar / Bar related
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar 
@@ -43,7 +49,6 @@ bind = $mainMod, K, layoutmsg, cycleprev
 bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 
 # group
 bind = $mainMod, G, togglegroup

config/hypr/hyprland.conf

@@ -11,12 +11,9 @@ $UserConfigs = $HOME/.config/hypr/UserConfigs
 
 source= $UserConfigs/Startup_Apps.conf
 source= $UserConfigs/ENVariables.conf
-source= $UserConfigs/UserKeybinds.conf
-source= $UserConfigs/UserSettings.conf
 source= $UserConfigs/Monitors.conf
 source= $UserConfigs/Laptops.conf
 source= $UserConfigs/LaptopDisplay.conf
 source= $UserConfigs/WindowRules.conf
-
+source= $UserConfigs/UserKeybinds.conf
-
+source= $UserConfigs/UserSettings.conf
-

config/hypr/scripts/AirplaneMode.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Airplane Mode. Turning on or off all wifi using rfkill. 
 
 notif="$HOME/.config/swaync/images/bell.png"
 

config/hypr/scripts/Brightness.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for Monitor backlights (if supported) using brightnessctl
 
 iDIR="$HOME/.config/swaync/icons"
 notification_timeout=1000

config/hypr/scripts/BrightnessKbd.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for keyboard backlights (if supported) using brightnessctl
 
 iDIR="$HOME/.config/swaync/icons"
 

config/hypr/scripts/ChangeBlur.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+## Script for changing blurs on the fly
 
 notif="$HOME/.config/swaync/images/bell.png"
 

config/hypr/scripts/ChangeLayout.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# for changing Hyprland Layouts (Master or Dwindle) on the fly
 
 notif="$HOME/.config/swaync/images/bell.png"
 

config/hypr/scripts/ClipManager.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-#   
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# Clipboard Manager
+# Clipboard Manager. This needed cliphist & wl-copy and of course rofi
 
 if [[ ! $(pidof rofi) ]]; then
 	cliphist list | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cliphist decode | wl-copy

config/hypr/scripts/DarkLight.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-set -x
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For Dark and Light switching
+# Note: Scripts are looking for keywords Light or Dark except for wallpapers as the are in a separate folders
+
 # Paths
 wallpaper_base_path="$HOME/Pictures/wallpapers/Dynamic-Wallpapers"
 dark_wallpapers="$wallpaper_base_path/Dark"

config/hypr/scripts/GameMode.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Game Mode. Turning off all animations
 
 notif="$HOME/.config/swaync/images/bell.png"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"

config/hypr/scripts/KeyHints.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Keyhints. Idea got from Garuda Hyprland
 
 # Detect monitor resolution and scale
 x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width')
@@ -42,8 +44,8 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " Q" "close active window" "(not kill)" \
 " Shift Q " "closes a specified window" "(window)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
-" W" "Choose wallpaper" "(swww)" \
+" W" "Choose wallpaper" "(Wallpaper Menu)" \
-"CTRL ALT W" "Random wallpaper" "(swww)" \
+"CTRL ALT W" "Random wallpaper" "(via swww)" \
 " B" "Hide/UnHide Waybar" "waybar" \
 " CTRL B" "Choose waybar styles" "(waybar styles)" \
 " ALT B" "Choose waybar layout" "(waybar layout)" \
@@ -57,11 +59,11 @@ yad --width=$dynamic_width --height=$dynamic_height \
 "CTRL ALT L" "screen lock" "(swaylock)" \
 "CTRL ALT Del" "Hyprland Exit" "(SAVE YOUR WORK!!!)" \
 " F" "Fullscreen" "Toggles to full screen" \
-" Spacebar" "Toggle Dwindle | Master Layout" "Hyprland Layout" \
+" ALT L" "Toggle Dwindle | Master Layout" "Hyprland Layout" \
 " Shift F" "Toggle float" "single window" \
 " ALT F" "Toggle all windows to float" "all windows" \
 " Shift B" "Toggle Blur" "normal or less blur" \
-" SHIFT G" "Gamemode! All animations off" "" \
+" SHIFT G" "Gamemode! All animations OFF or ON" "toggle" \
 " H" "Launch this app" "" \
 " E" "View or EDIT Keybinds, Settings, Monitor" "" \
 "" "" "" \

config/hypr/scripts/LockScreen.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For Swaylock
 
 CONFIG="$HOME/.config/swaylock/config"
 

config/hypr/scripts/MediaCtrl.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Playerctl
 
 music_icon="$HOME/.config/swaync/icons/music.png"
 

config/hypr/scripts/Polkit-NixOS.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For NixOS starting of polkit-gnome. Dec 2023, the settings stated in NixOS wiki does not work so have to manual start it
 
 # Find all polkit-gnome executables in the Nix store
 polkit_gnome_paths=$(find /nix/store -name 'polkit-gnome-authentication-agent-1' -type f 2>/dev/null)

config/hypr/scripts/Polkit.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# This is for polkits, it will start from top and will stop if the top is executed
 
 # Polkit possible paths files to check
 polkit=(

config/hypr/scripts/PortalHyprland.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For manually starting xdg-desktop-portal
+
 sleep 1
 killall xdg-desktop-portal-hyprland
 killall xdg-desktop-portal-wlr

config/hypr/scripts/PywalSwww.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Pywal Colors for current wallpaper
 
 # Define the path to the swww cache directory
 cache_dir="$HOME/.cache/swww/"

config/hypr/scripts/Refresh.sh

@@ -1,7 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Scripts for refreshing waybar, rofi, swaync, pywal colors
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
-UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts
+UserScripts=$HOME/.config/hypr/UserScripts
 
 # Define file_exists function
 file_exists() {
@@ -30,8 +32,8 @@ swaync > /dev/null 2>&1 &
 
 # Relaunching rainbow borders if the script exists
 sleep 1
-if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then
+if file_exists "${UserScripts}/RainbowBorders.sh"; then
-    ${UserSCRIPTSDIR}/RainbowBorders.sh &
+    ${UserScripts}/RainbowBorders.sh &
 fi
 
 # for cava-pywal (note, need to manually restart cava once wallpaper changes)

config/hypr/scripts/RefreshNoWaybar.sh

@@ -1,11 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # Modified version of Refresh but no waybar refresh
 # Used by automatic wallpaper change
-# Modified inorder to refresh rofi background, Pywal
+# Modified inorder to refresh rofi background, Pywal, SwayNC
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
-UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts
+UserScripts=$HOME/.config/hypr/UserScripts
 
 # Define file_exists function
 file_exists() {
@@ -29,8 +30,8 @@ ${SCRIPTSDIR}/PywalSwww.sh &
 
 # Relaunching rainbow borders if the script exists
 sleep 1
-if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then
+if file_exists "${UserScripts}/RainbowBorders.sh"; then
-    ${UserSCRIPTSDIR}/RainbowBorders.sh &
+    ${UserScripts}/RainbowBorders.sh &
 fi
 
 # for cava-pywal (note, need to manually restart cava once wallpaper changes)

config/hypr/scripts/RofiEmoji.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Rofi Emoticons. Not my own. Cant remember the source
 
 sed '1,/^### DATA ###$/d' $0 | 
 rofi -dmenu -config ~/.config/rofi/config-long.rasi| 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
-
 ### DATA ###
 😀 grinning face face smile happy joy :D grin
 😃 grinning face with big eyes face happy joy haha :D :) smile funny

config/hypr/scripts/ScreenShot.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Screenshots scripts
 
 iDIR="$HOME/.config/swaync/icons"
 notify_cmd_shot="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"

config/hypr/scripts/SwitchKeyboardLayout.sh

@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# This is for changing kb_layouts. Set kb_layouts in $settings_file
 
 layout_f="$HOME/.cache/kb_layout"
 settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf"

config/hypr/scripts/TouchPad.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For disabling touchpad.
 
-HYPRLAND_DEVICE="asue1209:00-04f3:319f-touchpad"
+Touchpad_Device="asue1209:00-04f3:319f-touchpad"
 notif="$HOME/.config/swaync/images/bell.png"
 
 XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}
@@ -16,7 +18,7 @@ toggle_touchpad() {
   fi
 
   notify-send -u low -i "$notif" "Touchpad $action"
-  hyprctl keyword "device:$HYPRLAND_DEVICE:enabled" "$(cat "$STATUS_FILE")"
+  hyprctl keyword "device:$Touchpad_Device:enabled" "$(cat "$STATUS_FILE")"
 }
 
 toggle_touchpad

config/hypr/scripts/Volume.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Scripts for volume controls for audio and mic 
 
 iDIR="$HOME/.config/swaync/icons"
 

config/hypr/scripts/Wallpaper.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-DIR="$HOME/Pictures/wallpapers"
-SCRIPTSDIR="$HOME/.config/hypr/scripts"
-
-PICS=($(find ${DIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \)))
-RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]}
-
-
-# Transition config
-FPS=60
-TYPE="random"
-DURATION=1
-BEZIER=".43,1.19,1,.4"
-SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
-
-
-swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS
-
-
-${SCRIPTSDIR}/PywalSwww.sh
-sleep 1
-${SCRIPTSDIR}/Refresh.sh 
-

config/hypr/scripts/WaybarCava.sh

@@ -0,0 +1,32 @@
+# #! /bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+
+# Not my own work. This was added through Github PR. Credit to original author
+
+#----- Optimized bars animation without much CPU usage increase --------
+bar="▁▂▃▄▅▆▇█"
+dict="s/;//g"
+
+# Calculate the length of the bar outside the loop
+bar_length=${#bar}
+
+# Create dictionary to replace char with bar
+for ((i = 0; i < bar_length; i++)); do
+    dict+=";s/$i/${bar:$i:1}/g"
+done
+
+# Create cava config
+config_file="/tmp/bar_cava_config"
+cat >"$config_file" <<EOF
+[general]
+bars = 10
+
+[output]
+method = raw
+raw_target = /dev/stdout
+data_format = ascii
+ascii_max_range = 7
+EOF
+
+# Read stdout from cava and perform substitution in a single sed command
+cava -p "$config_file" | sed -u "$dict"

config/hypr/scripts/WaybarLayout.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for waybar layout or configs
 
 set -euo pipefail
 IFS=$'\n\t'
 
 # Define directories
-config_dir="$HOME/.config/waybar/configs"
+waybar_layouts="$HOME/.config/waybar/configs"
 waybar_config="$HOME/.config/waybar/config"
-scripts_dir="$HOME/.config/hypr/scripts"
+SCRIPTSDIR="$HOME/.config/hypr/scripts"
 rofi_config="$HOME/.config/rofi/config-waybar-layout.rasi"
 
 # Function to display menu options
@@ -14,14 +16,14 @@ menu() {
     options=()
     while IFS= read -r file; do
         options+=("$(basename "$file")")
-    done < <(find "$config_dir" -maxdepth 1 -type f -exec basename {} \; | sort)
+    done < <(find "$waybar_layouts" -maxdepth 1 -type f -exec basename {} \; | sort)
 
     printf '%s\n' "${options[@]}"
 }
 
 # Apply selected configuration
 apply_config() {
-    ln -sf "$config_dir/$1" "$waybar_config"
+    ln -sf "$waybar_layouts/$1" "$waybar_config"
     restart_waybar_if_needed
 }
 
@@ -31,7 +33,7 @@ restart_waybar_if_needed() {
         pkill waybar
         sleep 0.1  # Delay for Waybar to completely terminate
     fi
-    "${scripts_dir}/Refresh.sh" &
+    "${SCRIPTSDIR}/Refresh.sh" &
 }
 
 # Main function

config/hypr/scripts/WaybarStyles.sh

@@ -1,29 +1,31 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for waybar styles
 
 set -euo pipefail
 IFS=$'\n\t'
 
 # Define directories
-config_dir="$HOME/.config/waybar/style"
+waybar_styles="$HOME/.config/waybar/style"
-waybar_config="$HOME/.config/waybar/style.css"
+waybar_style="$HOME/.config/waybar/style.css"
-scripts_dir="$HOME/.config/hypr/scripts"
+SCRIPTSDIR="$HOME/.config/hypr/scripts"
 rofi_config="$HOME/.config/rofi/config-waybar-style.rasi"
 
 # Function to display menu options
 menu() {
     options=()
     while IFS= read -r file; do
-        if [ -f "$config_dir/$file" ]; then
+        if [ -f "$waybar_styles/$file" ]; then
             options+=("$(basename "$file" .css)")
         fi
-    done < <(find "$config_dir" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort)
+    done < <(find "$waybar_styles" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort)
     
     printf '%s\n' "${options[@]}"
 }
 
 # Apply selected style
 apply_style() {
-    ln -sf "$config_dir/$1.css" "$waybar_config"
+    ln -sf "$waybar_styles/$1.css" "$waybar_style"
     restart_waybar_if_needed
 }
 
@@ -33,7 +35,7 @@ restart_waybar_if_needed() {
         pkill waybar
         sleep 0.1  # Delay for Waybar to completely terminate
     fi
-    "${scripts_dir}/Refresh.sh" &
+    "${SCRIPTSDIR}/Refresh.sh" &
 }
 
 # Main function

config/hypr/scripts/Wlogout.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+
+# wlogout (Power, Screen Lock, Suspend, etc)
 
 # Set variables for parameters
-A_2160=2500
+A_2160=680
-B_2160=2700
+B_2160=750
 A_1440=500
 B_1440=550
 A_1080=300
@@ -24,7 +27,7 @@ echo "Detected Resolution: $resolution"
 
 # Set parameters based on screen resolution and scaling factor
 if ((resolution >= 2160)); then
-    wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") &
+    wlogout --protocol layer-shell -b 3 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") &
     echo "Setting parameters for resolution >= 2160p"
 elif ((resolution >= 1440)); then
     wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_1440 * 1440 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_1440 * 1440 * $hypr_scale / $resolution}") &

config/rofi/config-wallpaper.rasi

@@ -3,7 +3,7 @@
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                       "drun,run";
+    modi:                   "drun,run,filebrowser";
     font:                   "Fira Code SemiBold 12";
     show-icons:             true;
     display-drun:           "";
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						800px;
+    width:					700px;
 	/*height:				 450px;*/
     x-offset:               0px;
     y-offset:               0px;
@@ -40,7 +40,8 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:           @background-color;
+ 	background-color:     	transparent;
+	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +49,9 @@ mainbox {
     enabled:                true;
     orientation:            horizontal;
 	padding:				8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
     children:               [ "imagebox"];
     border-radius:          12px;
-    background-color:      		@background;
+    background-color:       transparent;
 }
 
 /* ---- Imagebox ---- */
@@ -111,8 +111,8 @@ entry {
 /* ---- Listview ---- */
 listview {
 	enabled:				true;
-	columns:					 2;
+	columns:				4;
-	lines:						 8;
+	lines:					3;
 	spacing:                4px;
 	dynamic:                true;
 	cycle:                  true;
@@ -131,6 +131,7 @@ element {
     padding:                5px;
     margin:                 2px;
     cursor:                 pointer;
+	orientation: 			vertical;
     background-color:       transparent;
     border-radius:          10px;
     border:                 0px;
@@ -184,16 +185,18 @@ element alternate.active {
 element-icon {
     background-color:       transparent;
     text-color:             inherit;
-    size:                       32px;
+    size:                   130px;
     cursor:                 inherit;
 }
 
+
 element-text {
+	font:                   "Fira Code SemiBold 8";
     background-color:       transparent;
     text-color:             inherit;
     cursor:                 inherit;
     vertical-align:         0.5;
-    horizontal-align:           0.0;
+    horizontal-align:       0.5;
 }
 
 /*****----- Message -----*****/

config/rofi/resolution/1080p/config-wallpaper.rasi

@@ -3,7 +3,7 @@
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                       "drun,run";
+    modi:                   "drun,run,filebrowser";
     font:                   "Fira Code SemiBold 12";
     show-icons:             true;
     display-drun:           "";
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						800px;
+    width:					700px;
 	/*height:				 450px;*/
     x-offset:               0px;
     y-offset:               0px;
@@ -40,7 +40,8 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:           @background-color;
+ 	background-color:     	transparent;
+	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +49,9 @@ mainbox {
     enabled:                true;
     orientation:            horizontal;
 	padding:				8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
     children:               [ "imagebox"];
     border-radius:          12px;
-    background-color:      		@background;
+    background-color:       transparent;
 }
 
 /* ---- Imagebox ---- */
@@ -111,8 +111,8 @@ entry {
 /* ---- Listview ---- */
 listview {
 	enabled:				true;
-	columns:					 2;
+	columns:				4;
-	lines:						 8;
+	lines:					3;
 	spacing:                4px;
 	dynamic:                true;
 	cycle:                  true;
@@ -131,6 +131,7 @@ element {
     padding:                5px;
     margin:                 2px;
     cursor:                 pointer;
+	orientation: 			vertical;
     background-color:       transparent;
     border-radius:          10px;
     border:                 0px;
@@ -184,16 +185,18 @@ element alternate.active {
 element-icon {
     background-color:       transparent;
     text-color:             inherit;
-    size:                       32px;
+    size:                   130px;
     cursor:                 inherit;
 }
 
+
 element-text {
+	font:                   "Fira Code SemiBold 8";
     background-color:       transparent;
     text-color:             inherit;
     cursor:                 inherit;
     vertical-align:         0.5;
-    horizontal-align:           0.0;
+    horizontal-align:       0.5;
 }
 
 /*****----- Message -----*****/

config/rofi/resolution/1440p/config-wallpaper.rasi

@@ -3,7 +3,7 @@
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                       "drun,run";
+    modi:                   "drun,run,filebrowser";
     font:                   "Fira Code SemiBold 14";
     show-icons:             true;
     display-drun:           "";
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						800px;
+    width:					700px;
 	/*height:				 450px;*/
     x-offset:               0px;
     y-offset:               0px;
@@ -40,7 +40,8 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:           @background-color;
+ 	background-color:     	transparent;
+	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +49,9 @@ mainbox {
     enabled:                true;
     orientation:            horizontal;
 	padding:				8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
     children:               [ "imagebox"];
     border-radius:          12px;
-    background-color:      		@background;
+    background-color:       transparent;
 }
 
 /* ---- Imagebox ---- */
@@ -111,8 +111,8 @@ entry {
 /* ---- Listview ---- */
 listview {
 	enabled:				true;
-	columns:					 2;
+	columns:				4;
-	lines:						 8;
+	lines:					4;
 	spacing:                4px;
 	dynamic:                true;
 	cycle:                  true;
@@ -131,6 +131,7 @@ element {
     padding:                5px;
     margin:                 2px;
     cursor:                 pointer;
+	orientation: 			vertical;
     background-color:       transparent;
     border-radius:          10px;
     border:                 0px;
@@ -184,16 +185,18 @@ element alternate.active {
 element-icon {
     background-color:       transparent;
     text-color:             inherit;
-    size:                       32px;
+    size:                   130px;
     cursor:                 inherit;
 }
 
+
 element-text {
+	font:                   "Fira Code SemiBold 10";
     background-color:       transparent;
     text-color:             inherit;
     cursor:                 inherit;
     vertical-align:         0.5;
-    horizontal-align:           0.0;
+    horizontal-align:       0.5;
 }
 
 /*****----- Message -----*****/

config/waybar/configs/[BOT] Default

@@ -25,6 +25,8 @@
 	"memory",
 	"custom/separator#dot-line",
 	"custom/weather",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
 	],
 
 "modules-center": [

config/waybar/configs/[BOT] Default Laptop

@@ -25,6 +25,8 @@
 	"memory",
 	"custom/separator#dot-line",
 	"custom/weather",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
 	],
 
 "modules-center": [

config/waybar/configs/[TOP] Default

@@ -25,6 +25,8 @@
 	"memory",
 	"custom/separator#dot-line",
 	"custom/weather",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
 	],
 
 "modules-center": [

config/waybar/configs/[TOP] Default Laptop

@@ -25,6 +25,8 @@
 	"memory",
 	"custom/separator#dot-line",
 	"custom/weather",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
 	],
 
 "modules-center": [

config/waybar/modules

@@ -216,29 +216,6 @@
     "on-click": "blueman-manager",
 },
      
-"cava": {
-    //"cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-    "framerate": 30,
-    "autosens": 1,
-    "sensitivity": 100,
-    "bars": 14,
-    "lower_cutoff_freq": 50,
-    "higher_cutoff_freq": 10000,
-    "method": "pulse",
-    "source": "auto",
-    "stereo": true,
-    "reverse": false,
-    "bar_delimiter": 0,
-    "monstercat": false,
-    "waves": false,
-    "noise_reduction": 0.77,
-    "input_delay": 2,
-    "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
-    "actions": {
-        "on-click-right": "mode"
-               }
-},
-   
 "clock": {
     "interval": 1,
     //"format": " {:%I:%M %p}", // AM PM format
@@ -531,6 +508,12 @@
     "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh",
 },
 
+// This is a custom cava visualizer
+"custom/cava_mviz": {
+    "exec": "~/.config/hypr/scripts/WaybarCava.sh",
+    "format": "{}"
+},
+  
 "custom/playerctl": {
     "format": "<span>{}</span>",
     "return-type": "json",
@@ -545,6 +528,15 @@
     "smooth-scrolling-threshold": 1,
 },
 
+"custom/power": {
+    "format": "⏻ ",
+    "exec": "echo ; echo 󰟡 power // blur",
+	"on-click": "~/.config/hypr/scripts/Wlogout.sh",
+    "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+    "interval" : 86400, // once every day
+    "tooltip": true,
+},
+
 "custom/swaync": {
     "tooltip":true,     
     "format": "{icon} {}",
@@ -566,15 +558,6 @@
     "escape": true,
 },
     
-"custom/power": {
-    "format": "⏻ ",
-    "exec": "echo ; echo 󰟡 power // blur",
-	"on-click": "~/.config/hypr/scripts/Wlogout.sh",
-    "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true,
-},
-  
 // NOTE:! This is only for Arch and Arch Based Distros  
 "custom/updater":{
     "format": " {}",
@@ -628,6 +611,12 @@
     "tooltip": false
 },
 
+"custom/separator#blank_3": {
+	"format": "   ",
+    "interval": "once",
+    "tooltip": false
+},
+  
 // Modules below are for vertical layout
   
 "backlight#vertical": {

config/waybar/style/Catppuccin-Latte.css

@@ -48,7 +48,6 @@ window#waybar.hidden {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -217,6 +216,9 @@ window#waybar.hidden {
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
+#custom-cava_mviz {
+	color: @pink;
+}
 
 #custom-menu {
   	color: @rosewater;

config/waybar/style/Catppuccin-Mocha.css

@@ -54,7 +54,6 @@ window#waybar.hidden {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -221,6 +220,10 @@ window#waybar.hidden {
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#custom-cava_mviz {
+	color: @pink;
+}
+
 #custom-menu {
   color: @rosewater;
 }

config/waybar/style/Crimson.css

@@ -110,7 +110,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/Purpl.css

@@ -120,7 +120,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -139,6 +138,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/Rose Pine.css

@@ -101,7 +101,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -129,6 +128,7 @@ tooltip {
 #custom-swaync,
 #custom-updater,
 #custom-swaync,
+#custom-cava_mviz,
 #custom-weather,
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,

config/waybar/style/Simple Pink.css

@@ -124,7 +124,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -144,6 +143,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Black & White] Monochrome.css

@@ -109,7 +109,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css

@@ -51,7 +51,6 @@ window#waybar.empty #window {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -150,6 +149,9 @@ window#waybar.empty #window {
     color: @teal;
 }
 
+#custom-cava_mviz{
+	color: @color2;
+}
 #workspaces {
     margin: 1px 1px 1px 1px;
     padding: 0px 1px;

config/waybar/style/[Colored] Chroma Glow.css

@@ -97,7 +97,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Colored] Translucent.css

@@ -111,7 +111,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Colorful] Aurora Blossom.css

@@ -97,7 +97,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Colorful] Aurora.css

@@ -88,7 +88,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -107,6 +106,7 @@ tooltip label{
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Colorful] Rainbow Spectrum.css

@@ -52,7 +52,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -138,6 +137,10 @@ tooltip label{
 	background-color: #a6e3a1;
 }
 
+#mpris {
+	background-color: #fab387;
+	color: black;
+}
 #custom-keyboard,
 #keyboard-state,
 #keyboard-state label,

config/waybar/style/[Dark] Golden Noir.css

@@ -123,7 +123,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -142,6 +141,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Dark] Obsidian Edge.css

@@ -116,7 +116,6 @@ tooltip label {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -135,6 +134,7 @@ tooltip label {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Light] Monochrome Contrast.css

@@ -110,7 +110,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Light] Obsidian Glow.css

@@ -85,7 +85,6 @@ tooltip label {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -104,6 +103,7 @@ tooltip label {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Pywal] Chroma Edge.css

@@ -90,7 +90,6 @@ tooltip label{
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Pywal] Chroma Fusion.css

@@ -50,7 +50,6 @@ window#waybar.empty #window {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -143,6 +142,10 @@ window#waybar.empty #window {
     color: @lavender;
 }
 
+#custom-cava_mviz {
+	color: @color2;
+}
+
 #custom-lock,
 #idle_inhibitor {
     color: @teal;

config/waybar/style/[Pywal] Chroma Tally.css

@@ -55,7 +55,6 @@ window#waybar {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -206,6 +205,10 @@ window#waybar {
 	color:#d08770;
 }
 
+#custom-cava_mviz{
+	color: @color2;
+} 
+  
 #custom-weather{
 	color:#d08770;
 }

config/waybar/style/[Pywal] Colored.css

@@ -117,7 +117,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -136,6 +135,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,
@@ -237,3 +237,7 @@ tooltip {
 	min-width: 10px;
 	border-radius: 5px;
 }
+
+#custom-cava_mviz {
+	padding-right: 10px;
+}

config/waybar/style/[Pywal] Simple.css

@@ -104,7 +104,6 @@ tooltip {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,
@@ -124,6 +123,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-backlight,
+#custom-cava_mviz,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,

config/waybar/style/[Retro] Simple Style.css

@@ -47,7 +47,6 @@ window#waybar {
 #backlight-slider,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/waybar/style/[Transparent] Crystal Clear.css

@@ -97,7 +97,6 @@ tooltip {
 #backlight,
 #battery,
 #bluetooth,
-#cava,
 #clock,
 #cpu,
 #disk,

config/wlogout/layout

@@ -30,7 +30,7 @@
 }
 {
     "label" : "hibernate",
-    "action" : "systemctl hibernate",
+    "action" : "swaylock -f && systemctl hibernate",
     "text" : "Hibernate",
     "keybind" : "h"
 }

copy.sh

@@ -50,25 +50,17 @@ if hostnamectl | grep -q 'Chassis: vm'; then
   sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf
 fi
 
-# Preparing hyprland.conf to check for current keyboard layout
+# Function to detect keyboard layout using localectl or setxkbmap
-# Function to detect keyboard layout in an X server environment
+detect_layout() {
-detect_x_layout() {
+  if command -v localectl >/dev/null 2>&1; then
-  if command -v setxkbmap >/dev/null 2>&1; then
+    layout=$(localectl status --no-pager | awk '/X11 Layout/ {print $3}')
-    layout=$(setxkbmap -query | grep layout | awk '{print $2}')
     if [ -n "$layout" ]; then
       echo "$layout"
     else
       echo "unknown"
     fi
-  else
+  elif command -v setxkbmap >/dev/null 2>&1; then
-    echo "unknown"
+    layout=$(setxkbmap -query | grep layout | awk '{print $2}')
-  fi
-}
-
-# Function to detect keyboard layout in a tty environment
-detect_tty_layout() {
-  if command -v localectl >/dev/null 2>&1; then
-    layout=$(localectl status --no-pager | awk '/X11 Layout/ {print $3}')
     if [ -n "$layout" ]; then
       echo "$layout"
     else
@@ -79,22 +71,14 @@ detect_tty_layout() {
   fi
 }
 
-# Detect the current keyboard layout based on the environment
+# Detect the current keyboard layout
-if [ -n "$DISPLAY" ]; then
+layout=$(detect_layout)
-  # System is in an X server environment
-  layout=$(detect_x_layout)
-else
-  # System is in a tty environment
-  layout=$(detect_tty_layout)
-fi
-
-echo "Keyboard layout: $layout"
 
 printf "${NOTE} Detecting keyboard layout to prepare necessary changes in hyprland.conf before copying\n\n"
 
 # Prompt the user to confirm whether the detected layout is correct
 while true; do
-    read -p "$ORANGE Detected keyboard layout or keymap: $layout. Is this correct? [y/n] " confirm
+    read -p "$ORANGE Detected current keyboard layout is: $layout. Is this correct? [y/n] " confirm
 
     case $confirm in
         [yY])
@@ -202,6 +186,18 @@ chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG"
 chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG"
 # Set executable for initial-boot.sh
 chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG"
+printf "\n%.0s" {1..3}
+
+# Detect machine type and set Waybar configurations accordingly, logging the output
+if hostnamectl | grep -q 'Chassis: desktop'; then
+    # Configurations for a desktop
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG"
+else
+    # Configurations for a laptop or any system other than desktop
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
+fi
 
 printf "\n%.0s" {1..3}
 
@@ -238,20 +234,6 @@ while true; do
     esac
 done
 
-
-printf "\n%.0s" {1..3}
-
-# Detect machine type and set Waybar configurations accordingly, logging the output
-if hostnamectl | grep -q 'Chassis: desktop'; then
-    # Configurations for a desktop
-    ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
-    rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG"
-else
-    # Configurations for a laptop or any system other than desktop
-    ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
-    rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
-fi
-
 # symlinks for waybar style
 ln -sf "$Waybar_Style" "$HOME/.config/waybar/style.css" && \
 
@@ -261,6 +243,7 @@ wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG"
 #initial symlink for Pywal Dark and Light for Rofi Themes
 ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
 
+
 printf "\n%.0s" {1..2}
 printf "\n${OK} Copy Completed!\n\n\n"
 printf "${ORANGE} ATTENTION!!!! \n"