diff --git a/config/waybar.css b/config/waybar.css index 68d1fb5..0dd5959 100644 --- a/config/waybar.css +++ b/config/waybar.css @@ -99,6 +99,10 @@ window#waybar.floating #window { color: @maroon; } +#network { + color: @sapphire; +} + #pulseaudio { color: @pink; } diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 0e619e8..9c4e939 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -49,11 +49,11 @@ in { orientation = "inherit"; modules = [ "pulseaudio" + #"network" "cpu" "memory" "power-profiles-daemon" "battery" - #"network" ]; }; "group/power" = { @@ -141,6 +141,17 @@ in { }; separate-outputs = true; }; + #network = { + # format = ""; + # format-ethernet = ""; + # format-wifi = " {signalStrength}%"; + # format-disconnected = ""; + # tooltip-format = "{ifname} via {gwaddr}"; + # tooltip-format-wifi = "connected to {essid}"; + # tooltip-format-ethernet = "{ifname}"; + # tooltip-format-disconnected = "Disconnected"; + # on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + #}; pulseaudio = { format = "{icon} {volume}%"; format-bluetooth = "{icon} {volume}%"; @@ -167,6 +178,17 @@ in { format = " {percentage}%"; tooltip-format = "{used:0.1f}GiB/{avail:0.1f}GiB used\n{swapUsed:0.1f}GiB/{swapAvail:0.1f}GiB swap"; }; + power-profiles-daemon = { + format = "{icon}"; + tooltip-format = "Power profile: {profile}\nDriver: {driver}"; + tooltip = true; + format-icons = { + default = ""; + performance = " perf"; + balanced = " balance"; + power-saver = " save"; + }; + }; battery = { interval = 30; states = { @@ -206,17 +228,6 @@ in { }; }; }; - power-profiles-daemon = { - format = "{icon}"; - tooltip-format = "Power profile: {profile}\nDriver: {driver}"; - tooltip = true; - format-icons = { - default = ""; - performance = " perf"; - balanced = " balance"; - power-saver = " save"; - }; - }; }; }; };