From 0c16122ae3c370ba1aed3585e8610f387755b6b2 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Wed, 6 Dec 2023 09:42:58 +0100 Subject: [PATCH] Collapsable hardware information plus kb layout --- waybar/modules.json | 53 ++++++++++++++++++++++++++- waybar/themes/ml4w-blur-bottom/config | 30 ++------------- waybar/themes/ml4w-blur/config | 28 ++------------ waybar/themes/ml4w-blur/style.css | 7 ++-- waybar/themes/ml4w-bottom/config | 28 ++------------ waybar/themes/ml4w/config | 28 ++------------ waybar/themes/ml4w/style.css | 9 +++-- waybar/themes/starter/config | 4 +- waybar/themes/starter/modules.json | 2 +- 9 files changed, 81 insertions(+), 108 deletions(-) diff --git a/waybar/modules.json b/waybar/modules.json index b086148..2f703de 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -203,6 +203,12 @@ "format-alt": "{:%Y-%m-%d}" }, + // System + "custom/system": { + "format": "", + "tooltip": false + }, + // CPU "cpu": { "format": "/ C {usage}% ", @@ -218,11 +224,56 @@ // Harddisc space used "disk": { "interval": 30, - "format": " {percentage_used}% ", + "format": "D {percentage_used}% ", "path": "/", "on-click": "alacritty -e htop" }, + + "hyprland/language": { + "format": "/ K {short}" + }, + + // Group Hardware + "group/hardware": { + "orientation": "inherit", + "drawer": { + "transition-duration": 300, + "children-class": "not-memory", + "transition-left-to-right": false + }, + "modules": [ + "custom/system", + "disk", + "cpu", + "memory", + "hyprland/language" + ] + }, + // 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" + ] + }, + + // Group Quicklinks + "group/quicklinks": { + "orientation": "horizontal", + "modules": [ + "custom/filemanager", + "custom/browser" + ] + }, + // Network "network": { "format": "{ifname}", diff --git a/waybar/themes/ml4w-blur-bottom/config b/waybar/themes/ml4w-blur-bottom/config index 2cfa846..21d05ce 100644 --- a/waybar/themes/ml4w-blur-bottom/config +++ b/waybar/themes/ml4w-blur-bottom/config @@ -22,7 +22,6 @@ "margin-bottom": 0, "layer": "top", - "height": 40, "margin-left": 0, "margin-right": 0, "spacing": 0, @@ -33,9 +32,6 @@ // Modules Left "modules-left": [ "custom/appmenu", - "custom/wallpaper", - "custom/waybarthemes", - "custom/settings", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -52,29 +48,11 @@ "pulseaudio", "bluetooth", "battery", - "group/hardware", - "custom/cliphist", "network", + "group/hardware", + "group/settings", + "custom/cliphist", "custom/exit", "clock" - ], - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/browser" - ] - }, - - // Group Hardware - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "disk", - "cpu", - "memory" - ] - } + ] } diff --git a/waybar/themes/ml4w-blur/config b/waybar/themes/ml4w-blur/config index 3997db3..f450dfa 100644 --- a/waybar/themes/ml4w-blur/config +++ b/waybar/themes/ml4w-blur/config @@ -22,7 +22,6 @@ // "margin-bottom": 14, "layer": "top", - "height": 40, "margin-left": 0, "margin-right": 0, "spacing": 0, @@ -33,9 +32,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/settings", + "custom/waybarthemes", "custom/wallpaper", - "custom/waybarthemes", - "custom/settings", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -52,29 +51,10 @@ "pulseaudio", "bluetooth", "battery", + "network", "group/hardware", "custom/cliphist", - "network", "custom/exit", "clock" - ], - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/browser" - ] - }, - - // Group Hardware - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "disk", - "cpu", - "memory" - ] - } + ] } diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css index a112556..fd5fc1c 100644 --- a/waybar/themes/ml4w-blur/style.css +++ b/waybar/themes/ml4w-blur/style.css @@ -162,6 +162,7 @@ window#waybar.empty #window { #custom-wallpaper, #custom-settings, #custom-wallpaper, + #custom-system, #custom-waybarthemes { margin-right: 23px; font-size: 20px; @@ -170,7 +171,7 @@ window#waybar.empty #window { color: @iconcolor; } - #custom-waybarthemes { + #custom-waybarthemes,#custom-system { margin-right:15px; } @@ -246,14 +247,14 @@ window#waybar.empty #window { * Hardware Group * ----------------------------------------------------- */ -#disk,#memory,#cpu { + #disk,#memory,#cpu,#language { margin:0px; padding:0px; font-size:16px; color:@iconcolor; } -#memory { +#language { margin-right:10px; } diff --git a/waybar/themes/ml4w-bottom/config b/waybar/themes/ml4w-bottom/config index fac8a8b..6e6467a 100644 --- a/waybar/themes/ml4w-bottom/config +++ b/waybar/themes/ml4w-bottom/config @@ -22,7 +22,6 @@ "margin-bottom": 14, "layer": "top", - "height": 16, "margin-left": 0, "margin-right": 0, "spacing": 0, @@ -33,9 +32,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/settings", + "custom/waybarthemes", "custom/wallpaper", - "custom/waybarthemes", - "custom/settings", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -52,29 +51,10 @@ "pulseaudio", "bluetooth", "battery", + "network", "group/hardware", "custom/cliphist", - "network", "custom/exit", "clock" - ], - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/browser" - ] - }, - - // Group Hardware - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "disk", - "cpu", - "memory" - ] - } + ] } diff --git a/waybar/themes/ml4w/config b/waybar/themes/ml4w/config index 831486f..1bded4d 100644 --- a/waybar/themes/ml4w/config +++ b/waybar/themes/ml4w/config @@ -22,7 +22,6 @@ // "margin-bottom": 14, "layer": "top", - "height": 16, "margin-left": 0, "margin-right": 0, "spacing": 0, @@ -33,9 +32,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/settings", + "custom/waybarthemes", "custom/wallpaper", - "custom/waybarthemes", - "custom/settings", "wlr/taskbar", "group/quicklinks", "hyprland/window" @@ -52,29 +51,10 @@ "pulseaudio", "bluetooth", "battery", + "network", "group/hardware", "custom/cliphist", - "network", "custom/exit", "clock" - ], - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/browser" - ] - }, - - // Group Hardware - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "disk", - "cpu", - "memory" - ] - } + ] } diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css index 100c466..c502354 100644 --- a/waybar/themes/ml4w/style.css +++ b/waybar/themes/ml4w/style.css @@ -162,7 +162,8 @@ window#waybar.empty #window { #custom-cliphist, #custom-wallpaper, #custom-settings, -#custom-wallpaper, +#custom-wallpaper, +#custom-system, #custom-waybarthemes { margin-right: 23px; font-size: 20px; @@ -171,7 +172,7 @@ window#waybar.empty #window { color: @iconcolor; } -#custom-waybarthemes { +#custom-waybarthemes, #custom-system { margin-right:15px; } @@ -248,14 +249,14 @@ window#waybar.empty #window { * Hardware Group * ----------------------------------------------------- */ -#disk,#memory,#cpu { +#disk,#memory,#cpu,#language { margin:0px; padding:0px; font-size:16px; color:@iconcolor; } -#memory { +#language { margin-right:10px; } diff --git a/waybar/themes/starter/config b/waybar/themes/starter/config index 4a33649..d45dbe7 100644 --- a/waybar/themes/starter/config +++ b/waybar/themes/starter/config @@ -31,6 +31,9 @@ // Modules Left "modules-left": [ "custom/appmenu", + "custom/settings", + "custom/waybarthemes", + "custom/wallpaper", // "wlr/taskbar", "group/quicklinks", "hyprland/window", @@ -50,7 +53,6 @@ "battery", "network", "group/hardware", - "group/settings", "custom/cliphist", "custom/exit", "clock" diff --git a/waybar/themes/starter/modules.json b/waybar/themes/starter/modules.json index 4691417..76aad7f 100644 --- a/waybar/themes/starter/modules.json +++ b/waybar/themes/starter/modules.json @@ -88,7 +88,7 @@ // Wallpaper "custom/starter": { - "format": "THEME STARTER: Copy the starter folder", + "format": "THEME STARTER", "tooltip": false },