s0me1newithhand7s/reNixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hand7s: migrate from ${pkgs}/bin/ paths to ${lib.getExe pkgs}

Browse source 
Signed-off-by: s0me1newithhand7s <117505144+s0me1newithhand7s@users.noreply.github.com>
This commit is contained in:
s0me1newithhand7s 2025-06-13 13:06:24 +03:00
parent fc182636e3
commit e897fb4e87
No known key found for this signature in database
13 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hand7s/programs/fuzzel.nix
View file

@ -1,9 +1,9 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
programs = {
fuzzel = {
settings = {
main = {
terminal = "${pkgs.ghostty}/bin/ghostty";
terminal = "${lib.getExe pkgs.ghostty}";
layer = "overlay";
prompt = " > ";
};

4
hand7s/programs/ghostty.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
programs = {
ghostty = {
enableFishIntegration = true;
@ -6,7 +6,7 @@
settings = {
title = "spooky scary tty";
command = "${pkgs.fish}/bin/fish --login --interactive";
command = "${lib.getExe pkgs.fish} --login --interactive";
confirm-close-surface = false;

6
hand7s/programs/helix.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
programs = {
helix = {
enable = true;
@ -22,7 +22,7 @@
languages = {
language-servers = {
nixd = {
command = "${pkgs.nixd}/bin/nixd";
command = "${lib.getExe pkgs.nixd}";
args = [
"--inlay-hints=true"
];
@ -40,7 +40,7 @@
};
formatter = {
command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt-rfc-style";
command = "${lib.getExe pkgs.nixfmt-rfc-style}";
args = [
"--indent=4"
];

28
hand7s/programs/hyprpanel.nix
View file

@ -61,12 +61,12 @@
scalingPriority = "hyprland";
tear = false;
terminal = "${pkgs.ghostty}/bin/ghostty";
terminal = "${lib.getExe pkgs.ghostty}";
dummy = true;
hyprpanel = {
restartAgs = true;
restartCommand = "${pkgs.systemd}/bin/systemctl --user restart hyprpanel.service";
restartCommand = "${lib.getExe' pkgs.systemd "systemctl"} --user restart hyprpanel.service";
};
bar = {
@ -116,9 +116,9 @@
volume = {
label = true;
scrollDown = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
scrollUp = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
rightClick = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
scrollDown = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-";
scrollUp = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+";
rightClick = "${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle";
};
windowtitle = {
@ -225,7 +225,7 @@
icon = "󰌌";
label = true;
labelType = "code";
rightClick = "${pkgs.hyprland}/bin/hyprctl switchxkblayout monsgeek-monsgeek-keyboard next";
rightClick = "${lib.getExe' pkgs.hyprland "hyprctl"} switchxkblayout monsgeek-monsgeek-keyboard next";
};
netstat = {
@ -321,7 +321,7 @@
shortcuts = {
left = {
shortcut1 = {
command = "${pkgs.google-chrome}/bin/google-chrome-stable";
command = "${lib.getExe pkgs.google-chrome}";
icon = "";
tooltip = "Google Chrome";
};
@ -333,7 +333,7 @@
};
shortcut3 = {
command = "${pkgs.discord}/bin/discord";
command = "${lib.getExe pkgs.discord}";
icon = "";
tooltip = "Discord";
};
@ -347,13 +347,13 @@
right = {
shortcut1 = {
command = "${pkgs.fuzzel}/bin/fuzzel";
command = "${lib.getExe pkgs.fuzzel}";
icon = "";
tooltip = "Search";
};
shortcut3 = {
command = "sleep 2; ${pkgs.grimblast}/bin/grimblast --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
command = "sleep 2; ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
icon = "󰄀";
tooltip = "Screenshot";
};
@ -389,10 +389,10 @@
power = {
confirmation = true;
showLabel = true;
logout = "${pkgs.hyprland}hyprctl dispatch exit";
reboot = "${pkgs.systemd}/bin/systemctl reboot";
shutdown = "${pkgs.systemd}/bin/systemctl poweroff";
sleep = "${pkgs.systemd}/bin/systemctl suspend";
logout = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch exit";
reboot = "${lib.getExe' pkgs.systemd "systemctl"} reboot";
shutdown = "${lib.getExe' pkgs.systemd "systemctl"} poweroff";
sleep = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
};
volume = {

8
hand7s/programs/yazi.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
programs = {
yazi = {
enable = true;
@ -26,7 +26,7 @@
opener = {
play = [
{
run = "${pkgs.mpv}/bin/mpv ''$@''";
run = "${lib.getExe pkgs.mpv} ''$@''";
block = true;
for = "unix";
}
@ -34,7 +34,7 @@
edit = [
{
run = "${pkgs.helix}/bin/hx ''$@''";
run = "${lib.getExe pkgs.helix} ''$@''";
block = true;
for = "unix";
}
@ -42,7 +42,7 @@
open = [
{
run = "${pkgs.xdg-utils}/bin/xdg-open ''$@''";
run = "${lib.getExe' pkgs.xdg-utils "xdg-open"} ''$@''";
block = true;
for = "unix";
}

12
hand7s/services/hypridle.nix
View file

@ -13,25 +13,25 @@
settings = {
general = {
before_sleep_cmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";
after_sleep_cmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
before_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms off";
after_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms on";
};
listener = [
{
timeout = 300;
on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 10";
on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r";
on-timeout = "${lib.getExe pkgs.brightnessctl} -s set 10";
on-resume = "${lib.getExe pkgs.brightnessctl} -r";
}
{
timeout = 600;
on-timeout = "${pkgs.hyprlock}/bin/hyprlock";
on-timeout = "${lib.getExe pkgs.hyprlock}";
}
{
timeout = 900;
on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
on-timeout = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
}
];
};

14
hand7s/services/swayidle.nix
View file

@ -14,35 +14,35 @@
events = [
{
event = "lock";
command = "${pkgs.swaylock}/bin/swaylock";
command = "${lib.getExe pkgs.swaylock}";
}
{
event = "before-sleep";
command = "${pkgs.sway}/bin/swaymsg 'output * power off'";
command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'";
}
{
event = "after-resume";
command = "${pkgs.sway}/bin/swaymsg 'output * power on'";
command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power on'";
}
];
timeouts = [
{
timeout = 300;
command = "${pkgs.brightnessctl}/bin/brightnessctl -s set 10";
resumeCommand = "${pkgs.brightnessctl}/bin/brightnessctl -r";
command = "${libgetExe pkgs.brightnessctl} -s set 10";
resumeCommand = "${libgetExe pkgs.brightnessctl} -r";
}
{
timeout = 600;
command = "${pkgs.swaylock}/bin/swaylock";
command = "${lib.getExe pkgs.swaylock}";
}
{
timeout = 900;
command = "${pkgs.systemd}/bin/systemctl suspend";
command = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
}
];
};

4
hand7s/systemd/hyprpanel-service.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
systemd = {
user = {
services = {
@ -9,7 +9,7 @@
};
Service = {
ExecStart = "${pkgs.hyprpanel}/bin/hyprpanel";
ExecStart = "${lib.getExe pkgs.hyprpanel}";
Restart = "always";
RestartSec = 1;
};

4
hand7s/systemd/hyprpolkitagent-service.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
systemd = {
user = {
services = {
@ -9,7 +9,7 @@
};
Service = {
ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent";
ExecStart = "${lib.getExe pkgs.hyprpolkitagent}";
Restart = "always";
RestartSec = 10;
};

4
hand7s/systemd/yambar-service.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs,lib, ...}: {
systemd = {
user = {
services = {
@ -9,7 +9,7 @@
};
Service = {
ExecStart = "${pkgs.yambar}/bin/yambar";
ExecStart = "${lib.getExe pkgs.yambar}";
Restart = "always";
RestartSec = 1;
};

32
hand7s/wayland/hyprland.nix
View file

@ -99,22 +99,22 @@
};
exec-once = [
"${pkgs.systemd}/bin/systemctl --user start hyprpaper.service"
"${pkgs.systemd}/bin/systemctl --user start hypridle.service"
"${pkgs.systemd}/bin/systemctl --user start hyprpolkitagent.service"
"${pkgs.systemd}/bin/systemctl --user start hyprpanel.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpanel.service"
];
bind = [
"ALT, return, exec, ${pkgs.ghostty}/bin/ghostty"
"ALT, return, exec, ${lib.getExe pkgs.ghostty}"
"ALT, Q, killactive,"
"ALT, S, exec, ${pkgs.fuzzel}/bin/fuzzel"
"ALT, S, exec, ${lib.getExe pkgs.fuzzel}"
"ALT, F, fullscreen, 0"
"ALT, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
"ALT, L, exec, ${lib.getExe pkgs.hyprlock}"
"ALT SHIFT, E, exit,"
"ALT SHIFT, space, togglefloating, active"
"ALT SHIFT, S, exec, ${pkgs.grimblast}/bin/grimblast --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"
"ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"
"ALT, left, movefocus, l"
"ALT, right, movefocus, r"
@ -150,18 +150,18 @@
];
bindel = [
", XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86AudioRaiseVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +5%"
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-"
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl}l set +5%"
];
bindl = [
", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
", XF86AudioMute, exec, ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
", XF86AudioMute, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"
"ALT, TAB, hyprexpo:expo, toggle"
];

12
hand7s/wayland/river.nix
View file

@ -98,12 +98,12 @@
};
extraConfig = ''
${pkgs.river}/bin/riverctl keyboard-layout -options "grp:caps_toggle" "us,ru"
${pkgs.river}/bin/riverctl spawn ${pkgs.systemd}/bin/systemctl --user start hyprpaper.service
${pkgs.river}/bin/riverctl spawn ${pkgs.systemd}/bin/systemctl --user start hyprpolkitagent.service
${pkgs.river}/bin/riverctl spawn ${pkgs.systemd}/bin/systemctl --user start yambar.service
${pkgs.river}/bin/riverctl spawn ${pkgs.wayidle}/bin/wayidle -t=300 ${pkgs.brightnessctl}/bin/brightnessctl -s set 10
${pkgs.river}/bin/riverctl spawn ${pkgs.wayidle}/bin/wayidle -t=600 ${pkgs.waylock}/bin/waylock
${lib.getExe' pkgs.river "riverctl"} keyboard-layout -options "grp:caps_toggle" "us,ru"
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock}
'';
};
};

40
hand7s/wayland/sway.nix
View file

@ -60,43 +60,43 @@
startup = [
{
command = "${pkgs.systemd}/bin/systemctl --user start hyprpaper.service";
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service";
}
{
command = "${pkgs.systemd}/bin/systemctl --user start hypridle.service";
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service";
}
{
command = "${pkgs.systemd}/bin/systemctl --user start hyprpolkitagent.service";
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service";
}
{
command = "${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit";
command = "${lib.getExe pkgs.sway-audio-idle-inhibit}";
}
{
command = "${pkgs.autotiling-rs}/bin/autotiling-rs";
command = "${lib.getExe pkgs.autotiling-rs}";
}
{
command = "${pkgs.swaykbdd}/bin/swaykbdd";
command = "${lib.getExe pkgs.swaykbdd}";
}
{
command = "${pkgs.systemd}/bin/systemctl --user start yambar.service";
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service";
}
];
keybindings = lib.mkOptionDefault {
"Mod1+q" = "kill";
"Mod1+s" = "exec ${pkgs.fuzzel}/bin/fuzzel";
"Mod1+Return" = "exec ${pkgs.ghostty}/bin/ghostty";
"Mod1+l" = "exec ${pkgs.swaylock}/bin/swaylock";
"Mod1+s" = "exec ${lib.getExe pkgs.fuzzel}";
"Mod1+Return" = "exec ${lib.getExe pkgs.ghostty}";
"Mod1+l" = "exec ${lib.getExe pkgs.swaylock}";
"Mod1+f" = "fullscreen toggle";
"Mod1+Shift+s" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
"Mod1+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
"Mod1+Shift+e" = "exec ${pkgs.sway}/bin/swaymsg exit";
"Mod1+Shift+e" = "exec ${lib.getExe' pkgs.sway "swaymsg"} exit";
"Mod1+Space" = "floating toggle";
"Mod1+r" = "mode resize";
@ -129,16 +129,16 @@
"Mod1+Shift+0" = "move container to workspace number 10";
"Mod1+Shift+h" = "move scratchpad";
"XF86AudioRaiseVolume" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
"XF86AudioLowerVolume" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
"XF86AudioMute" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
"XF86AudioRaiseVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+";
"XF86AudioLowerVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-";
"XF86AudioMute" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle";
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
"XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause";
"XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
"XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
"XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
"XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%";
"XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-";
"XF86MonBrightnessUp" = "exec $${lib.getExe pkgs.brightnessctl} set +5%";
};
modes = {