diff options
| -rw-r--r-- | modules/graphical/polybar/bar/main.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/default.nix | 11 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/battery.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/default.nix | 1 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/volume.nix | 13 |
5 files changed, 20 insertions, 9 deletions
diff --git a/modules/graphical/polybar/bar/main.nix b/modules/graphical/polybar/bar/main.nix index c52c3f7..326b768 100644 --- a/modules/graphical/polybar/bar/main.nix +++ b/modules/graphical/polybar/bar/main.nix @@ -40,5 +40,5 @@ in { modules-left = "bspwm separator"; modules-center = "xwindow"; - modules-right = "separator memory cpu battery time date kernel-version"; + modules-right = "separator volume battery time memory cpu date"; } diff --git a/modules/graphical/polybar/default.nix b/modules/graphical/polybar/default.nix index a181779..d96c2ae 100644 --- a/modules/graphical/polybar/default.nix +++ b/modules/graphical/polybar/default.nix @@ -3,13 +3,10 @@ { config = lib.mkIf config.graphical.enable { services.polybar.enable = true; - home.packages = with pkgs; [ - coreutils - ]; - services.polybar.script = " -export PATH=${pkgs.coreutils}/bin/:$PATH -${config.services.polybar.package}/bin/polybar main & -"; + services.polybar.package = (pkgs.polybar.override { + pulseSupport = true; + }); + services.polybar.script = "${config.services.polybar.package}/bin/polybar main &"; services.polybar.config = lib.mkMerge [ (import ./bar { inherit config lib; }) (import ./module { inherit config lib; }) diff --git a/modules/graphical/polybar/module/battery.nix b/modules/graphical/polybar/module/battery.nix index 6e25e99..5787f24 100644 --- a/modules/graphical/polybar/module/battery.nix +++ b/modules/graphical/polybar/module/battery.nix @@ -3,7 +3,7 @@ with config.scheme.withHashtag; { type = "internal/battery"; - battery = "BAT0"; + battery = "BAT1"; adapter = "ADP1"; format-charging = "%{T2}%{F${base03}}<animation-charging>%{F-}%{T-} <label-charging>"; diff --git a/modules/graphical/polybar/module/default.nix b/modules/graphical/polybar/module/default.nix index ffd161a..fc57f52 100644 --- a/modules/graphical/polybar/module/default.nix +++ b/modules/graphical/polybar/module/default.nix @@ -8,6 +8,7 @@ "module/memory" = import ./memory.nix { inherit config; }; "module/date" = import ./date.nix { inherit config; }; "module/time" = import ./time.nix { inherit config; }; + "module/volume" = import ./volume.nix { inherit config; }; "module/battery" = import ./battery.nix { inherit config; }; "module/kernel-version" = import ./kernel-version.nix { inherit config; }; } diff --git a/modules/graphical/polybar/module/volume.nix b/modules/graphical/polybar/module/volume.nix new file mode 100644 index 0000000..e3eb758 --- /dev/null +++ b/modules/graphical/polybar/module/volume.nix @@ -0,0 +1,13 @@ +{ config }: + +with config.scheme.withHashtag; +{ + type = "internal/pulseaudio"; + interval = 5; + format-volume = "<ramp-volume> <label-volume>"; + label-volume = "%percentage%%"; + label-muted = " "; + ramp-volume-0 = " "; + ramp-volume-1 = " "; + ramp-volume-2 = " "; +} |