diff --git a/home/linux.nix b/home/linux.nix index 4b81977..9303a60 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -39,6 +39,7 @@ krita gpustat librewolf + pamixer ]; imports = [ diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc index dd1e76d..962c66e 100644 --- a/modules/wm/waybar/config/config.jsonc +++ b/modules/wm/waybar/config/config.jsonc @@ -1,23 +1,86 @@ { // Bar Options - "layer": "top", "output": "DP-3", "position": "left", - "margin": "5px", + "margin-left": 8, + "margin-top": 8, + "margin-bottom": 8, + // TODO: Remove + "reload_style_on_change": true, // Placing Modules "modules-left": [ + "clock", + "custom/cpu-label", + "cpu", + "custom/memory-label", + "memory", + "custom/disk-label", + "disk" + ], + "modules-center": [ "niri/workspaces" ], - "modules-center": [], "modules-right": [ - "clock" + "wireplumber", + "tray" ], // Module Configuration "niri/workspaces": { "format": "{icon}", "format-icons": { - "active": "", - "default": "" + "active": "󰄯", + "default": "󰄰" } + }, + "clock": { + "interval": 60, + "format": "{:%H\n%M}", + "format-alt": "{:%d\n%m}", + "tooltip": false, + "justify": "center" + }, + "custom/cpu-label": { + "format": "CPU", + "tooltip": false + }, + "cpu": { + "interval": "30", + "format": "{usage}%", + "max-length": 2 + }, + "custom/memory-label": { + "format": "MEM", + "tooltip": false + }, + "memory": { + "interval": "30", + "format": "{percentage}%", + "max-length": 2 + }, + "custom/disk-label": { + "format": "SSD", + "tooltip": false + }, + "disk": { + "interval": "30", + "format": "{percentage_used}%", + "max-length": 2 + }, + "wireplumber": { + "on-click": "pamixer -t", + "on-click-right": "pwvucontrol", + "format": "{icon}", + "format-muted": "󰖁", + "format-icons": { + "default": [ + "󰕿", + "󰖀", + "󰕾" + ] + } + }, + "tray": { + "icon-size": 14, + "spacing": 18 } } diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css index cf6e967..ee778be 100644 --- a/modules/wm/waybar/config/style.css +++ b/modules/wm/waybar/config/style.css @@ -1,4 +1,60 @@ * { - font-family: "VictorMono Nerd Font"; - font-size: 12; + font-family: "VictorMono Nerd Font Propo"; + font-size: 12px; + font-weight: bold; + background: transparent; +} + +tooltip, +#tray menu { + background: rgba(15, 11, 12, 0.9); + border-radius: 8px; + border: 2px solid #572454; +} + +window#waybar { + background-color: rgba(15, 11, 12, 0.999); + border-radius: 8px; + color: #ffffff; +} + +#workspaces button { + padding: 2px 10px; + margin: 0; + color: #d369af; +} + +#clock { + font-size: 15px; + padding: 8px 0 8px; +} + +#custom-cpu-label, +#custom-memory-label, +#custom-disk-label { + color: #572454; + padding-top: 6px; + border-top: 1px solid #572454; +} + +#disk { + border-bottom: 1px solid #572454; +} + +#cpu, +#memory, +#disk { + color: #d369af; + padding-bottom: 8px; +} + +#wireplumber { + font-size: 16px; +} + +#tray { + margin: 4px; + border-radius: 4px; + padding-top: 10px; + padding-bottom: 10px; }