aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-09-23 19:20:19 -0700
committerFranck Cuny <franck@fcuny.net>2022-09-23 19:20:19 -0700
commitaf37a9b65c1597d9347a9fc267b6fe998669e2cd (patch)
treef0cf205ae77792ace5756849346d521d4e8aaaeb
parentfeat(flake): add nix-linter to the checks (diff)
downloadinfra-af37a9b65c1597d9347a9fc267b6fe998669e2cd.tar.gz
fix(home/waybar): fix the configuration after 22.05
The configuration for the modules has changed as of 22.05 (see [1]). This change is to remove the `modules` section from the settings. [1] https://github.com/nix-community/home-manager/commit/7c320a53254609d9814280a34e312b7f00fd160b
-rw-r--r--home/wm/waybar/default.nix56
1 files changed, 27 insertions, 29 deletions
diff --git a/home/wm/waybar/default.nix b/home/wm/waybar/default.nix
index 1aab182..e712585 100644
--- a/home/wm/waybar/default.nix
+++ b/home/wm/waybar/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
let isEnabled = config.my.home.wm.windowManager == "sway";
in
{
@@ -16,35 +16,33 @@ in
margin-bottom = 0;
modules-left = [ "sway/workspaces" "sway/mode" ];
modules-right = [ "pulseaudio" "network" "battery" "clock" "tray" ];
- modules = {
- "sway/workspaces" = { format = "{name}"; };
- "sway/mode" = { format = "{}"; };
- tray = { spacing = 10; };
- clock = { format = "{: %a %b %d %R}"; };
- battery = {
- states = {
- warning = 30;
- critical = 15;
- };
- format = "ac:{capacity}%";
- tooltip = true;
- tooltip-format = "{timeTo} ({capacity}%)";
- };
- pulseaudio = {
- format = "vol:{volume}%";
- format-bluetooth = "bt:{volume}%";
- format-bluetooth-muted = "bt:{volume}%";
- format-muted = "vol:{volume}%";
- on-click = "pavucontrol";
- };
- "network" = {
- format-wifi = "{essid}:{signalStrength}%";
- format-ethernet = "{ipaddr}/{cidr}";
- format-linked = "{ifname} (No IP)";
- format-disconnected = "network unavailable";
- format-alt = "{ifname}: {ipaddr}/{cidr}";
- tooltip = false;
+ "sway/workspaces" = { format = "{name}"; };
+ "sway/mode" = { format = "{}"; };
+ tray = { spacing = 10; };
+ clock = { format = "{: %a %b %d %R}"; };
+ battery = {
+ states = {
+ warning = 30;
+ critical = 15;
};
+ format = "ac:{capacity}%";
+ tooltip = true;
+ tooltip-format = "{timeTo} ({capacity}%)";
+ };
+ pulseaudio = {
+ format = "vol:{volume}%";
+ format-bluetooth = "bt:{volume}%";
+ format-bluetooth-muted = "bt:{volume}%";
+ format-muted = "vol:{volume}%";
+ on-click = "pavucontrol";
+ };
+ "network" = {
+ format-wifi = "{essid}:{signalStrength}%";
+ format-ethernet = "{ipaddr}/{cidr}";
+ format-linked = "{ifname} (No IP)";
+ format-disconnected = "network unavailable";
+ format-alt = "{ifname}: {ipaddr}/{cidr}";
+ tooltip = false;
};
}];
style = (builtins.readFile ./style.css);