diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix index e94bc11..e225f57 100644 --- a/modules/wms/wayland/hyprland/binds.nix +++ b/modules/wms/wayland/hyprland/binds.nix @@ -6,7 +6,7 @@ }: let cfg = config.modules.desktops.hyprland; inherit (builtins) map genList toString; - inherit (lib.meta) getExe; + inherit (lib.meta) getExe getExe'; in { programs.hyprland.settings = { # Keybinds @@ -71,11 +71,14 @@ in { # Media controls bindl = let - play-pause = "${pkgs.playerctl}/bin/playerctl play-pause"; - stop = "${pkgs.playerctl}/bin/playerctl stop"; - prev = "${pkgs.playerctl}/bin/playerctl previous"; - next = "${pkgs.playerctl}/bin/playerctl next"; - toggle-mute = "${pkgs.pamixer}/bin/pamixer --toggle-mute"; + volumectl = getExe' pkgs.avizo "volumectl"; + playerctl = getExe pkgs.playerctl; + play-pause = "${playerctl} play-pause"; + stop = "${playerctl} stop"; + prev = "${playerctl} previous"; + next = "${playerctl} next"; + toggle-mute = "${volumectl} toggle-mute"; + toggle-mic-mute = "${volumectl} toggle-mute"; in [ ", XF86AudioMedia, exec, ${play-pause}" ", XF86AudioPlay, exec, ${play-pause}" @@ -83,14 +86,17 @@ in { ", XF86AudioPrev, exec, ${prev}" ", XF86AudioNext, exec, ${next}" ", XF86AudioMute, exec, ${toggle-mute}" + ", XF86AudioMicMute, exec, ${toggle-mic-mute}" ]; # locked + repeat bindle = let - volume_up = "${pkgs.pamixer}/bin/pamixer -ui 5"; - volume_down = "${pkgs.pamixer}/bin/pamixer -ud 5"; - brightness_up = "${pkgs.brightnessctl}/bin/brightnessctl set +10%"; - brightness_down = "${pkgs.brightnessctl}/bin/brightnessctl set 10%-"; + volumectl = getExe' pkgs.avizo "volumectl"; + lightctl = getExe' pkgs.avizo "lightctl"; + volume_up = "${volumectl} -u up"; + volume_down = "${volumectl} -u down"; + brightness_up = "${lightctl} up"; + brightness_down = "${lightctl} down"; in [ ", XF86AudioRaiseVolume, exec, ${volume_up}" ", XF86AudioLowerVolume, exec, ${volume_down}" diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix index 76d925b..04d2c77 100644 --- a/modules/wms/wayland/hyprland/exec.nix +++ b/modules/wms/wayland/hyprland/exec.nix @@ -17,6 +17,8 @@ in { "${pkgs.swww}/bin/swww-daemon" + "${pkgs.avizo}/bin/avizo-service" + "${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00" "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent" "hyprctl dispatch split-workspace 1"