diff --git a/modules/ewwbar/default.nix b/modules/ewwbar/default.nix index e8bb480..0e35cd8 100644 --- a/modules/ewwbar/default.nix +++ b/modules/ewwbar/default.nix @@ -8,7 +8,7 @@ in home.packages = with pkgs; [ alsa-utils gcal - jq + jaq playerctl pw-volume socat diff --git a/modules/ewwbar/eww-config/eww.yuck b/modules/ewwbar/eww-config/eww.yuck index 5cb31ad..ff689d4 100644 --- a/modules/ewwbar/eww-config/eww.yuck +++ b/modules/ewwbar/eww-config/eww.yuck @@ -152,7 +152,7 @@ {music != "" ? "🎵${music}" : ""})) (defpoll volume :interval "1s" - {"pw-volume status | jq '.percentage // -1'" ?: 500}) + {"pw-volume status | jaq '.percentage // -1'" ?: 500}) (include "windows.yuck") (include "./modules/center-clock.yuck") diff --git a/modules/hyprland/keybinds.nix b/modules/hyprland/keybinds.nix index 003429c..21cc39c 100644 --- a/modules/hyprland/keybinds.nix +++ b/modules/hyprland/keybinds.nix @@ -23,8 +23,8 @@ in # binde, will repeat when held #https://wiki.hyprland.org/Configuring/Binds/#bind-flags binde = [ - ",XF86AudioRaiseVolume, exec, pw-volume change +1%; ${pkgs.eww}/bin/eww update volume=$(pw-volume status | jq '.percentage // 10')" - ",XF86AudioLowerVolume, exec, pw-volume change -1%; ${pkgs.eww}/bin/eww update volume=$(pw-volume status | jq '.percentage // 10')" + ",XF86AudioRaiseVolume, exec, pw-volume change +1%; ${pkgs.eww}/bin/eww update volume=$(pw-volume status | jaq '.percentage // 10')" + ",XF86AudioLowerVolume, exec, pw-volume change -1%; ${pkgs.eww}/bin/eww update volume=$(pw-volume status | jaq '.percentage // 10')" ]; # listen even when locked diff --git a/modules/zsh.nix b/modules/zsh.nix index 885805c..aa7bdfe 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -42,6 +42,7 @@ in shellAliases = { cat = "bat"; ls = "eza"; + jq = "jaq"; gust = "/home/nixolas/Documents/Gust/target/debug/gust"; rm = "rmtrash"; open-config = "cd ~/Documents/nicks-nix-config; nvim";