diff --git a/hm/modules/common/shellenv/default.nix b/hm/modules/common/shellenv/default.nix index eaac8b4..9a5e97d 100644 --- a/hm/modules/common/shellenv/default.nix +++ b/hm/modules/common/shellenv/default.nix @@ -170,7 +170,6 @@ in enable = true; shellAliases = { ls = "eza -l --icons=auto"; - neofetch = "${pkgs.fastfetch}/bin/fastfetch"; }; interactiveShellInit = '' fish_vi_key_bindings diff --git a/hm/modules/linux/default.nix b/hm/modules/linux/default.nix index 3b99ac2..b3e842f 100755 --- a/hm/modules/linux/default.nix +++ b/hm/modules/linux/default.nix @@ -23,7 +23,7 @@ # nix flake update --commit-lock-file # doas nixos-rebuild --flake ~/.config/liminalOS\#${osConfig.networking.hostName} switch &| nom # ''; - spt = "${pkgs.spotify-player}/bin/spotify_player"; + spt = "${lib.getExe pkgs.spotify-player}"; }; home.file = lib.mkIf config.liminalOS.programs.enable { diff --git a/hm/modules/linux/desktop-environment/hyprland/binds.nix b/hm/modules/linux/desktop-environment/hyprland/binds.nix index 8d3ea11..86e5719 100644 --- a/hm/modules/linux/desktop-environment/hyprland/binds.nix +++ b/hm/modules/linux/desktop-environment/hyprland/binds.nix @@ -6,7 +6,7 @@ }: let cfg = config.liminalOS.desktop.hyprland; - hyprnome = "${pkgs.hyprnome}/bin/hyprnome"; + hyprnome = "${lib.getExe pkgs.hyprnome}"; in { wayland.windowManager.hyprland.settings = lib.mkIf cfg.enable { @@ -54,16 +54,16 @@ in "$mod, Z, exec, loginctl lock-session" # Media controls - ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t" - ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox play-pause" - ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox next" - ",XF86AudioRewind, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox previous" + ",XF86AudioMute, exec, ${lib.getExe pkgs.pamixer} -t" + ",XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox play-pause" + ",XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox next" + ",XF86AudioRewind, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox previous" "$mod, S, togglespecialworkspace" "$mod+Alt, S, movetoworkspacesilent, special" "$mod, Tab, workspace, previous" - ''$mod+Shift, P, exec, ${pkgs.grim}/bin/grim - | ${pkgs.swappy}/bin/swappy -f -'' # Screenshot full screen - ''$mod, P, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.swappy}/bin/swappy -f -'' # Screenshot + ''$mod+Shift, P, exec, ${lib.getExe pkgs.grim} - | ${lib.getExe pkgs.swappy} -f -'' # Screenshot full screen + ''$mod, P, exec, ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" - | ${lib.getExe pkgs.swappy} -f -'' # Screenshot ] ++ (lib.optionals config.liminalOS.programs.zen.enable [ "$mod, B, exec, zen" @@ -73,10 +73,10 @@ in ]) ++ (lib.optionals config.liminalOS.programs.enable [ # Application Keybinds - "$mod, R, exec, ${pkgs.pavucontrol}/bin/pavucontrol -t 3" # open pavucontrol on 'outputs' tab - "$mod, T, exec, ${pkgs.kitty}/bin/kitty" + "$mod, R, exec, ${lib.getExe pkgs.pavucontrol} -t 3" # open pavucontrol on 'outputs' tab + "$mod, T, exec, ${lib.getExe pkgs.kitty}" "$mod, E, exec, ${lib.getExe pkgs.nautilus}" - "$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird" + "$mod, M, exec, ${lib.getExe pkgs.thunderbird}" ]); bindm = [ @@ -84,10 +84,10 @@ in "$mod, mouse:273, resizewindow" ]; bindel = [ - ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-" - ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%+" - ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5" - ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5" + ",XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-" + ",XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set 5%+" + ",XF86AudioRaiseVolume, exec, ${lib.getExe pkgs.pamixer} -i 5" + ",XF86AudioLowerVolume, exec, ${lib.getExe pkgs.pamixer} -d 5" ]; binde = [ # Resize windows diff --git a/hm/modules/linux/desktop-environment/hyprland/utilities.nix b/hm/modules/linux/desktop-environment/hyprland/utilities.nix index 40b3fff..2ec99e3 100644 --- a/hm/modules/linux/desktop-environment/hyprland/utilities.nix +++ b/hm/modules/linux/desktop-environment/hyprland/utilities.nix @@ -18,7 +18,7 @@ in }; Service = { Type = "simple"; - ExecStart = "${pkgs.hyprsunset}/bin/hyprsunset"; + ExecStart = "${lib.getExe pkgs.hyprsunset}"; Restart = "on-failure"; RestartSec = 3; }; @@ -35,7 +35,7 @@ in programs.rofi = { enable = true; package = pkgs.rofi-wayland; - terminal = "${pkgs.kitty}/bin/kitty"; + terminal = "${lib.getExe pkgs.kitty}"; theme = let inherit (config.lib.formats.rasi) mkLiteral; @@ -156,7 +156,7 @@ in general = { lock_cmd = if cfg.screenlocker.useCrashFix then - "pidof hyprlock || ${pkgs.grim}/bin/grim -o ${config.programs.hyprlock.settings.background.monitor} /tmp/__hyprlock-monitor-screenshot.png && ${pkgs.hyprlock}/bin/hyprlock" + "pidof hyprlock || ${lib.getExe pkgs.grim} -o ${config.programs.hyprlock.settings.background.monitor} /tmp/__hyprlock-monitor-screenshot.png && ${lib.getExe pkgs.hyprlock}" else "pidof hyprlock || hyprlock"; before_sleep_cmd = "loginctl lock-session"; # lock before suspend. diff --git a/hm/modules/linux/desktop-environment/waybar/default.nix b/hm/modules/linux/desktop-environment/waybar/default.nix index e763c9e..237c6bc 100644 --- a/hm/modules/linux/desktop-environment/waybar/default.nix +++ b/hm/modules/linux/desktop-environment/waybar/default.nix @@ -86,8 +86,8 @@ in }; "hyprland/workspaces" = { disable-scroll = false; - on-scroll-down = "${pkgs.hyprnome}/bin/hyprnome"; - on-scroll-up = "${pkgs.hyprnome}/bin/hyprnome --previous"; + on-scroll-down = "${lib.getExe pkgs.hyprnome}"; + on-scroll-up = "${lib.getExe pkgs.hyprnome} --previous"; format = "{icon}"; on-click = "activate"; format-icons = { @@ -231,7 +231,7 @@ in ]; }; scroll-step = 5; - on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + on-click = "${lib.getExe pkgs.pavucontrol}"; }; "custom/launcher" = let @@ -283,7 +283,7 @@ in { format = ""; on-click = "pkill -9 rofi || rofi -show drun"; - on-click-right = "${toggle-colorscheme}/bin/toggle-colorscheme.sh"; + on-click-right = "${lib.getExe toggle-colorscheme}"; tooltip = "false"; }; }; diff --git a/hm/modules/linux/programs/default.nix b/hm/modules/linux/programs/default.nix index 7a15309..10e7d1d 100644 --- a/hm/modules/linux/programs/default.nix +++ b/hm/modules/linux/programs/default.nix @@ -88,6 +88,6 @@ in pkgs.zen-browser ]; - home.sessionVariables.DEFAULT_BROWSER = lib.mkIf cfg.zen.enable "${pkgs.zen-browser}/bin/zen"; + home.sessionVariables.DEFAULT_BROWSER = lib.mkIf cfg.zen.enable "${lib.getExe pkgs.zen-browser}"; }; }