diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index b72ad68..c1860ef 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -20,6 +20,10 @@ pkgs.cliphist pkgs.wl-clipboard (pkgs.writeScriptBin "clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy") + + pkgs.playerctl + pkgs.brightnessctl + pkgs.grimblast ]; wayland.windowManager.hyprland = { diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix index 0b8d3b2..d738ead 100644 --- a/modules/home/de/hyprland/keybinds.nix +++ b/modules/home/de/hyprland/keybinds.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, lib, ... }: { config = lib.mkIf config.myConfig.de.hyprland.enable { wayland.windowManager.hyprland.extraConfig = '' @@ -78,9 +73,9 @@ # Control media ${ let - play-pause = "${lib.getExe pkgs.playerctl} --ignore-player=brave play-pause"; - play-next = "${lib.getExe pkgs.playerctl} --ignore-player=brave next"; - play-previous = "${lib.getExe pkgs.playerctl} --ignore-player=brave previous"; + play-pause = "playerctl --ignore-player=brave play-pause"; + play-next = "playerctl --ignore-player=brave next"; + play-previous = "playerctl --ignore-player=brave previous"; mute = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; volume-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; volume-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; @@ -103,12 +98,12 @@ } # Adjust brightness - bindel = , XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -e set +2% - bindel = , XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -e set 2%- + bindel = , XF86MonBrightnessUp, exec, brightnessctl -e set +2% + bindel = , XF86MonBrightnessDown, exec, brightnessctl -e set 2%- # Screenshot - bind = , Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave output - bind = SHIFT, Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area + bind = , Print, exec, grimblast --notify --freeze copysave output + bind = SHIFT, Print, exec, grimblast --notify --freeze copysave area # Escape special workspace ${lib.concatMapStringsSep "\n" (n: "bind = SUPER, ${toString n}, togglespecialworkspace, blank") ( diff --git a/modules/home/shell/aliases.nix b/modules/home/shell/aliases.nix index 2f315ec..d3f6b8a 100644 --- a/modules/home/shell/aliases.nix +++ b/modules/home/shell/aliases.nix @@ -6,6 +6,11 @@ }: { config = lib.mkIf config.myConfig.shell.enable { + home.packages = [ + pkgs.eza + pkgs.bat + ]; + home.shellAliases = let nixAliases = @@ -49,7 +54,7 @@ }; convertAliasToCmd = str: - "${lib.getExe pkgs.eza} --header --group --time-style=long-iso --group-directories-first --sort=name --icons=auto --git --git-repos-no-status --binary " + "eza --header --group --time-style=long-iso --group-directories-first --sort=name --icons=auto --git --git-repos-no-status --binary " + (builtins.replaceStrings [ "ll" @@ -82,7 +87,7 @@ .${config.myConfig.de.theme}; in { - cat = "${lib.getExe pkgs.bat} --plain --theme=${theme}"; + cat = "bat --plain --theme=${theme}"; }; in lib.mkMerge [