Collapsable hardware information plus kb layout

This commit is contained in:
Stephan Raabe 2023-12-06 09:42:58 +01:00
parent 5847171e7a
commit 0c16122ae3
9 changed files with 81 additions and 108 deletions

View File

@ -203,6 +203,12 @@
"format-alt": "{:%Y-%m-%d}" "format-alt": "{:%Y-%m-%d}"
}, },
// System
"custom/system": {
"format": "",
"tooltip": false
},
// CPU // CPU
"cpu": { "cpu": {
"format": "/ C {usage}% ", "format": "/ C {usage}% ",
@ -218,11 +224,56 @@
// Harddisc space used // Harddisc space used
"disk": { "disk": {
"interval": 30, "interval": 30,
"format": " {percentage_used}% ", "format": "D {percentage_used}% ",
"path": "/", "path": "/",
"on-click": "alacritty -e htop" "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
"network": { "network": {
"format": "{ifname}", "format": "{ifname}",

View File

@ -22,7 +22,6 @@
"margin-bottom": 0, "margin-bottom": 0,
"layer": "top", "layer": "top",
"height": 40,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0, "spacing": 0,
@ -33,9 +32,6 @@
// Modules Left // Modules Left
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/wallpaper",
"custom/waybarthemes",
"custom/settings",
"wlr/taskbar", "wlr/taskbar",
"group/quicklinks", "group/quicklinks",
"hyprland/window" "hyprland/window"
@ -52,29 +48,11 @@
"pulseaudio", "pulseaudio",
"bluetooth", "bluetooth",
"battery", "battery",
"group/hardware",
"custom/cliphist",
"network", "network",
"group/hardware",
"group/settings",
"custom/cliphist",
"custom/exit", "custom/exit",
"clock" "clock"
],
// Group Quicklinks
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/filemanager",
"custom/browser"
] ]
},
// Group Hardware
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -22,7 +22,6 @@
// "margin-bottom": 14, // "margin-bottom": 14,
"layer": "top", "layer": "top",
"height": 40,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0, "spacing": 0,
@ -33,9 +32,9 @@
// Modules Left // Modules Left
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/wallpaper",
"custom/waybarthemes",
"custom/settings", "custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
"wlr/taskbar", "wlr/taskbar",
"group/quicklinks", "group/quicklinks",
"hyprland/window" "hyprland/window"
@ -52,29 +51,10 @@
"pulseaudio", "pulseaudio",
"bluetooth", "bluetooth",
"battery", "battery",
"network",
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
"network",
"custom/exit", "custom/exit",
"clock" "clock"
],
// Group Quicklinks
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/filemanager",
"custom/browser"
] ]
},
// Group Hardware
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -162,6 +162,7 @@ window#waybar.empty #window {
#custom-wallpaper, #custom-wallpaper,
#custom-settings, #custom-settings,
#custom-wallpaper, #custom-wallpaper,
#custom-system,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 20px; font-size: 20px;
@ -170,7 +171,7 @@ window#waybar.empty #window {
color: @iconcolor; color: @iconcolor;
} }
#custom-waybarthemes { #custom-waybarthemes,#custom-system {
margin-right:15px; margin-right:15px;
} }
@ -246,14 +247,14 @@ window#waybar.empty #window {
* Hardware Group * Hardware Group
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#disk,#memory,#cpu { #disk,#memory,#cpu,#language {
margin:0px; margin:0px;
padding:0px; padding:0px;
font-size:16px; font-size:16px;
color:@iconcolor; color:@iconcolor;
} }
#memory { #language {
margin-right:10px; margin-right:10px;
} }

View File

@ -22,7 +22,6 @@
"margin-bottom": 14, "margin-bottom": 14,
"layer": "top", "layer": "top",
"height": 16,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0, "spacing": 0,
@ -33,9 +32,9 @@
// Modules Left // Modules Left
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/wallpaper",
"custom/waybarthemes",
"custom/settings", "custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
"wlr/taskbar", "wlr/taskbar",
"group/quicklinks", "group/quicklinks",
"hyprland/window" "hyprland/window"
@ -52,29 +51,10 @@
"pulseaudio", "pulseaudio",
"bluetooth", "bluetooth",
"battery", "battery",
"network",
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
"network",
"custom/exit", "custom/exit",
"clock" "clock"
],
// Group Quicklinks
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/filemanager",
"custom/browser"
] ]
},
// Group Hardware
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -22,7 +22,6 @@
// "margin-bottom": 14, // "margin-bottom": 14,
"layer": "top", "layer": "top",
"height": 16,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0, "spacing": 0,
@ -33,9 +32,9 @@
// Modules Left // Modules Left
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/wallpaper",
"custom/waybarthemes",
"custom/settings", "custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
"wlr/taskbar", "wlr/taskbar",
"group/quicklinks", "group/quicklinks",
"hyprland/window" "hyprland/window"
@ -52,29 +51,10 @@
"pulseaudio", "pulseaudio",
"bluetooth", "bluetooth",
"battery", "battery",
"network",
"group/hardware", "group/hardware",
"custom/cliphist", "custom/cliphist",
"network",
"custom/exit", "custom/exit",
"clock" "clock"
],
// Group Quicklinks
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/filemanager",
"custom/browser"
] ]
},
// Group Hardware
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -163,6 +163,7 @@ window#waybar.empty #window {
#custom-wallpaper, #custom-wallpaper,
#custom-settings, #custom-settings,
#custom-wallpaper, #custom-wallpaper,
#custom-system,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 20px; font-size: 20px;
@ -171,7 +172,7 @@ window#waybar.empty #window {
color: @iconcolor; color: @iconcolor;
} }
#custom-waybarthemes { #custom-waybarthemes, #custom-system {
margin-right:15px; margin-right:15px;
} }
@ -248,14 +249,14 @@ window#waybar.empty #window {
* Hardware Group * Hardware Group
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#disk,#memory,#cpu { #disk,#memory,#cpu,#language {
margin:0px; margin:0px;
padding:0px; padding:0px;
font-size:16px; font-size:16px;
color:@iconcolor; color:@iconcolor;
} }
#memory { #language {
margin-right:10px; margin-right:10px;
} }

View File

@ -31,6 +31,9 @@
// Modules Left // Modules Left
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
// "wlr/taskbar", // "wlr/taskbar",
"group/quicklinks", "group/quicklinks",
"hyprland/window", "hyprland/window",
@ -50,7 +53,6 @@
"battery", "battery",
"network", "network",
"group/hardware", "group/hardware",
"group/settings",
"custom/cliphist", "custom/cliphist",
"custom/exit", "custom/exit",
"clock" "clock"

View File

@ -88,7 +88,7 @@
// Wallpaper // Wallpaper
"custom/starter": { "custom/starter": {
"format": "THEME STARTER: Copy the starter folder", "format": "THEME STARTER",
"tooltip": false "tooltip": false
}, },