diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index e2a2710..02ca99e 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -35,6 +35,7 @@ pipewire = { enable = true; pulse.enable = true; + wireplumber.enable = true; }; udev = { diff --git a/users/daniel/configs/desktop/hyprland/hyprland.conf b/users/daniel/configs/desktop/hyprland/hyprland.conf index 76c861d..019e6c2 100644 --- a/users/daniel/configs/desktop/hyprland/hyprland.conf +++ b/users/daniel/configs/desktop/hyprland/hyprland.conf @@ -135,6 +135,10 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod, U, movetoworkspace, -1 bind = $mainMod, I, movetoworkspace, +1 +binde=, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- +bind=, XF86AudioMute, exec, wpctl set-mute -l 1.0 @DEFAULT_AUDIO_SINK@ toggle +binde=, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ + # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow diff --git a/users/daniel/configs/desktop/waybar/config.json b/users/daniel/configs/desktop/waybar/config.json index 2119782..fbdbd8d 100644 --- a/users/daniel/configs/desktop/waybar/config.json +++ b/users/daniel/configs/desktop/waybar/config.json @@ -3,6 +3,7 @@ "modules-left": ["wlr/workspaces", "hyprland/window"], "modules-center": ["clock"], "modules-right": [ + "pulseaudio", "network", "battery", "tray" @@ -22,5 +23,20 @@ }, "clock": { "format-alt": "{:%a, %d. %b %H:%M}" + }, + "pulseaudio": { + "format": "󰕾{icon} {volume}%", + "format-muted": "", + "format-icons": { + "default": [ + "󰣾", + "󰣴", + "󰣶", + "󰣸", + "󰣺" + ] + }, + "max-volume": 100, + "on-click": "pavucontrol" } }