use getExe everywhere
This commit is contained in:
parent
876a4f09b8
commit
a090dbe73e
7 changed files with 12 additions and 12 deletions
|
|
@ -76,7 +76,7 @@ let
|
||||||
hdr=${lib.escapeShellArg headerFile}
|
hdr=${lib.escapeShellArg headerFile}
|
||||||
if [ -r "$hdr" ]; then
|
if [ -r "$hdr" ]; then
|
||||||
${exports} export OTEL_EXPORTER_OTLP_HEADERS="$(cat "$hdr")"
|
${exports} export OTEL_EXPORTER_OTLP_HEADERS="$(cat "$hdr")"
|
||||||
export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${pkgs.coreutils}/bin/uname -n)"
|
export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${lib.getExe' pkgs.coreutils "uname"} -n)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec ${claude-code}/bin/claude "$@"
|
exec ${claude-code}/bin/claude "$@"
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file = {
|
home.file = {
|
||||||
"idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
|
"idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.lib.getExe pkgs.fsnotifier}";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.poweralertd.enable = true;
|
services.poweralertd.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -180,8 +180,8 @@
|
||||||
"Mod+Shift+Numbersign".action.show-hotkey-overlay = { };
|
"Mod+Shift+Numbersign".action.show-hotkey-overlay = { };
|
||||||
|
|
||||||
# Suggested binds for running programs: terminal, app launcher, screen locker.
|
# Suggested binds for running programs: terminal, app launcher, screen locker.
|
||||||
"Mod+T".action.spawn = "${lib.getBin pkgs.gnome-console}/bin/kgx";
|
"Mod+T".action.spawn = lib.getExe pkgs.gnome-console;
|
||||||
"Mod+D".action.spawn = "${lib.getBin config.programs.fuzzel.package}/bin/fuzzel";
|
"Mod+D".action.spawn = lib.getExe config.programs.fuzzel.package;
|
||||||
|
|
||||||
# You can also use a shell. Do this if you need pipes, multiple commands, etc.
|
# You can also use a shell. Do this if you need pipes, multiple commands, etc.
|
||||||
# Note: the entire command goes as a single argument in the end.
|
# Note: the entire command goes as a single argument in the end.
|
||||||
|
|
@ -430,7 +430,7 @@
|
||||||
"Mod+O".action.toggle-overview = { };
|
"Mod+O".action.toggle-overview = { };
|
||||||
|
|
||||||
"Super+Alt+L" = {
|
"Super+Alt+L" = {
|
||||||
action.spawn = "${pkgs.systemd}/bin/loginctl lock-session";
|
action.spawn = "${lib.getExe' pkgs.systemd "loginctl"} lock-session";
|
||||||
allow-when-locked = true;
|
allow-when-locked = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
services.swayidle =
|
services.swayidle =
|
||||||
let
|
let
|
||||||
lock-command = "${pkgs.systemd}/bin/loginctl lock-session";
|
lock-command = "${pkgs.lib.getExe' pkgs.systemd "loginctl"} lock-session";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -14,11 +14,11 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 60 * 10;
|
timeout = 60 * 10;
|
||||||
command = "${pkgs.systemd}/bin/systemctl suspend";
|
command = "${pkgs.lib.getExe' pkgs.systemd "systemctl"} suspend";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
events = {
|
events = {
|
||||||
before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}";
|
before-sleep = "${pkgs.lib.getExe pkgs.playerctl} pause; ${lock-command}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,8 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
|
myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json'';
|
||||||
myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json'';
|
myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ in
|
||||||
set -eu
|
set -eu
|
||||||
umask 077
|
umask 077
|
||||||
for user in ${lib.escapeShellArgs adminUsers}; do
|
for user in ${lib.escapeShellArgs adminUsers}; do
|
||||||
${pkgs.coreutils}/bin/install -m0400 -o "$user" -g root \
|
${lib.getExe' pkgs.coreutils "install"} -m0400 -o "$user" -g root \
|
||||||
${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user"
|
${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
PIDFILE="/run/ssh-inhibitor-''${PPID}.pid"
|
PIDFILE="/run/ssh-inhibitor-''${PPID}.pid"
|
||||||
case "''${PAM_TYPE:-}" in
|
case "''${PAM_TYPE:-}" in
|
||||||
open_session)
|
open_session)
|
||||||
${pkgs.systemd}/bin/systemd-inhibit \
|
${lib.getExe' pkgs.systemd "systemd-inhibit"} \
|
||||||
--what=sleep \
|
--what=sleep \
|
||||||
--who=sshd \
|
--who=sshd \
|
||||||
--why="SSH session active" \
|
--why="SSH session active" \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue