From 21d263bbea574402f150915e68fcd45c6f602eb7 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Fri, 1 Sep 2023 10:25:57 +0200
Subject: [PATCH] Updates

---
 waybar/config       | 23 +++++++++++++++++++++--
 waybar/modules.json |  2 +-
 waybar/myconfig     |  4 ++--
 waybar/style.css    | 30 +++++++++++++++++++++++-------
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/waybar/config b/waybar/config
index 7fec283..fddf571 100644
--- a/waybar/config
+++ b/waybar/config
@@ -9,6 +9,7 @@
 // ----------------------------------------------------- 
 //
 {
+    // General Settings
     "layer": "top",
     "height": 16,
     "margin-top": 14,
@@ -16,26 +17,44 @@
     "margin-left": 0,
     "margin-right": 0,    
     "spacing": 0,
+
+    // Load Modules
     "include": ["~/dotfiles/waybar/modules.json"],
+
+    // Modules Left
     "modules-left": [
         "custom/appmenu",
         "wlr/taskbar",
-        "custom/brave",
+        "group/quicklinks",
         "hyprland/window"
     ],
+
+    // Modules Center
     "modules-center": [
         "wlr/workspaces"
     ],
+
+    // Modules Right    
     "modules-right": [
         "custom/updates",
         "pulseaudio",
         "bluetooth",
-        "network",
         "battery", 
         "group/hardware",
         "custom/exit",
+        "network",
         "clock"
     ],
+
+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/brave",
+         ]
+    },
+
+    // Group Hardware
     "group/hardware": {
         "orientation": "horizontal",
         "modules": [
diff --git a/waybar/modules.json b/waybar/modules.json
index 689375f..64216e0 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -26,7 +26,7 @@
     // Taskbar
     "wlr/taskbar": {
         "format": "{icon}",
-        "icon-size": 16,
+        "icon-size": 18,
         "tooltip-format": "{title}",
         "on-click": "activate",
         "on-click-middle": "close",
diff --git a/waybar/myconfig b/waybar/myconfig
index 123ed55..816390d 100644
--- a/waybar/myconfig
+++ b/waybar/myconfig
@@ -36,6 +36,7 @@
 
     // Modules Right    
     "modules-right": [
+        "custom/youtube",
         "custom/updates",
         "pulseaudio",
         "bluetooth",
@@ -51,8 +52,7 @@
         "orientation": "horizontal",
         "modules": [
             "custom/chatgpt",
-            "custom/lookingglass",
-            "custom/youtube"
+            "custom/lookingglass"
          ]
     },
 
diff --git a/waybar/style.css b/waybar/style.css
index 1d10a4a..52f064e 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -119,12 +119,12 @@ window#waybar.empty #window {
 #taskbar {
     background: transparent;
     margin: 3px 15px 3px 0px;
-    padding: 3px 3px 1px 3px;
+    padding: 2px 3px 1px 3px;
     border-radius: 14px;
     font-weight: normal;
     font-style: normal;
-    opacity:0.9;
-    border:3px solid #FFFFFF;
+    opacity:0.8;
+    border: 3px solid #FFFFFF;
 }
 
 #taskbar button {
@@ -144,6 +144,15 @@ window#waybar.empty #window {
     margin-right: 0;
 }
 
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
+    margin-right:15px;
+    font-size:20px;
+}
+
 /* -----------------------------------------------------
  * Custom Modules
  * ----------------------------------------------------- */
@@ -159,16 +168,19 @@ window#waybar.empty #window {
     border:3px solid #FFFFFF;
 }
 
-#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
-    margin-right:15px;
-    font-size:16px;
-}
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
 
 #custom-exit {
     margin: 0px 20px 0px 0px;
     font-size:20px;
 }
 
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
 #custom-updates {
     background-color: #FFFFFF;
     font-size: 16px;
@@ -179,6 +191,10 @@ window#waybar.empty #window {
     opacity:0.8;
 }
 
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
 #custom-youtube {
     background-color: #FFFFFF;
     font-size: 16px;