diff --git a/modules/niri/waybar.conf.nix b/modules/niri/waybar.conf.nix index 3848841..ae086ae 100644 --- a/modules/niri/waybar.conf.nix +++ b/modules/niri/waybar.conf.nix @@ -3,36 +3,44 @@ layer = "top"; position = "top"; modules-left = [ - "memory" - "cpu" - "temperature" + "backlight" + "wireplumber" ]; modules-center = [ "clock" ]; modules-right = [ "network" - "wireplumber" "battery" ]; - "cpu" = { - interval = 10; - format = "{usage}%"; - }; - "temperature" = { - hwmon-path = config.hwmonPath; - format = "{temperatureC}°C "; - interval = 10; + + "backlight" = { + format = "{icon}"; + format-alt = "{percent}%"; + format-icons = [ "" "" "" "" "" "" "" "" "" "" "" "" "" ]; tooltip = false; }; - "memory" = { - interval = 30; - format = "{percentage}% "; + "wireplumber" = { + format = "{icon}"; + format-alt = "{volume}%"; + format-muted = ""; + format-icons = ["" "" ""]; + tooltip = false; }; + "clock" = { format = "{:%H:%M}"; format-alt = "{:%a, %Y-%m-%d}"; }; + + "network" = { + format-wifi = "{icon}"; + format-alt = "{essid}"; + format-ethernet = "󰈁"; + format-disconnected = "󰤭"; + format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; + tooltip = false; + }; "battery" = { states = { good = 80; @@ -44,20 +52,5 @@ format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; tooltip = false; }; - "network" = { - format-wifi = "{icon}"; - format-alt = "{essid}"; - format-ethernet = "󰈁"; - format-disconnected = "󰤭"; - format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; - tooltip = false; - }; - "wireplumber" = { - format = "{icon}"; - format-alt = "{volume}%"; - format-muted = ""; - format-icons = ["" "" ""]; - tooltip = false; - }; }; } diff --git a/modules/niri/waybar.css.nix b/modules/niri/waybar.css.nix index 867baf5..40c4d89 100644 --- a/modules/niri/waybar.css.nix +++ b/modules/niri/waybar.css.nix @@ -32,19 +32,14 @@ in { background-color: ${background}; } - #clock, + #backlight, #battery, - #memory, + #clock, #network, - #temperature, #wireplumber { padding: 0 15px; } - #cpu { - padding: 0 0 0 15px; - } - /*-----Indicators----*/ #battery.charging { color: ${charging}; @@ -55,9 +50,5 @@ in { #battery.critical:not(.charging) { color: ${critical}; } - - #temperature.critical { - color: ${critical}; - } ''; }