Merge branch 'upstream-main' into upstream-custom

waybar/modules.json

@@ -58,11 +58,19 @@
 
     // ML4W Welcome App
     "custom/ml4w-welcome": {
-        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+        "on-click": "sleep 0.1 && ~/dotfiles/eww/ml4w-sidebar/launch.sh",
+        "on-click-right": "sleep 0.1 && ~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
         "format": " ",
         "tooltip": false
     },
 
+    // ML4W Welcome App
+    "custom/ml4w-hyprland-settings": {
+        "on-click": "~/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage",
+        "format": " ",
+        "tooltip": false
+    },
+    
     // Empty
     "custom/empty": {
         "format": ""
@@ -88,7 +96,7 @@
 
     // Updates Count
     "custom/updates": {
-        "format": "  {}",
+        "format": "   {}",
         "tooltip-format": "{}",
         "escape": true,
         "return-type": "json",       
@@ -135,20 +143,6 @@
         "tooltip": false
     },
 
-    // Outlook Launcher
-    "custom/outlook": {
-        "format": "",
-        "on-click": "chromium --app=https://outlook.office.com/mail/",
-        "tooltip": false
-    },
-
-    // Teams Launcher
-    "custom/teams": {
-        "format": "",
-        "on-click": "chromium --app=https://teams.microsoft.com/go",
-        "tooltip": false
-    },
-
     // Browser Launcher
     "custom/browser": {
         "format": "",
@@ -277,15 +271,27 @@
     },
     
     // Group Settings
-    "group/settings": {
+    "group/links": {
         "orientation": "horizontal",
         "modules": [
-            // START CHATGPT TOOGLE
             "custom/chatgpt",
-            // END CHATGPT TOOGLE
+            "custom/empty"
+        ]
+    },
+
+    // Group Settings
+    "group/settings": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },            
+        "modules": [
             "custom/settings",
             "custom/waybarthemes",
-            "custom/wallpaper"
+            "custom/wallpaper",
+            "custom/ml4w-hyprland-settings"
         ]
     },
 
@@ -331,8 +337,8 @@
     // Pulseaudio
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format": "{icon}   {volume}%",
+        "format-bluetooth": "{volume}%  {icon} {format_source}",
         "format-bluetooth-muted": " {icon} {format_source}",
         "format-muted": " {format_source}",
         "format-source": "{volume}% ",

waybar/themes/ml4w-blur-bottom/config

@@ -24,8 +24,9 @@
     // Modules Left
     "modules-left": [
         "custom/appmenu",
+        "group/links",
         "group/settings",
-        "wlr/taskbar",
+        //"wlr/taskbar",
         "group/quicklinks",
         "hyprland/window",
         "custom/empty"

waybar/themes/ml4w-blur/config

@@ -24,8 +24,9 @@
     // Modules Left
     "modules-left": [
         "custom/appmenu",
+        "group/links",
         "group/settings",
-        "wlr/taskbar",
+        //"wlr/taskbar",
         "group/quicklinks",
         "hyprland/window",
         "custom/empty"

waybar/themes/ml4w-blur/style.css

@@ -184,15 +184,23 @@ window#waybar.empty #window {
 }
 
 #custom-ml4w-welcome {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
 }
 
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
 #custom-chatgpt {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ai-icon-20.png");
     background-repeat: no-repeat;
     background-position: center;
@@ -204,8 +212,8 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #idle_inhibitor {
-    margin-right: 15px;
-    font-size: 22px;
+    margin-right: 17px;
+    font-size: 20px;
     font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
@@ -229,7 +237,7 @@ window#waybar.empty #window {
     color: @textcolor1;
     border-radius: 15px;
     padding: 0px 10px 0px 10px;
-    margin: 6px 15px 6px 14px;
+    margin: 8px 14px 8px 14px;
     opacity:0.8;
     border:3px solid @bordercolor;
 }
@@ -312,7 +320,7 @@ window#waybar.empty #window {
     color: @textcolor1;
     border-radius: 15px;
     padding: 1px 10px 0px 10px;
-    margin: 6px 15px 6px 0px;
+    margin: 8px 15px 8px 0px;
     opacity:0.8;
     border:3px solid @bordercolor;   
 }

waybar/themes/ml4w-bottom/config

@@ -24,8 +24,9 @@
     // Modules Left
     "modules-left": [
         "custom/appmenu",
+        "group/links",
         "group/settings",
-        "wlr/taskbar",
+        //"wlr/taskbar",
         "group/quicklinks",
         "hyprland/window"
     ],

waybar/themes/ml4w-minimal/config

@@ -24,6 +24,7 @@
     "modules-left": [
         "custom/appmenuicon",
         "hyprland/workspaces",
+        "group/links",
         "group/settings",
         "group/quicklinks"
     ],

waybar/themes/ml4w-minimal/style.css

@@ -142,12 +142,19 @@ window#waybar.empty #window {
 }
 
 #custom-settings {
-    margin-right: 15;
+    margin-right: 15px;
+}
 
+#custom-browser {
+    margin-right: 16px;
+}
+
+#custom-wallpaper {
+    margin-right: 14px;
 }
 
 #custom-chatgpt {
-    margin-right: 15px;
+    margin-right: 10px;
     background-image: url("../assets/ai-icon-20.png");
     background-repeat: no-repeat;
     background-position: center;
@@ -167,6 +174,15 @@ window#waybar.empty #window {
     padding-right: 24px;
 }
 
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon-20.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
+
 /* -----------------------------------------------------
  * Idle Inhibator
  * ----------------------------------------------------- */

waybar/themes/ml4w/config

@@ -24,8 +24,9 @@
     // Modules Left
     "modules-left": [
         "custom/appmenu",
+        "group/links",
         "group/settings",
-        "wlr/taskbar",
+        //"wlr/taskbar",
         "group/quicklinks",
         "hyprland/window",
         "custom/empty"

waybar/themes/ml4w/style.css

@@ -185,7 +185,7 @@ window#waybar.empty #window {
 }
 
 #custom-chatgpt {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ai-icon.png");
     background-repeat: no-repeat;
     background-position: center;
@@ -193,13 +193,21 @@ window#waybar.empty #window {
 }
 
 #custom-ml4w-welcome {
-    margin-right: 15px;
+    margin-right: 12px;
     background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
 }
 
+#custom-ml4w-hyprland-settings {
+    margin-right: 12px;
+    background-image: url("../assets/hyprland-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 16px;
+}
+
 /* -----------------------------------------------------
  * Idle Inhibator
  * ----------------------------------------------------- */

waybar/themes/starter/config

@@ -34,7 +34,7 @@
         "custom/settings",
         "custom/waybarthemes",
         "custom/wallpaper",
-        // "wlr/taskbar",
+        //"wlr/taskbar",
         "group/quicklinks",
         "hyprland/window",
         "custom/starter"