diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix index 5448024..45e3e90 100644 --- a/home-manager/progs/waybar.nix +++ b/home-manager/progs/waybar.nix @@ -18,6 +18,7 @@ "cpu" "memory" "tray" + "bluetooth" "pulseaudio" "network" "battery" @@ -63,8 +64,10 @@ on-scroll-down = "shift_down"; }; }; + network = { format-wifi = " {icon}"; + tooltip-format-wifi = "{essid} ({signalStrength}%)"; format-ethernet = "  "; format-disconnected = "󰌙 "; format-icons = [ @@ -74,7 +77,9 @@ "󰤢 " "󰤨 " ]; + # tooltip = false; }; + battery = { states = { good = 95; @@ -99,12 +104,13 @@ "󰁹" ]; }; - # not actually pulseaudio-specific + + # not actually pulseaudio-specific (I use pipewire!) pulseaudio = { max-volume = 100; scroll-step = 10; format = "{icon}"; - tooltip-format = "{volume}%"; + tooltip-format = "{desc} ({volume}%)"; format-muted = "🔇"; format-icons = { default = [ @@ -115,6 +121,17 @@ }; on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; }; + + bluetooth = { + format = " ({status}) "; + format-connected = " {device_alias}"; + format-connected-battery = " {device_alias} {device_battery_percentage}%"; + tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; + tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; + tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; + tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; }; style = '' diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 98d28a3..4761f45 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -23,8 +23,19 @@ config.programs.niri.package ]; - # bluetooth manager - services.blueman-applet.enable = true; + # # bluetooth manager + # services.blueman-applet.enable = true; + + # bluetooth media controls + systemd.user.services.mpris-proxy = { + Unit.Description = "Mpris proxy"; + Install.After = [ + "network.target" + "sound.target" + ]; + Install.WantedBy = [ "default.target" ]; + Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; + }; # notification daemon services.dunst = {