daniel/dotfiles
1
0
Fork 0
Code Activity Actions

chore: use lib.getExe in more places
All checks were successful
Update Flake / update-flake (push) Successful in 3m20s
Details
Build / build-arm64-linux (push) Successful in 12m23s
Details
Build / build-amd64-linux (push) Successful in 28s
Details

Browse source
This commit is contained in:
Daniel Kempkens 2023-12-14 00:29:09 +01:00
parent fbb59e80f1
commit 650be0e27e
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/programs/nvim/default.nix
View file

@ -433,7 +433,7 @@ in
activation.neovimCache = lib.hm.dag.entryAfter [ "linkGeneration" ] /* bash */ '' activation.neovimCache = lib.hm.dag.entryAfter [ "linkGeneration" ] /* bash */ ''
$VERBOSE_ECHO "Resetting loader" $VERBOSE_ECHO "Resetting loader"
$DRY_RUN_CMD ${config.programs.neovim.finalPackage}/bin/nvim -l <(echo "vim.loader.reset()") $DRY_RUN_CMD ${lib.getExe config.programs.neovim.finalPackage} -l <(echo "vim.loader.reset()")
''; '';
}; };
} }

4
home/programs/yt-dlp.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
{ {
programs.yt-dlp = { programs.yt-dlp = {
@ -35,7 +35,7 @@
}; };
functions.ytdl_with_options = '' functions.ytdl_with_options = ''
${config.programs.yt-dlp.package}/bin/yt-dlp --config-location "$HOME/.config/yt-dlp/config" --download-archive "$HOME/.config/yt-dlp/archive" $argv ${lib.getExe config.programs.yt-dlp.package} --config-location "$HOME/.config/yt-dlp/config" --download-archive "$HOME/.config/yt-dlp/archive" $argv
''; '';
}; };
} }

4
system/nixos/container.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
{ {
virtualisation = { virtualisation = {
@ -37,7 +37,7 @@
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.bash}/bin/bash -c 'until ${pkgs.iproute2}/bin/ip address show podman0; do sleep 1; done'"; ExecStart = "${lib.getExe pkgs.bash} -c 'until ${pkgs.iproute2}/bin/ip address show podman0; do sleep 1; done'";
}; };
}; };

4
system/nixos/fedifetcher.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
{ {
systemd.services.fedifetcher = { systemd.services.fedifetcher = {
@ -13,7 +13,7 @@
DynamicUser = true; DynamicUser = true;
StateDirectory = "fedifetcher"; StateDirectory = "fedifetcher";
LoadCredential = "config.json:${config.age.secrets.fedifetcher-config.path}"; LoadCredential = "config.json:${config.age.secrets.fedifetcher-config.path}";
ExecStart = "${pkgs.fedifetcher}/bin/fedifetcher --config=%d/config.json"; ExecStart = "${lib.getExe pkgs.fedifetcher} --config=%d/config.json";
}; };
}; };
} }

2
system/nixos/mastodon.nix
View file

@ -134,7 +134,7 @@ in
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.bash}/bin/bash -c 'until ${pkgs.curl}/bin/curl --fail --silent https://${web-domain} > /dev/null; do sleep 1; done'"; ExecStart = "${lib.getExe pkgs.bash} -c 'until ${lib.getExe pkgs.curl} --fail --silent https://${web-domain} > /dev/null; do sleep 1; done'";
}; };
}; };

4
system/nixos/matrix/mautrix-signal.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
{ {
services.signald.enable = true; services.signald.enable = true;
@ -16,7 +16,7 @@
User = config.services.signald.user; User = config.services.signald.user;
Group = config.services.signald.group; Group = config.services.signald.group;
LoadCredential = [ "config:${config.age.secrets.mautrix-signal-config.path}" ]; LoadCredential = [ "config:${config.age.secrets.mautrix-signal-config.path}" ];
ExecStart = "${pkgs.mautrix-signal}/bin/mautrix-signal --config=%d/config --no-update"; ExecStart = "${lib.getExe pkgs.mautrix-signal} --config=%d/config --no-update";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "5s"; RestartSec = "5s";

4
system/nixos/matrix/mautrix-whatsapp.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, lib, ... }:
{ {
systemd.services.mautrix-whatsapp = { systemd.services.mautrix-whatsapp = {
@ -11,7 +11,7 @@
DynamicUser = true; DynamicUser = true;
StateDirectory = "mautrix-whatsapp"; StateDirectory = "mautrix-whatsapp";
LoadCredential = [ "config:${config.age.secrets.mautrix-whatsapp-config.path}" ]; LoadCredential = [ "config:${config.age.secrets.mautrix-whatsapp-config.path}" ];
ExecStart = "${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp --config=%d/config --no-update"; ExecStart = "${lib.getExe pkgs.mautrix-whatsapp} --config=%d/config --no-update";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "5s"; RestartSec = "5s";

4
system/shared/show-update-changelog.nix
View file

@ -10,7 +10,7 @@ in
show-update-changelog = mkIf isLinux '' show-update-changelog = mkIf isLinux ''
if [[ -e /run/current-system ]]; then if [[ -e /run/current-system ]]; then
echo "[show-update-changelog] System Changelog" echo "[show-update-changelog] System Changelog"
${pkgs.nvd}/bin/nvd --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig" ${lib.getExe pkgs.nvd} --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig"
fi fi
''; '';
@ -18,7 +18,7 @@ in
text = '' text = ''
if [[ -e /run/current-system ]]; then if [[ -e /run/current-system ]]; then
echo "[show-update-changelog] System Changelog" echo "[show-update-changelog] System Changelog"
sudo -H ${pkgs.nvd}/bin/nvd --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig" sudo -H ${lib.getExe pkgs.nvd} --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig"
fi fi
''; '';
}; };