Merge pull request #453 from JaKooLit/development

Development to Main

19 files changed, 73 insertions, 20 deletions

diff --git a/config/hypr/UserConfigs/00-Readme b/config/hypr/UserConfigs/00-Readme
index 481eeace..fa4b9b85 100644
--- a/config/hypr/UserConfigs/00-Readme
+++ b/config/hypr/UserConfigs/00-Readme
@@ -4,7 +4,7 @@ Hyprland-Dots v2.2.2
 
 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.
+2.) This folder, along with UserScripts folder will NOT be touch when running upgrade.sh
 
 3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change.
 
diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf
index 8e98244a..350022b1 100644
--- a/config/hypr/UserConfigs/WorkspaceRules.conf
+++ b/config/hypr/UserConfigs/WorkspaceRules.conf
@@ -5,9 +5,15 @@
 
 # https://wiki.hyprland.org/Configuring/Workspace-Rules/
 
-# Assigning workspace to a certain monitor
+# Assigning workspace to a certain monitor. Below are just examples
 # workspace = 1, monitor:eDP-1
-# workspace = 2, monitor:DP-2
+# workspace = 2, monitor:eDP-1
+# workspace = 3, monitor:eDP-1
+# workspace = 4, monitor:eDP-1
+# workspace = 5, monitor:DP-2
+# workspace = 6, monitor:DP-2
+# workspace = 7, monitor:DP-2
+# workspace = 8, monitor:DP-2
 
 
 # example rules (from wiki)
diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme
index de251df0..1b6688f4 100755
--- a/config/hypr/UserScripts/00-Readme
+++ b/config/hypr/UserScripts/00-Readme
@@ -1 +1,3 @@
-a) Place your new scripts here. If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
\ No newline at end of file
+# Place your new scripts here. 
+# If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. 
+# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
\ No newline at end of file
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index c8168ca3..ed5a4e1c 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi menu for Quick Edit/View of Settings (SUPER E)
 
 # Define preferred text editor and terminal
diff --git a/config/hypr/UserScripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh
index 49295680..cc1419fb 100755
--- a/config/hypr/UserScripts/RainbowBorders.sh
+++ b/config/hypr/UserScripts/RainbowBorders.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# for rainbow borders animation
 
 function random_hex() {
     random_hex=("0xff$(openssl rand -hex 3)")
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index c0a40fd7..e3a6c538 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# weather using python
 
 import subprocess
 from pyquery import PyQuery  # install using `pip install pyquery`
diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh
index f916b028..65613fca 100755
--- a/config/hypr/UserScripts/Weather.sh
+++ b/config/hypr/UserScripts/Weather.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# weather info from wttr. https://github.com/chubin/wttr.in
+# Remember to add city 
 
 city=
 cachedir=~/.cache/rbn
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index f06f2b60..57fbf37d 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -3,7 +3,6 @@
 # Script for Oh my ZSH theme ( CTRL SHIFT O)
 
 # preview of theme can be view here: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-
 # after choosing theme, TTY need to be closed and re-open
 
 themes_dir="$HOME/.oh-my-zsh/themes"
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 9bd89647..9c077336 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -37,7 +37,7 @@ bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to
 bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagickWW
 bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
 bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle #disable opacity to active window
-
+bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # searchable keybinds
 # Waybar / Bar related
 bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
 bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 15a0b26d..57ab705d 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,3 +1,4 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # Sourcing external config files
 
 # Default Configs
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 3527f0a2..28b94f2a 100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -65,7 +65,7 @@ label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%H")"
 #    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
-    color = rgba(255, 185, 0, .6)
+    color = rgba(255, 185, 0, .8)
     font_size = 150
     font_family = JetBrains Mono Nerd Font Mono ExtraBold 
     position = 0, -200
@@ -77,7 +77,7 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%M")"
-    color = rgba(255, 255, 255, .6)
+    color = rgba(15, 10, 222, .8)
     font_size = 150
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
     position = 0, -450
@@ -90,7 +90,7 @@ label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-    color = $color12
+    color = $color7
     font_size = 20
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
     position = 0, -450
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index e5b18cc0..39dc95f1 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -65,7 +65,7 @@ label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%H")"
 #    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
-    color = rgba(255, 185, 0, .6)
+    color = rgba(255, 185, 0, .8)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold 
     position = 0, -200
@@ -77,7 +77,7 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%M")"
-    color = rgba(255, 255, 255, .6)
+    color = rgba(15, 10, 222, .8)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
     position = 0, -500
@@ -90,7 +90,7 @@ label {
     monitor =
     text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-    color = $color12
+    color = $color7
     font_size = 40
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
     position = 0, -500
@@ -102,7 +102,7 @@ label {
 label {
     monitor =
     text =    $USER
-    color = $color12
+    color = $color10
     font_size = 18
     font_family = Inter Display Medium
 
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index e077d151..fb9cf574 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # A bash script designed to run only once dotfiles installed
 
 # THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Settings.conf
-# not necessary to do since this script is only designed to run only once as long as the marker exists
+# NOT necessary to do since this script is only designed to run only once as long as the marker exists
+# marker file is located at ~/.config/hypr/.initial_startup_done
 # However, I do highly suggest not to touch it since again, as long as the marker exist, script wont run
 
 # Variables
diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh
new file mode 100755
index 00000000..ccbb18a8
--- /dev/null
+++ b/config/hypr/scripts/KeyBinds.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Searchable enabled keybinds using rofi
+
+# Kill yad to not interfere with this binds
+pkill yad || true
+
+
+# Define the config files
+KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf"
+USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf"
+LAPTOP_CONF="$HOME/.config/hypr/UserConfigs/Laptop.conf"
+
+# Combine the contents of the keybinds files and filter for keybinds
+KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|binde|bindm)')
+
+# Check if Laptop.conf exists and add its keybinds if present
+if [[ -f "$LAPTOP_CONF" ]]; then
+    LAPTOP_BINDS=$(grep -E '^(bind|bindl|binde|bindm)' "$LAPTOP_CONF")
+    KEYBINDS+=$'\n'"$LAPTOP_BINDS"
+fi
+
+# Check if we have any keybinds to display
+if [[ -z "$KEYBINDS" ]]; then
+    echo "No keybinds found."
+    exit 1
+fi
+
+# Use rofi to display the keybinds
+echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 0f8a989a..e2e12634 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -5,6 +5,11 @@
 # GDK BACKEND. Change to either wayland or x11 if having issues
 BACKEND=wayland
 
+# Check if rofi is running and kill it if it is
+if pgrep -x "rofi" > /dev/null; then
+    pkill rofi
+fi
+
 # Detect monitor resolution and scale
 x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width')
 y_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .height')
@@ -43,6 +48,7 @@ GDK_BACKEND=$BACKEND yad --width=$dynamic_width --height=$dynamic_height \
 "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \
 " enter" "Terminal" "(kitty)" \
 " SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \
+" SHIFT K" "Searchable Keybinds" "(Keybinds)" \
 " A" "Desktop Overview" "(AGS Overview)" \
 " D" "App Launcher" "(rofi-wayland)" \
 " T" "Open File Manager" "(Thunar)" \
diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh
index d40f02ed..9bdf4b8c 100755
--- a/config/hypr/scripts/PortalHyprland.sh
+++ b/config/hypr/scripts/PortalHyprland.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# For manually starting xdg-desktop-portal
+# For manually starting xdg-desktop-portal-hyprland
 
 sleep 1
 killall xdg-desktop-portal-hyprland
diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh
index 70a4aeb3..8e20766b 100755
--- a/config/hypr/scripts/RefreshNoWaybar.sh
+++ b/config/hypr/scripts/RefreshNoWaybar.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
-# Modified version of Refresh but no waybar refresh
+# Modified version of Refresh.sh but no waybar refreshing
 # Used by automatic wallpaper change
-# Modified inorder to refresh rofi background, Wallust, SwayNC
+# Modified inorder to refresh rofi background, Wallust, SwayNC only
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
 UserScripts=$HOME/.config/hypr/UserScripts
diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh
index 3c4b0f53..99261387 100755
--- a/config/hypr/scripts/WaybarCava.sh
+++ b/config/hypr/scripts/WaybarCava.sh
@@ -1,6 +1,5 @@
 #!/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 --------
diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
index 531c7c66..b7cc220d 100755
--- a/config/hypr/scripts/Wlogout.sh
+++ b/config/hypr/scripts/Wlogout.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-
 # wlogout (Power, Screen Lock, Suspend, etc)
 
-# Set variables for parameters
+# Set variables for parameters. First numbers corresponts to Monitor Resolution
+# i.e 2160 means 2160p
 A_2160=700
 B_2160=700
 A_1600=480