Merge pull request #100 from JaKooLit/Development

Development

13 files changed, 55 insertions, 57 deletions

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index e9dbbe52..2d04c975 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -12,7 +12,7 @@ $scriptsDir = $HOME/.config/hypr/scripts
 bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
 bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
 
-bind = $mainMod, Return, exec, $term
+bind = $mainMod, Return, exec, $term  # Launch terminal
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, Q, closewindow, 
 bind = $mainMod SHIFT, F, togglefloating,
@@ -23,29 +23,29 @@ bind = $mainMod, T, exec, $files
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
 bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
 
-# FEATURES
+# FEATURES / EXTRAS
 bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, dunst, 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
-bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
+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
+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, V, exec, $scriptsDir/ClipManager.sh
+bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
 
 # MISC (Miscellaneous Keybinds)
 bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
 
 # Wallpaper related keybinds
-bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh
-bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh
+bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply
+bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers
 
 # Waybar / Bar related
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar 
-bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh
-bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh
+bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
+bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
 
 # Master Layout
 bind = $mainMod CTRL, D, layoutmsg, removemaster
@@ -139,7 +139,7 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [ or ]
 bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
 
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
+# Move active window to a workspace silently
 bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
 bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
 bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
@@ -163,12 +163,11 @@ bind = $mainMod, comma, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-# Screenshot keybindings NOTE:
-#bind = , Print, exec, $scriptsDir/ScreenShot.sh --now
+# Screenshot keybindings NOTE: You may need to press Fn key as well
 bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
 bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area
 bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs
-bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 5 secs
+bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs
 
 
 # screenshot with swappy (another screenshot tool)
diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf
index e071f2c0..17047320 100644
--- a/config/hypr/configs/Laptops.conf
+++ b/config/hypr/configs/Laptops.conf
@@ -16,10 +16,10 @@ bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc
 bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad
 
 # Screenshot keybindings for Asus G15 (no PrinSrc button)
-bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now
-bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area
-bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5
-bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10
+bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # Fullscreen
+bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area 
+bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in 5 secs
+bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs
 
 # Below are useful when you are connecting your laptop in external display
 # Suggest you edit below for your laptop display
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 55b3dec1..7b0c0606 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -2,8 +2,8 @@
 
 ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
+# Sourcing colors generated by pywal
 source = $HOME/.cache/wal/colors-hyprland
-
 # blurls = waybar
 # blurls = rofi
 
diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/scripts/Wallpaper.sh
index 38444b39..d75d2eab 100755
--- a/config/hypr/scripts/Wallpaper.sh
+++ b/config/hypr/scripts/Wallpaper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DIR="$HOME/Pictures/wallpapers/"
+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" \)))
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index c98b3514..9564fe68 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -25,7 +25,7 @@
   
 "modules-center": [
 	"idle_inhibitor", 
-	"clock",
+	"hyprland/workspaces#4", 
 	"custom/light_dark",
 	], 
 
@@ -51,6 +51,7 @@
 "spacing": 5,
 "fixed-center": true,
 "ipc": true,
+"height": 0,
 "margin-left": 8,
 "margin-right": 8,
 //"margin-bottom": 0,
@@ -61,7 +62,7 @@
 	 ],
 
 "modules-center": [
-	"hyprland/workspaces#4", 
+	"clock", 
 	],
 
 "modules-right": [
diff --git a/config/waybar/modules b/config/waybar/modules
index 7906a279..a462e75d 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -451,7 +451,7 @@
 },
       
 "tray": {
-    "icon-size": 14,
+    "icon-size": 15,
     "spacing": 8,
 },
       
@@ -490,7 +490,7 @@
       
 "custom/keybinds": {
     "format":"󰺁 HINT!",
-    "exec": "echo ; echo  Key Hints",
+    "exec": "echo ; echo  Key Hints SUPER H",
     "on-click": "~/.config/hypr/scripts/KeyHints.sh",
     "interval" : 86400, // once every day
     "tooltip": true,
@@ -546,7 +546,7 @@
 },
       
 "custom/power": {
-    "format": "⏻{}",
+    "format": "⏻ ",
     "exec": "echo ; echo 󰟡 power // blur",
 	"on-click": "~/.config/hypr/scripts/Wlogout.sh",
     "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index c1a251b4..eff29a7c 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -74,9 +74,8 @@ window#waybar.hidden {
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
-#custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-power_vertical,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index a9eeaa59..6574848f 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -154,9 +154,6 @@ tooltip label{
 	padding-right: 6px;
 	padding-left: 6px;
 }
-#custom-power {
-	padding: 1px 3px;
-}
 /*-----Indicators----*/
 #idle_inhibitor.activated {
 	color: #2dcc36;
diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index 4c10435e..ad1981ec 100644
--- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
@@ -63,12 +63,10 @@ window#waybar.empty #window {
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
-#taskbar,
 #temperature,
 #tray,
 #window,
 #wireplumber,
-#workspaces,
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
@@ -78,7 +76,6 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -101,10 +98,13 @@ window#waybar.empty #window {
 }
 #custom-power {
     color: @red;
-    padding: 0px 0px 0px 6px;
+    padding: 0px 0px 0px 7px;
     opacity:1.0;
 }
-
+#backlight {
+	padding: 0px 2px 0px 6px;
+}
+#custom-light_dark,
 #custom-menu{
     color: @flamingo;
     padding: 0px 8px 0px 4px;
@@ -149,7 +149,7 @@ window#waybar.empty #window {
 }
 
 #workspaces {
-    margin: 3px 3px 3px 3px;
+    margin: 1px 1px 1px 1px;
     padding: 0px 1px;
     border-radius: 25px;
     border:2px solid @border-color;
@@ -165,8 +165,8 @@ window#waybar.empty #window {
     border-radius: 15px;
     border:0px;
     color: @color13;
-    padding-left: 4px;
-    padding-right: 4px;
+    padding-left: 2px;
+    padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
     opacity:0.8;
@@ -178,8 +178,8 @@ window#waybar.empty #window {
     background: @button-color;
     border-radius: 15px;
     border: 1px solid @border-color;
-    padding-left: 8px;
-    padding-right: 8px;
+    padding-left: 4px;
+    padding-right: 4px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
     opacity:1.0;
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index 407e226c..6515e149 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -93,7 +93,7 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	border-radius: 10px;
+	border-radius: 16px;
   	color: #3A3B3C;
   	border: 1px solid #b4befe;
 	padding-top: 3px;
@@ -189,8 +189,8 @@ tooltip label{
 #workspaces button:hover {
     background: #eb6f92;
     color: #f6c177;
-    padding-left: 2px;
-    padding-right: 2px;
+    padding-left: 3px;
+    padding-right: 3px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
@@ -204,8 +204,8 @@ tooltip label{
 #taskbar button.active {
   	background-color: #b4befe;
   	color: #3A3B3C;
-    padding-left: 12px;
-    padding-right: 12px;
+    padding-left: 8px;
+    padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
@@ -221,13 +221,14 @@ tooltip label{
 	background-color: #f5c2e7;
 	/*padding: 1px;*/
 	padding-right: 10px;
-	border-radius: 8px;
+	border-radius: 16px;
   	color: #3A3B3C;
   	border: 1px solid #b4befe;
 }
 
 #custom-power {
 	background-color: #f38ba8;
+	padding: 0px 0px 0px 6px;
 }
 
 #custom-updater {
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css
index acdfce20..0bc333a7 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css
+++ b/config/waybar/style/[Pywal] Chroma Edge.css
@@ -134,7 +134,7 @@ tooltip label{
 	/* color: #bf616a; */
 	border-radius: 12px;
 	background-color: rgba(50, 50, 50, 0.1);
-	border: 2px solid @color2;
+	border: 1px solid @color2;
 	padding: 5px;
 }
 
@@ -171,6 +171,7 @@ tooltip label{
 
 #custom-power {
 	color: #cc3436;
+	padding: 0px 0px 0px 6px;
 }
 
 #custom-launcher {
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
index 16d8d955..05d881f9 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css
@@ -68,7 +68,6 @@ window#waybar.empty #window {
 #window,
 #wireplumber,
 #workspaces,
-#custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
 #custom-keyboard,
@@ -77,7 +76,6 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -96,12 +94,15 @@ window#waybar.empty #window {
     margin: 5px 5px 5px 5px;
     opacity:0.8;
 }
+#backlight {
+	padding: 0px 2px 0px 6px;
+}
 #custom-power {
     color: @red;
     padding: 0px 0px 0px 6px;
     opacity:1.0;
 }
-
+#custom-light_dark,
 #custom-menu{
     color: @flamingo;
     padding: 0px 8px 0px 4px;
@@ -109,7 +110,7 @@ window#waybar.empty #window {
 }
 
 #custom-weather,
-#custom-updates {
+#custom-updater {
     color: @yellow;
 }
 
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index 0d6a36fe..da5c5a22 100644
--- a/config/waybar/style/[Retro] Simple Style.css
+++ b/config/waybar/style/[Retro] Simple Style.css
@@ -24,17 +24,19 @@ window#waybar {
   transition-duration: 0.5s;
 }
 
+#taskbar button,
 #workspaces button {
-  padding: 0 10px;
   color: @foreground;
 }
 
+#taskbar button.active,
 #workspaces button.active {
   border-bottom: 1px solid @green;
 }
 
+#taskbar button.urgent,
 #workspaces button.urgent {
-  border-bottom: 2px solid @yellow;
+  border-bottom: 2px solid @red;
 }
 
 #submap {
@@ -87,10 +89,7 @@ window#waybar {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
   color: @foreground;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-right: 6px;
-	padding-left: 6px;
+  padding: 5px 8px 5px 8px;
 }
 
 #battery.warning,