diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index aaf9e1f..6d5f6d5 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -61,12 +61,19 @@ in keybinds = { bind = [ "$mod, A, exec, chromium --app=\"https://music.apple.com\"" + + "SHIFT, XF86MonBrightnessUp, exec, lightctl -D kbd_backlight up" + "SHIFT, XF86MonBrightnessDown, exec, lightctl -D kbd_backlight down" ]; }; defaultApps = { browser = pkgs.firefox; }; + + extraConfig = '' + exec-once = brightnessctl -d kbd_backlight s 50% + ''; }; programs = { btop = enabled; diff --git a/modules/home/programs/hyprland/avizo.nix b/modules/home/programs/hyprland/avizo.nix new file mode 100644 index 0000000..fc536ef --- /dev/null +++ b/modules/home/programs/hyprland/avizo.nix @@ -0,0 +1,20 @@ +{ config, namespace, lib, ... }: +let + cfg = config.${namespace}.programs.hyprland; +in +{ + config = lib.mkIf cfg.enable { + services.avizo = { + enable = true; + settings = { + default = { + time = 1.0; + y-offset = 0.5; + fade-in = 0.1; + fade-out = 0.2; + padding = 10; + }; + }; + }; + }; +} \ No newline at end of file diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index db22b50..f5033be 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -12,6 +12,7 @@ let in { imports = [ + ./avizo.nix ./options.nix ]; @@ -419,23 +420,20 @@ in ++ cfg.keybinds.bindm; bindel = [ - ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ", XF86AudioRaiseVolume, exec, volumectl -u up" + ", XF86AudioLowerVolume, exec, volumectl -u down" ] ++ cfg.keybinds.bindel; bindl = [ - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ", XF86AudioMute, exec, volumectl toggle-mute" ", XF86AudioPlay, exec, playerctl play-pause" ", XF86AudioPrev, exec, playerctl previous" ", XF86AudioNext, exec, playerctl next" - ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ", XF86AudioMicMute, exec, volumectl -m toggle-mute" - ", XF86MonBrightnessUp, exec, brightnessctl set +5%" - ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" - - "$mod, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight set +10%" - "$mod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight set 10%-" + ", XF86MonBrightnessUp, exec, lightctl up" + ", XF86MonBrightnessDown, exec, lightctl down" ] ++ cfg.keybinds.bindl; diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index 310c162..3b57ad0 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -117,7 +117,6 @@ cabextract erofs-utils fex - light micro muvm squashfuse