Merge branch 'upstream-main' into upstream-custom

waybar/themes/ml4w-blur-bottom/black/style.css

@@ -18,3 +18,7 @@
 window#waybar {
     background-color: rgba(255,255,255,0.1);
 }
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-blur-bottom/config

@@ -45,9 +45,9 @@
         "battery", 
         "network",
         "group/hardware",
-        "group/settings",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "tray",
         "custom/exit",
         "custom/ml4w-welcome",

waybar/themes/ml4w-blur/black/style.css

@@ -18,3 +18,7 @@
 window#waybar {
     background-color: rgba(255,255,255,0.1);
 }
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-blur/config

@@ -46,7 +46,8 @@
         "network",
         "group/hardware",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "tray",
         "custom/exit",
         "custom/ml4w-welcome",

waybar/themes/ml4w-blur/style.css

@@ -163,6 +163,8 @@ window#waybar.empty #window {
 #custom-settings, 
 #custom-wallpaper, 
 #custom-system,
+#custom-hyprshade,
+#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -170,7 +172,23 @@ window#waybar.empty #window {
     opacity: 0.8;
     color: @iconcolor;
 }
- 
+
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:18px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
 #custom-system {
     margin-right:15px;
 }

waybar/themes/ml4w-bottom/black/style.css

@@ -14,3 +14,7 @@
 @define-color iconcolor #000000;
 
 @import '../../ml4w/style.css';
+
+#custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w-bottom/config

@@ -46,7 +46,8 @@
         "network",
         "group/hardware",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "tray",
         "custom/exit",
         "custom/ml4w-welcome",

waybar/themes/ml4w-minimal/config

@@ -44,7 +44,8 @@
         "network",
         "group/hardware",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "custom/exit",
         "clock",
         "tray",

waybar/themes/ml4w-minimal/style.css

@@ -134,6 +134,8 @@ window#waybar.empty #window {
 #custom-settings, 
 #custom-wallpaper, 
 #custom-system,
+#custom-hyprshade,
+#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 14px;
@@ -141,6 +143,22 @@ window#waybar.empty #window {
     color: @iconcolor;
 }
 
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:16px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
 #custom-settings {
     margin-right: 15px;
 }

waybar/themes/ml4w/black/style.css

@@ -14,4 +14,7 @@
  @define-color iconcolor #000000;
  
  @import '../style.css';
- 
+ 
+ #custom-ml4w-welcome {
+    background-image: url("../../assets/ml4w-icon-dark.png");
+}

waybar/themes/ml4w/config

@@ -46,7 +46,8 @@
         "network",
         "group/hardware",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "tray",
         "custom/exit",
         "custom/ml4w-welcome",

waybar/themes/ml4w/style.css

@@ -164,6 +164,8 @@ window#waybar.empty #window {
 #custom-settings, 
 #custom-wallpaper, 
 #custom-system,
+#custom-hyprshade,
+#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -172,6 +174,22 @@ window#waybar.empty #window {
     color: @iconcolor;
 }
 
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:18px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
 #custom-system {
     margin-right:15px;
 }

waybar/themes/starter/config

@@ -54,7 +54,8 @@
         "network",
         "group/hardware",
         "custom/cliphist",
-        "idle_inhibitor",
+        "custom/hypridle",
+        "custom/hyprshade",
         "tray",
         "custom/exit",
         "custom/ml4w-welcome",

waybar/themes/starter/modules.json

@@ -65,9 +65,29 @@
         "tooltip": false
     },
 
+    // Hyprshade
+    "custom/hyprshade": {
+        "format": "",
+        "on-click": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh",
+        "on-click-right": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh rofi",
+        "tooltip": false
+    },
+
+    // Hypridle inhibitor
+    "custom/hypridle": {
+        "format": "",
+        "return-type": "json",
+        "escape": true,
+        "exec-on-event": true,
+        "interval": 60,
+        "exec": "~/dotfiles/hypr/scripts/hypridle.sh status",
+        "on-click": "~/dotfiles/hypr/scripts/hypridle.sh toggle",
+        "on-click-right": "hyprlock"
+    },
+
     // Updates Count
     "custom/updates": {
-        "format": "  {}",
+        "format": "   {}",
         "tooltip-format": "{}",
         "escape": true,
         "return-type": "json",       
@@ -87,7 +107,7 @@
     "custom/wallpaper": {
         "format": "",
         "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
-        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
+        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
         "tooltip": false
     },
 
@@ -283,7 +303,7 @@
     // Pulseaudio
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
+        "format": "{icon}  {volume}%",
         "format-bluetooth": "{volume}% {icon} {format_source}",
         "format-bluetooth-muted": " {icon} {format_source}",
         "format-muted": " {format_source}",

waybar/themes/starter/style.css

@@ -164,6 +164,8 @@ window#waybar.empty #window {
 #custom-settings, 
 #custom-wallpaper, 
 #custom-system,
+#custom-hyprshade,
+#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -171,12 +173,27 @@ window#waybar.empty #window {
     color: @iconcolor;
 }
  
- #custom-waybarthemes,#custom-system {
+#custom-hyprshade {
+    margin-right:12px;
+}
+
+#custom-hypridle {
+    margin-right:16px;
+}
+
+#custom-hypridle.active {
+    color: @iconcolor;
+}
+
+#custom-hypridle.notactive {
+    color: #dc2f2f;
+}
+
+#custom-waybarthemes,#custom-system {
      margin-right:15px;
- }
+}
 
-
- #custom-ml4w-welcome {
+#custom-ml4w-welcome {
     margin-right: 15px;
     background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
@@ -396,7 +413,7 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #tray {
-    background-color: #2980b9;
+    margin:0px 10px 0px 0px;
 }
 
 #tray > .passive {