Merge pull request #45 from JaKooLit/v2.1.12

V2.1.12 preliminary v2.1.12 changes

12 files changed, 57 insertions, 48 deletions

diff --git a/README.md b/README.md
index 6b4ad770..858951af 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ chmod +x release.sh
 
 ### 🙋 QUESTIONS ?!?! ⁉️
 - FAQ! Yes you can use these dotfiles to other distro! Just ensure to install proper packages first! If it makes you feel better, I use same config on my Gentoo and NixOS :)
-- QUICK HINT! Click the HINT! Waybar module (note only available in default layout). Can be launched by Keybind SUPER H
+- QUICK HINT! Click the HINT! Waybar module (note only available in Waybar default and Simple-L [TOP] layout). Can be launched by Keybind SUPER H
 - More question? click here [WIKI](https://github.com/JaKooLit/Hyprland-Dots/wiki/)
 
 ### 🙏 Special request
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 26a32f55..baec5115 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -38,7 +38,7 @@ bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar
 bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh
 bind = CTRL SHIFT, W, exec, $scriptsDir/Refresh.sh
-bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh swww
+bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh
 bind = CTRL, W, exec, $scriptsDir/WaybarStyles.sh
 bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh
 bind = ALT, W, exec, $scriptsDir/WaybarLayout.sh
diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/scripts/Wallpaper.sh
index 8fdfcbb1..c494dca1 100755
--- a/config/hypr/scripts/Wallpaper.sh
+++ b/config/hypr/scripts/Wallpaper.sh
@@ -6,11 +6,18 @@ 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[@]} ]}
 
-swww query || swww init
-swww img ${RANDOMPICS} --transition-fps 30 --transition-type any --transition-duration 3
 
+# Transition config
+FPS=30
+TYPE="any"
+DURATION=3
+SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
+
+
+swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS
 
 
 ${SCRIPTSDIR}/PywalSwww.sh &
 sleep 1
 ${SCRIPTSDIR}/Refresh.sh 
+
diff --git a/config/hypr/scripts/WallpaperRandom.sh b/config/hypr/scripts/WallpaperRandom.sh
index e0f8ee7d..aafcf2ae 100755
--- a/config/hypr/scripts/WallpaperRandom.sh
+++ b/config/hypr/scripts/WallpaperRandom.sh
@@ -29,7 +29,7 @@ while true; do
 		done \
 		| sort -n | cut -d':' -f2- \
 		| while read -r img; do
-			swww img "$img" & $pywal_script & $pywal_refresh 
+			swww img "$img" && $pywal_script & $pywal_refresh 
 			sleep $INTERVAL
 			
 		done
diff --git a/config/hypr/v2.1.11 b/config/hypr/v2.1.12
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.1.11
+++ b/config/hypr/v2.1.12
diff --git a/config/rofi/config-powermenu.rasi b/config/rofi/config-powermenu.rasi
index cf0592f8..ae1ee00a 100644
--- a/config/rofi/config-powermenu.rasi
+++ b/config/rofi/config-powermenu.rasi
@@ -10,16 +10,16 @@ configuration {
 
 /* ---- Global Properties ---- */
 * {
-    font:                           "Fira Code Medium 12";
+    font:                           "Fira Code Medium 10";
 }
 
 /* ---- Main Window ---- */
 window {
-    location:                       center;
+    location:                       east;
     anchor:                         center;
     fullscreen:                     false;
-    width:                          900px;
-    height:                         400px;
+    width:                          240px;
+    /*height:                         800px;*/
     x-offset:                       0px;
     y-offset:                       0px;
     padding:                        0px;
@@ -38,7 +38,7 @@ mainbox {
     padding:                        0px;
     border:                         0px solid;
     border-radius:                  0px;
-    background-image:               url("~/.config/rofi/.current_wallpaper", width);
+    background-image:               url("~/.config/rofi/.current_wallpaper", height);
     border-color:                   @active-background;
     background-color:               @background-color;
     children:                       [ "inputbar", "listview", "message" ];
@@ -47,7 +47,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                        true;
-	padding:						20px;
+	padding:						10px;
     background-color:               transparent;
     orientation:                    horizontal;
     children:                       ["prompt"];
@@ -55,7 +55,7 @@ inputbar {
 
 prompt {
     enabled:                        true;
-	padding:						10px;
+	/*padding:						10px;*/
 	border-radius:					15px;
     border-color:                   @foreground;
     background-color:               @background-color;
@@ -67,8 +67,8 @@ prompt {
 /* ---- Listview ---- */
 listview {
     enabled:                        true;
-    columns:                        3;
-    lines:                          2;
+    columns:                        1;
+    lines:                          6;
     cycle:                          true;
     dynamic:                        true;
     scrollbar:                      false;
@@ -76,8 +76,8 @@ listview {
     reverse:                        false;
     fixed-height:                   false;
     fixed-columns:                  true;
-    spacing:                        40px;
-    padding:                        4% 40px;
+    spacing:                        20px;
+    padding:                        20px;
     background-color:               transparent;
     cursor:                         "default";
     border:                         0px;
@@ -87,14 +87,14 @@ listview {
 /* ---- Elements ---- */
 element {
     enabled:                        true;
-    padding:                        20px;
+    padding:                        10px;
     border-radius:                  30px;
     background-color:               transparent;
     text-color:                     @foreground;
     cursor:                         pointer;
 }
 element-text {
-    font:                           "Fira Code SemiBold 16";
+    font:                           "Fira Code SemiBold 14";
     background-color:               transparent;
     text-color:                     inherit;
     cursor:                         inherit;
diff --git a/config/rofi/resolution/1080p/config-powermenu.rasi b/config/rofi/resolution/1080p/config-powermenu.rasi
index cf0592f8..ae1ee00a 100644
--- a/config/rofi/resolution/1080p/config-powermenu.rasi
+++ b/config/rofi/resolution/1080p/config-powermenu.rasi
@@ -10,16 +10,16 @@ configuration {
 
 /* ---- Global Properties ---- */
 * {
-    font:                           "Fira Code Medium 12";
+    font:                           "Fira Code Medium 10";
 }
 
 /* ---- Main Window ---- */
 window {
-    location:                       center;
+    location:                       east;
     anchor:                         center;
     fullscreen:                     false;
-    width:                          900px;
-    height:                         400px;
+    width:                          240px;
+    /*height:                         800px;*/
     x-offset:                       0px;
     y-offset:                       0px;
     padding:                        0px;
@@ -38,7 +38,7 @@ mainbox {
     padding:                        0px;
     border:                         0px solid;
     border-radius:                  0px;
-    background-image:               url("~/.config/rofi/.current_wallpaper", width);
+    background-image:               url("~/.config/rofi/.current_wallpaper", height);
     border-color:                   @active-background;
     background-color:               @background-color;
     children:                       [ "inputbar", "listview", "message" ];
@@ -47,7 +47,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                        true;
-	padding:						20px;
+	padding:						10px;
     background-color:               transparent;
     orientation:                    horizontal;
     children:                       ["prompt"];
@@ -55,7 +55,7 @@ inputbar {
 
 prompt {
     enabled:                        true;
-	padding:						10px;
+	/*padding:						10px;*/
 	border-radius:					15px;
     border-color:                   @foreground;
     background-color:               @background-color;
@@ -67,8 +67,8 @@ prompt {
 /* ---- Listview ---- */
 listview {
     enabled:                        true;
-    columns:                        3;
-    lines:                          2;
+    columns:                        1;
+    lines:                          6;
     cycle:                          true;
     dynamic:                        true;
     scrollbar:                      false;
@@ -76,8 +76,8 @@ listview {
     reverse:                        false;
     fixed-height:                   false;
     fixed-columns:                  true;
-    spacing:                        40px;
-    padding:                        4% 40px;
+    spacing:                        20px;
+    padding:                        20px;
     background-color:               transparent;
     cursor:                         "default";
     border:                         0px;
@@ -87,14 +87,14 @@ listview {
 /* ---- Elements ---- */
 element {
     enabled:                        true;
-    padding:                        20px;
+    padding:                        10px;
     border-radius:                  30px;
     background-color:               transparent;
     text-color:                     @foreground;
     cursor:                         pointer;
 }
 element-text {
-    font:                           "Fira Code SemiBold 16";
+    font:                           "Fira Code SemiBold 14";
     background-color:               transparent;
     text-color:                     inherit;
     cursor:                         inherit;
diff --git a/config/rofi/resolution/1440p/config-powermenu.rasi b/config/rofi/resolution/1440p/config-powermenu.rasi
index cf0592f8..ae1ee00a 100644
--- a/config/rofi/resolution/1440p/config-powermenu.rasi
+++ b/config/rofi/resolution/1440p/config-powermenu.rasi
@@ -10,16 +10,16 @@ configuration {
 
 /* ---- Global Properties ---- */
 * {
-    font:                           "Fira Code Medium 12";
+    font:                           "Fira Code Medium 10";
 }
 
 /* ---- Main Window ---- */
 window {
-    location:                       center;
+    location:                       east;
     anchor:                         center;
     fullscreen:                     false;
-    width:                          900px;
-    height:                         400px;
+    width:                          240px;
+    /*height:                         800px;*/
     x-offset:                       0px;
     y-offset:                       0px;
     padding:                        0px;
@@ -38,7 +38,7 @@ mainbox {
     padding:                        0px;
     border:                         0px solid;
     border-radius:                  0px;
-    background-image:               url("~/.config/rofi/.current_wallpaper", width);
+    background-image:               url("~/.config/rofi/.current_wallpaper", height);
     border-color:                   @active-background;
     background-color:               @background-color;
     children:                       [ "inputbar", "listview", "message" ];
@@ -47,7 +47,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                        true;
-	padding:						20px;
+	padding:						10px;
     background-color:               transparent;
     orientation:                    horizontal;
     children:                       ["prompt"];
@@ -55,7 +55,7 @@ inputbar {
 
 prompt {
     enabled:                        true;
-	padding:						10px;
+	/*padding:						10px;*/
 	border-radius:					15px;
     border-color:                   @foreground;
     background-color:               @background-color;
@@ -67,8 +67,8 @@ prompt {
 /* ---- Listview ---- */
 listview {
     enabled:                        true;
-    columns:                        3;
-    lines:                          2;
+    columns:                        1;
+    lines:                          6;
     cycle:                          true;
     dynamic:                        true;
     scrollbar:                      false;
@@ -76,8 +76,8 @@ listview {
     reverse:                        false;
     fixed-height:                   false;
     fixed-columns:                  true;
-    spacing:                        40px;
-    padding:                        4% 40px;
+    spacing:                        20px;
+    padding:                        20px;
     background-color:               transparent;
     cursor:                         "default";
     border:                         0px;
@@ -87,14 +87,14 @@ listview {
 /* ---- Elements ---- */
 element {
     enabled:                        true;
-    padding:                        20px;
+    padding:                        10px;
     border-radius:                  30px;
     background-color:               transparent;
     text-color:                     @foreground;
     cursor:                         pointer;
 }
 element-text {
-    font:                           "Fira Code SemiBold 16";
+    font:                           "Fira Code SemiBold 14";
     background-color:               transparent;
     text-color:                     inherit;
     cursor:                         inherit;
diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP]
index 8c331e3f..b1e096e6 100644
--- a/config/waybar/configs/Simple-L [TOP]
+++ b/config/waybar/configs/Simple-L [TOP]
@@ -18,6 +18,8 @@
 
 "modules-left": [
 	"custom/menu",
+	"custom/separator#blank_2",
+	"custom/keybinds",
 	"custom/separator#blank_2", 
 	"hyprland/workspaces#pacman",
 	"custom/separator#blank_2",
diff --git a/config/waybar/modules b/config/waybar/modules
index b7778f40..0cd22468 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -473,7 +473,7 @@
   },
     
   "custom/menu": {
-    "format": "",
+    "format": "",
     "tooltip": false,
     "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser",
     "on-click-middle": "~/.config/hypr/scripts/WallpaperSelect.sh",
diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css
index 79753b93..04b68dc8 100644
--- a/config/waybar/style/Chroma Tally.css
+++ b/config/waybar/style/Chroma Tally.css
@@ -189,7 +189,7 @@ window#waybar {
 }
 
 #custom-menu {
-	color: @color2;
+	color: yellow;
 }
 #custom-power{
     color: #eba0ac; 
diff --git a/copy.sh b/copy.sh
index ca68463c..9cca14f9 100755
--- a/copy.sh
+++ b/copy.sh
@@ -175,8 +175,8 @@ cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ER
 
 # Initial Symlinks to avoid errors
 # symlinks for waybar
-ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" && \
-ln -sf "$HOME/.config/waybar/style/Pywal.css" "$HOME/.config/waybar/style.css" && \
+ln -sf "$HOME/.config/waybar/configs/Simple-L [TOP]" "$HOME/.config/waybar/config" && \
+ln -sf "$HOME/.config/waybar/style/Chroma Tally.css" "$HOME/.config/waybar/style.css" && \
 
   
 # Set some files as executable