youwen/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/liminalOS.git synced 2025-06-19 21:49:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

chore: use lib.getExe wherever possible

Browse source
This commit is contained in:
Youwen Wu 2025-06-01 22:14:57 -07:00
parent 63d4a1b452
commit 2f48a2c279
Signed by: youwen
GPG key ID: 865658ED1FE61EC3
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hm/modules/common/shellenv/default.nix
View file

@ -170,7 +170,6 @@ in
enable = true; enable = true;
shellAliases = { shellAliases = {
ls = "eza -l --icons=auto"; ls = "eza -l --icons=auto";
neofetch = "${pkgs.fastfetch}/bin/fastfetch";
}; };
interactiveShellInit = '' interactiveShellInit = ''
fish_vi_key_bindings fish_vi_key_bindings

2
hm/modules/linux/default.nix
View file

@ -23,7 +23,7 @@
# nix flake update --commit-lock-file # nix flake update --commit-lock-file
# doas nixos-rebuild --flake ~/.config/liminalOS\#${osConfig.networking.hostName} switch &| nom # 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 { home.file = lib.mkIf config.liminalOS.programs.enable {

28
hm/modules/linux/desktop-environment/hyprland/binds.nix
View file

@ -6,7 +6,7 @@
}: }:
let let
cfg = config.liminalOS.desktop.hyprland; cfg = config.liminalOS.desktop.hyprland;
hyprnome = "${pkgs.hyprnome}/bin/hyprnome"; hyprnome = "${lib.getExe pkgs.hyprnome}";
in in
{ {
wayland.windowManager.hyprland.settings = lib.mkIf cfg.enable { wayland.windowManager.hyprland.settings = lib.mkIf cfg.enable {
@ -54,16 +54,16 @@ in
"$mod, Z, exec, loginctl lock-session" "$mod, Z, exec, loginctl lock-session"
# Media controls # Media controls
",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t" ",XF86AudioMute, exec, ${lib.getExe pkgs.pamixer} -t"
",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox play-pause" ",XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox play-pause"
",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox next" ",XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox next"
",XF86AudioRewind, exec, ${pkgs.playerctl}/bin/playerctl --player=%any,firefox previous" ",XF86AudioRewind, exec, ${lib.getExe pkgs.playerctl} --player=%any,firefox previous"
"$mod, S, togglespecialworkspace" "$mod, S, togglespecialworkspace"
"$mod+Alt, S, movetoworkspacesilent, special" "$mod+Alt, S, movetoworkspacesilent, special"
"$mod, Tab, workspace, previous" "$mod, Tab, workspace, previous"
''$mod+Shift, P, exec, ${pkgs.grim}/bin/grim - | ${pkgs.swappy}/bin/swappy -f -'' # Screenshot full screen ''$mod+Shift, P, exec, ${lib.getExe pkgs.grim} - | ${lib.getExe pkgs.swappy} -f -'' # Screenshot full screen
''$mod, P, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.swappy}/bin/swappy -f -'' # Screenshot ''$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 [ ++ (lib.optionals config.liminalOS.programs.zen.enable [
"$mod, B, exec, zen" "$mod, B, exec, zen"
@ -73,10 +73,10 @@ in
]) ])
++ (lib.optionals config.liminalOS.programs.enable [ ++ (lib.optionals config.liminalOS.programs.enable [
# Application Keybinds # Application Keybinds
"$mod, R, exec, ${pkgs.pavucontrol}/bin/pavucontrol -t 3" # open pavucontrol on 'outputs' tab "$mod, R, exec, ${lib.getExe pkgs.pavucontrol} -t 3" # open pavucontrol on 'outputs' tab
"$mod, T, exec, ${pkgs.kitty}/bin/kitty" "$mod, T, exec, ${lib.getExe pkgs.kitty}"
"$mod, E, exec, ${lib.getExe pkgs.nautilus}" "$mod, E, exec, ${lib.getExe pkgs.nautilus}"
"$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird" "$mod, M, exec, ${lib.getExe pkgs.thunderbird}"
]); ]);
bindm = [ bindm = [
@ -84,10 +84,10 @@ in
"$mod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"
]; ];
bindel = [ bindel = [
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-" ",XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-"
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%+" ",XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set 5%+"
",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5" ",XF86AudioRaiseVolume, exec, ${lib.getExe pkgs.pamixer} -i 5"
",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5" ",XF86AudioLowerVolume, exec, ${lib.getExe pkgs.pamixer} -d 5"
]; ];
binde = [ binde = [
# Resize windows # Resize windows

6
hm/modules/linux/desktop-environment/hyprland/utilities.nix
View file

@ -18,7 +18,7 @@ in
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = "${pkgs.hyprsunset}/bin/hyprsunset"; ExecStart = "${lib.getExe pkgs.hyprsunset}";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 3; RestartSec = 3;
}; };
@ -35,7 +35,7 @@ in
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = "${pkgs.kitty}/bin/kitty"; terminal = "${lib.getExe pkgs.kitty}";
theme = theme =
let let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
@ -156,7 +156,7 @@ in
general = { general = {
lock_cmd = lock_cmd =
if cfg.screenlocker.useCrashFix then 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 else
"pidof hyprlock || hyprlock"; "pidof hyprlock || hyprlock";
before_sleep_cmd = "loginctl lock-session"; # lock before suspend. before_sleep_cmd = "loginctl lock-session"; # lock before suspend.

8
hm/modules/linux/desktop-environment/waybar/default.nix
View file

@ -86,8 +86,8 @@ in
}; };
"hyprland/workspaces" = { "hyprland/workspaces" = {
disable-scroll = false; disable-scroll = false;
on-scroll-down = "${pkgs.hyprnome}/bin/hyprnome"; on-scroll-down = "${lib.getExe pkgs.hyprnome}";
on-scroll-up = "${pkgs.hyprnome}/bin/hyprnome --previous"; on-scroll-up = "${lib.getExe pkgs.hyprnome} --previous";
format = "{icon}"; format = "{icon}";
on-click = "activate"; on-click = "activate";
format-icons = { format-icons = {
@ -231,7 +231,7 @@ in
]; ];
}; };
scroll-step = 5; scroll-step = 5;
on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; on-click = "${lib.getExe pkgs.pavucontrol}";
}; };
"custom/launcher" = "custom/launcher" =
let let
@ -283,7 +283,7 @@ in
{ {
format = ""; format = "";
on-click = "pkill -9 rofi || rofi -show drun"; 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"; tooltip = "false";
}; };
}; };

2
hm/modules/linux/programs/default.nix
View file

@ -88,6 +88,6 @@ in
pkgs.zen-browser 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}";
}; };
} }