update: waybar

2024-05-26 18:22:25 -04:00
parent 6cf2a43c2c
commit 43e564e47a
3 changed files with 285 additions and 147 deletions
@@ -1,12 +1,12 @@
-//  __  __           _       _            
-// |  \/  | ___   __| |_   _| | ___  ___  
-// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
-// | |  | | (_) | (_| | |_| | |  __/\__ \ 
-// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
-//                                        
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
+//  __  __           _       _
+// |  \/  | ___   __| |_   _| | ___  ___
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __|
+// | |  | | (_) | (_| | |_| | |  __/\__ \
+// |_|  |_|\___/ \__,_|\__,_|_|\___||___/
+//
+//
+// by Stephan Raabe (2023)
+// -----------------------------------------------------
 //
 {
    // Workspaces
@@ -24,13 +24,13 @@
            // START WORKSPACES
            "*": 3
            // END WORKSPACES
-        }       
+        }
    },

    // Taskbar
    "wlr/taskbar": {
        "format": "{icon}",
-        "icon-size": 18,
+        "icon-size": 16,
        "tooltip-format": "{title}",
        "on-click": "activate",
        "on-click-middle": "close",
@@ -54,7 +54,9 @@
            "(.*) - Chromium": "$1",
            "(.*) - Brave Search": "$1",
            "(.*) - Outlook": "$1",
-            "(.*) Microsoft Teams": "$1"
+            "(.*) Microsoft Teams": "$1",
+            "(.*) - Google Chrome": "$1",
+            "(.*) - Visual Studio Code": "$1"
        },
        "separate-outputs": true
    },
@@ -79,7 +81,7 @@
        "on-click": "chromium https://studio.youtube.com",
        "tooltip": false
    },
-    
+
    // Cliphist
    "custom/cliphist": {
        "format": "",
@@ -91,17 +93,17 @@

    // Updates Count
    "custom/updates": {
-        "format": "  {}",
+        "format": " {}",
        "tooltip-format": "{}",
        "escape": true,
-        "return-type": "json",       
+        "return-type": "json",
        "exec": "~/dotfiles/scripts/updates.sh",
        "restart-interval": 60,
        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
        "on-click-right": "~/dotfiles/.settings/software.sh",
        "tooltip": false
    },
-    
+
    // Wallpaper
    "custom/wallpaper": {
        "format": "",
@@ -116,7 +118,7 @@
        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
        "tooltip": false
    },
-    
+
    // Settings
    "custom/settings": {
        "format": "",
@@ -157,7 +159,7 @@
        "format": "",
        "on-click": "~/dotfiles/.settings/browser.sh",
        "tooltip": false
-    },    
+    },

    // ChatGPT Launcher
    "custom/chatgpt": {
@@ -196,7 +198,7 @@
        "on-click": "rofi -show drun -replace",
        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
        "tooltip": false
-    },    
+    },

    // Power Menu
    "custom/exit": {
@@ -230,17 +232,30 @@

    // System tray
    "tray": {
-        "icon-size": 21,
-        "spacing": 10,
+        "icon-size": 16,
+        "spacing": 8,
        "verse-direction": true
    },

    // Clock
    "clock": {
+        "calendar": {
+            "mode"          : "year",
+            "mode-mon-col"  : 3,
+            "weeks-pos"     : "right",
+            "on-scroll"     : 1,
+            "format": {
+                      "months":     "<span color='#ffead3'><b>{}</b></span>",
+                      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+                      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+                      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+                      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+                      }
+            },
        // TIMEDATEFORMAT
-        "format": "{:%H:%M - %a}",
+        "format": "{:%B %d %H:%M %a}",
        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "tooltip-format": "<big>{:%Y %B %d}</big>\n<tt><small>{calendar}</small></tt>",
        // START CLOCK FORMAT
        "format-alt": "{:%Y-%m-%d}"
        // END CLOCK FORMAT
@@ -254,20 +269,37 @@

    // div
    "custom/div": {
-        "format": " | ",
+        "format": "",
        "tooltip": false
    },

    // CPU
    "cpu": {
-        "format": "󰒇  {usage}% ",
-        "on-click": "alacritty -e htop"
+        "format": "󰒇 {usage}%",
+        "on-click": "alacritty -e htop",
+        "interval": 5,
+        "states": {
+            "warning": 50,
+            "critical": 90
+        }
    },

+    // "cpu#bar": {
+    //     "format": "{icon}",
+    //     "format-icons":[
+    //         "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██"
+    //     ]
+    // },
+
    // Memory
    "memory": {
-        "format": " {used:0.1f}G ",
-        "on-click": "alacritty -e htop"
+        "format": " {used:0.1f}G",
+        "on-click": "alacritty -e htop",
+        "interval": 10,
+        "states": {
+            "warning": 50,
+            "critical": 80
+        }
    },

    // Harddisc space used
@@ -276,7 +308,7 @@
        "format": "D {percentage_used}% ",
        "path": "/",
        "on-click": "alacritty -e htop"
-    }, 
+    },

    "hyprland/language": {
        "format": "/ K {short}"
@@ -286,14 +318,35 @@
    "group/hardware": {
        "orientation": "inherit",
        "modules": [
+            "network#speed",
+            "custom/div",
            "cpu",
-            "div",
-            "memory",
-            "div",
-            "network"
+            "custom/div",
+            "memory"
        ]
    },
-    
+
+    "group/hardware2": {
+        "orientation": "inherit",
+        "modules": [
+            "pulseaudio",
+            "custom/div",
+            "network"
+            // "custom/div",
+            // "battery",
+            // "battery#charging"
+        ]
+    },
+
+    // Group system settings
+    "group/systems": {
+        "orientation": "inherit",
+        "modules": [
+            // "user",
+            "clock"
+        ]
+    },
+
    // Group Settings
    "group/settings": {
        "orientation": "horizontal",
@@ -319,9 +372,9 @@
    // Network
    "network": {
        "format": "{ifname}",
-        "format-wifi": "{icon}   {signalStrength}%",
-        "format-ethernet": "  {ifname}",
-        "format-disconnected": "Disconnected",
+        "format-wifi": "{icon} {signalStrength}%",
+        "format-ethernet": " wired",
+        "format-disconnected": "󰌙",
        "tooltip-format": " {ifname} via {gwaddri}",
        "tooltip-format-wifi": "  {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
        "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
@@ -330,6 +383,10 @@
        "on-click": "~/dotfiles/.settings/networkmanager.sh",
        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
    },
+    "network#speed": {
+        "format": " {bandwidthTotalBits}",
+        "interval": 5
+    },

    // Battery
    "battery": {
@@ -369,7 +426,7 @@
    // Pulseaudio
    "pulseaudio": {
        // "scroll-step": 1, // %, can be a float
-        "format": "{icon}",
+        "format": "{icon} {volume}%",
        "format-bluetooth": "{icon} {format_source}",
        "format-bluetooth-muted": " {icon} {format_source}",
        "format-muted": " {format_source}",
@@ -412,6 +469,6 @@
            "activated": "",
            "deactivated": ""
        },
-        "on-click-right": "hyprlock"        
+        "on-click-right": "hyprlock"
    }
 }