Merge branch 'development' into main

8 files changed, 439 insertions, 25 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index e5fa2bae..aa873f82 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -37,8 +37,6 @@ exec-once = $UserScripts/RainbowBorders.sh
 # Starting hypridle to start hyprlock
 exec-once = hypridle
 
-# Start pyprland daemon
-exec-once = pypr &
 
 # Here are list of features available but disabled by default
 # exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 447bcaef..3358e07a 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -37,6 +37,15 @@ bind = $mainMod SHIFT, F, fullscreen # whole full screen
 bind = $mainMod CTRL, F, fullscreen, 1 # fake full screen
 bind = $mainMod, SPACE, togglefloating, #Float Mode
 bind = $mainMod ALT, SPACE, exec, hyprctl dispatch workspaceopt allfloat #All Float Mode
+bind = $mainMod SHIFT, Return, exec, [float; move 15% 5%; size 70% 60%] $term # Dropdown terminal
+
+# Desktop zooming or magnifier
+bind = $mainMod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
+bind = $mainMod ALT, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')" 
+
+## NOTES for ja (Hyprland version 0.39 (Ubuntu 24.04))
+#bind = $mainMod ALT, mouse_down, exec, hyprctl keyword misc:cursor_zoom_factor "$(hyprctl getoption misc:cursor_zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
+#bind = $mainMod ALT, mouse_up, exec, hyprctl keyword misc:cursor_zoom_factor "$(hyprctl getoption misc:cursor_zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')" 
 
 # Waybar / Bar related
 bind = $mainMod CTRL ALT, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
@@ -55,10 +64,6 @@ bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zs
 bindln = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout
 bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
-# pyprland (This is not available in Debian and Ubuntu)
-bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal not avail Debian and Ubuntu
-bind = $mainMod, Z, exec, pypr zoom # Toggle Desktop Zoom
-
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 7f92ce7d..e4068247 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -2,8 +2,8 @@
 # /* ---- 💫 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
+# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! 
+# NOT necessary to delete though 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
 
diff --git a/config/hypr/pyprland.toml b/config/hypr/pyprland.toml
deleted file mode 100644
index 731a8093..00000000
--- a/config/hypr/pyprland.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ #
-
-[pyprland]
-
-plugins = [
-  "scratchpads",
-  "magnify",
-]
-
-[scratchpads.term]
-animation = "fromTop"
-command = "kitty --class kitty-dropterm"
-class = "kitty-dropterm"
-size = "75% 60%"
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 2bab4b38..7917ae3a 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -28,7 +28,7 @@ GDK_BACKEND=$BACKEND yad \
 " SHIFT E" "KooL Hyprland Settings Menu" "" \
 "" "" "" \
 " enter" "Terminal" "(kitty)" \
-" SHIFT enter" "DropDown Terminal" "(Not available in Debian and Ubuntu)" \
+" SHIFT enter" "DropDown Terminal" " Q to close" \
 " B" "Launch Browser" "(Default browser)" \
 " A" "Desktop Overview" "(AGS - if opted to install)" \
 " D" "Application Launcher" "(rofi-wayland)" \
@@ -36,7 +36,7 @@ GDK_BACKEND=$BACKEND yad \
 " S" "Google Search using rofi" "(rofi)" \
 " Q" "close active window" "(not kill)" \
 " Shift Q " "kills an active window" "(kill)" \
-" Z" "Desktop Zoom" "(Not available in Debian and Ubuntu)" \
+" ALT mouse scroll up/down   " "Desktop Zoom" "Desktop Magnifier" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(Wallpaper Menu)" \
 " Shift W" "Choose wallpaper effects" "(imagemagick + swww)" \
diff --git a/config/hypr/scripts/Kool_Quick_Settings.sh b/config/hypr/scripts/Kool_Quick_Settings.sh
index b26f5beb..95b305d9 100755
--- a/config/hypr/scripts/Kool_Quick_Settings.sh
+++ b/config/hypr/scripts/Kool_Quick_Settings.sh
@@ -38,6 +38,7 @@ Choose Monitor Profiles
 Choose Rofi Themes
 Search for Keybinds
 Toggle Game Mode
+Switch Dark-Light Theme
 EOF
 }
 
@@ -73,6 +74,7 @@ main() {
         "Choose Rofi Themes") $scriptsDir/RofiThemeSelector.sh ;;
         "Search for Keybinds") $scriptsDir/KeyBinds.sh ;;
         "Toggle Game Mode") $scriptsDir/GameMode.sh ;;
+        "Switch Dark-Light Theme") $scriptsDir/DarkLight.sh ;;
         *) return ;;  # Do nothing for invalid choices
     esac
 
@@ -87,4 +89,4 @@ if pidof rofi > /dev/null; then
   pkill rofi
 fi
 
-main
+main
\ No newline at end of file
diff --git a/config/hypr/v2.3.13 b/config/hypr/v2.3.14-dev
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.13
+++ b/config/hypr/v2.3.14-dev
diff --git a/config/waybar/style/[Extra] Neon Circuit.css b/config/waybar/style/[Extra] Neon Circuit.css
new file mode 100644
index 00000000..0c89c952
--- /dev/null
+++ b/config/waybar/style/[Extra] Neon Circuit.css
@@ -0,0 +1,423 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* --- Extra - Neon Circuit - waybar style ---*/
+
+@define-color bar-bg rgba(0, 0, 0, 0);
+@define-color main-bg #313244;
+@define-color main-fg #b4befe;
+@define-color wb-act-bg #b4befe;
+@define-color wb-act-fg #1e1e2e;
+@define-color wb-hvr-bg #f5c2e7;
+@define-color wb-hvr-fg #313244;
+
+* {
+    border: none;
+    border-radius: 0px;
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+	min-height: 0;  
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+    font-size: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+}
+
+window#waybar {
+    background: @bar-bg;
+}
+
+tooltip {
+    background: @main-bg;
+    color: @main-fg;
+    border-radius: 12px;
+    border-width: 0px;
+}
+
+#taskbar button,
+#workspaces button {
+    box-shadow: none;
+	text-shadow: none;
+    padding: 2px;
+    border: 2px;
+    border-color: #b4befe;
+    border-width: 5px;
+    border-radius: 10px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    margin-left: 0px;
+    padding-left: 6px;
+    padding-right: 0px;
+    margin-right: 0px;
+    color: @wb-act-fg;
+    background-color: #b4befe;
+    animation: ws_normal 2s ease-in-out 1;
+}
+
+#taskbar button.active,
+#workspaces button.active {
+    background-image: linear-gradient(45deg, #89b4fa 50%, #cba6f7 50%);
+    color: @wb-act-fg;
+    border-radius: 12px;
+    margin-left: 4px;
+    padding-left: 12px;
+    padding-right: 12px;
+    margin-right: 4px;
+    animation: ws_active 2s ease-in-out 1;
+    transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+    background: @wb-hvr-bg;
+    color: @wb-hvr-fg;
+    animation: ws_hover 20s ease-in-out 1;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#tray menu * {
+    min-height: 18px
+}
+
+#tray menu separator {
+    min-height: 16px
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-browser,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-dot_update,
+#custom-file_manager,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-hint,
+#custom-hypridle,
+#custom-menu,
+#custom-playerctl,
+#custom-power_vertical,
+#custom-power,
+#custom-quit,
+#custom-reboot,
+#custom-settings,
+#custom-spotify,
+#custom-swaync,
+#custom-tty,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+    color: @main-fg;
+    background: @main-bg;
+    opacity: 1;
+    margin: 3px 0px 3px 0px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+#workspaces {
+    border-radius: 20px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: #b4befe;
+    padding-right: 8px;
+    padding-left: 8px;
+    margin-right: 5px;
+}
+
+#taskbar {
+    padding: 0px;
+    color: #b4befe;
+}
+
+#window {
+    color: #F2CCCC;
+    border-radius: 20px;
+    border-style: solid;
+    border-width: 2px;
+    border-color: #F2CCCC;
+    margin-right: 5px;
+}
+
+#clock {
+    color: #F38BA8;
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-width: 2px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-left-width: 0px;
+    border-width: 2px;
+    border-color: #F38BA8;
+    margin-right: 5px;
+}
+
+#idle_inhibitor {
+    color: #94e2d5;
+    border-radius: 12px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #F38BA8;
+    margin-right: 0px;
+}
+
+#idle_inhibitor.activated {
+	color: #39FF14;
+}
+
+#temperature {
+    color: #cdd6f4;
+    border-radius: 20px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-style: solid;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #cdd6f4;
+    margin-left: 5px;
+}
+
+#temperature.critical {
+    background-color: #ff0000;
+}
+
+@keyframes blink {
+    to {
+        color: #000000;
+    }
+}
+
+#cpu,
+#disk,
+#memory {
+    color: #cdd6f4;
+    border-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #cdd6f4;
+    margin-right: 0px;
+}
+
+#custom-menu {
+    color: #ff5a5a;
+    border-radius: 6px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #cdd6f4;
+    padding-right: 5px;
+    padding-left: 5px;
+}
+
+#network {
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-left-width: 0px;
+    border-width: 2px;
+    border-color: #cdd6f4;
+    margin-right: 5px;
+}
+
+#backlight {
+    color: #F5E0DC;
+    border-radius: 12px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-style: solid;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #F5E0DC;
+    margin-left: 5px;
+}
+
+#pulseaudio {
+    color: #F5E0DC;
+    border-radius: 20px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-width: 2px;
+    border-color: #F5E0DC;
+    margin-right: 0px;
+}
+
+#pulseaudio.muted {
+    color: red;
+}
+
+#keyboard-state {    
+    color: #F5E0DC;
+    border-radius: 20px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-left-width: 0px;
+    border-width: 2px;
+    border-color: #F5E0DC;
+    margin-right: 5px;
+}
+
+#custom-updater {
+    color: #F5E0DC;
+    border-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #F5E0DC;
+    margin-right: 0px;
+}
+
+#custom-hint {
+    color: #F5E0DC;
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-left-width: 0px;
+    border-width: 2px;
+    border-color: #F5E0DC;
+    margin-right: 5px;
+}
+
+#tray {
+    color: #b4befe;
+    font-size: 16;
+    border-radius: 12px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-width: 2px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #b4befe;
+    margin-left: 5px;
+    padding-left: 8px;
+}
+
+#tray > .active,
+#tray > .passive,
+#tray menu {
+    color: #b4befe;
+}
+
+#custom-swaync {
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-width: 2px;
+    border-color: #b4befe;
+    margin-right: 0px;
+}
+
+#battery {
+    border-radius: 20px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-left-width: 0px;
+    border-width: 2px;
+    border-color: #b4befe;
+    margin-right: 5px;
+    padding-right: 8px;
+}
+
+#custom-power {
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-style: solid;
+    border-left-style: none;
+    border-width: 2px;
+    border-color: #F38BA8;
+    padding-left: 0px;
+    padding-right: 5px;
+    margin-right: 5px;
+}
+
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+    border-radius: 12px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-width: 2px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-color: #E06C75;
+    color: #E06C75;
+    margin-right: 5px;
+}
+
+#window {
+    background-image: linear-gradient(45deg, #89b4fa 50%, #cba6f7 50%);
+    color: black;
+    border-radius: 20px;
+    border-width: 2px;
+    border-style: solid;
+    border-left-style: none;
+    border-right-style: none;
+    border-color: #f5e0dc;
+    margin-right: 5px;
+}