ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

treewide: use 'lib.getExe' when possible

Browse source
This commit is contained in:
Bruno BELANYI 2023-07-23 18:58:40 +01:00
parent 1706cb5fce
commit 140c87095e
13 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/mail/accounts/default.nix
View file

@ -8,7 +8,7 @@ let
realName = lib.mkDefault "Bruno BELANYI";
userName = lib.mkDefault (mkMailAddress address domain);
passwordCommand =
lib.mkDefault [ "${pkgs.ambroisie.bw-pass}/bin/bw-pass" "Mail" passName ];
lib.mkDefault [ (lib.getExe pkgs.ambroisie.bw-pass) "Mail" passName ];
address = mkMailAddress address domain;
aliases = builtins.map (lib.flip mkMailAddress domain) aliases;

2
home/mail/himalaya/default.nix
View file

@ -9,7 +9,7 @@ in
settings = {
notify-cmd =
let
notify-send = "${pkgs.libnotify}/bin/notify-send";
notify-send = lib.getExe pkgs.libnotify;
in
pkgs.writeScript "mail-notifier" ''
SENDER="$1"

4
home/wm/default.nix
View file

@ -47,8 +47,8 @@ in
command = mkOption {
type = types.str;
default = "${pkgs.i3lock}/bin/i3lock -n -c 000000";
example = "\${pkgs.i3lock}/bin/i3lock -n -i lock.png";
default = "${lib.getExe pkgs.i3lock} -n -c 000000";
example = "\${lib.getExe pkgs.i3lock} -n -i lock.png";
description = "Locker command to run";
};

6
home/wm/i3/default.nix
View file

@ -27,13 +27,13 @@ let
genMovementBindings = f: addVimKeyBindings (lib.my.genAttrs' movementKeys f);
# Used in multiple scripts to show messages through keybindings
notify-send = "${pkgs.libnotify}/bin/notify-send";
notify-send = lib.getExe pkgs.libnotify;
# Screen backlight management
changeBacklight = "${pkgs.ambroisie.change-backlight}/bin/change-backlight";
changeBacklight = lib.getExe pkgs.ambroisie.change-backlight;
# Audio and volume management
changeAudio = "${pkgs.ambroisie.change-audio}/bin/change-audio";
changeAudio = lib.getExe pkgs.ambroisie.change-audio;
# Lock management
toggleXautolock =

2
home/wm/screen-lock/default.nix
View file

@ -5,7 +5,7 @@ let
notficationCmd =
let
duration = toString (cfg.notify.delay * 1000);
notifyCmd = "${pkgs.libnotify}/bin/notify-send -u critical -t ${duration}";
notifyCmd = "${lib.getExe pkgs.libnotify} -u critical -t ${duration}";
in
# Needs to be surrounded by quotes for systemd to launch it correctly
''"${notifyCmd} -- 'Locking in ${toString cfg.notify.delay} seconds'"'';

3
modules/services/drone/runner-docker/default.nix
View file

@ -2,7 +2,6 @@
let
cfg = config.my.services.drone;
hasRunner = (name: builtins.elem name cfg.runners);
dockerPkg = pkgs.drone-runner-docker;
in
{
config = lib.mkIf (cfg.enable && hasRunner "docker") {
@ -25,7 +24,7 @@ in
EnvironmentFile = [
cfg.sharedSecretFile
];
ExecStart = "${dockerPkg}/bin/drone-runner-docker";
ExecStart = lib.getExe pkgs.drone-runner-docker;
User = "drone-runner-docker";
Group = "drone-runner-docker";
};

3
modules/services/drone/runner-exec/default.nix
View file

@ -2,7 +2,6 @@
let
cfg = config.my.services.drone;
hasRunner = (name: builtins.elem name cfg.runners);
execPkg = pkgs.drone-runner-exec;
in
{
config = lib.mkIf (cfg.enable && hasRunner "exec") {
@ -53,7 +52,7 @@ in
EnvironmentFile = [
cfg.sharedSecretFile
];
ExecStart = "${execPkg}/bin/drone-runner-exec";
ExecStart = lib.getExe pkgs.drone-runner-exec;
User = "drone-runner-exec";
Group = "drone-runner-exec";
};

2
modules/services/flood/default.nix
View file

@ -30,7 +30,7 @@ in
serviceConfig = {
ExecStart = lib.concatStringsSep " " [
"${pkgs.flood}/bin/flood"
(lib.getExe pkgs.flood)
"--port ${builtins.toString cfg.port}"
"--rundir /var/lib/${cfg.stateDir}"
];

4
modules/services/lohr/default.nix
View file

@ -4,8 +4,6 @@ let
cfg = config.my.services.lohr;
settingsFormat = pkgs.formats.yaml { };
lohrPkg = pkgs.ambroisie.lohr;
lohrStateDirectory = "lohr";
lohrHome = "/var/lib/lohr/";
in
@ -80,7 +78,7 @@ in
let
configFile = settingsFormat.generate "lohr-config.yaml" cfg.setting;
in
"${lohrPkg}/bin/lohr --config ${configFile}";
"${lib.getExe pkgs.ambroisie.lohr} --config ${configFile}";
StateDirectory = lohrStateDirectory;
WorkingDirectory = lohrHome;
User = "lohr";

4
modules/services/nginx/sso/default.nix
View file

@ -60,7 +60,7 @@ in
WorkingDirectory = "/var/lib/nginx-sso";
# The files to be merged might not have the correct permissions
ExecStartPre = ''+${pkgs.writeScript "merge-nginx-sso-config" ''
#!${pkgs.bash}/bin/bash
#!${lib.getExe pkgs.bash}
rm -f '${confPath}'
${utils.genJqSecretsReplacementSnippet cfg.configuration confPath}
@ -70,7 +70,7 @@ in
''
}'';
ExecStart = lib.mkForce ''
${pkg}/bin/nginx-sso \
${lib.getExe pkg}/bin/nginx-sso \
--config ${confPath} \
--frontend-dir ${pkg}/share/frontend
'';

16
modules/services/wireguard/default.nix
View file

@ -230,22 +230,22 @@ in
(lib.mkIf thisPeerIsServer {
networking.wg-quick.interfaces."${cfg.iface}" = {
postUp = with cfg.net; ''
${pkgs.iptables}/bin/iptables -A FORWARD -i ${cfg.iface} -j ACCEPT
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING \
${lib.getExe pkgs.iptables} -A FORWARD -i ${cfg.iface} -j ACCEPT
${lib.getExe pkgs.iptables} -t nat -A POSTROUTING \
-s ${v4.subnet}.${toString thisPeer.clientNum}/${toString v4.mask} \
-o ${extIface} -j MASQUERADE
${pkgs.iptables}/bin/ip6tables -A FORWARD -i ${cfg.iface} -j ACCEPT
${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING \
${lib.getExe pkgs.iptables} -A FORWARD -i ${cfg.iface} -j ACCEPT
${lib.getExe pkgs.iptables} -t nat -A POSTROUTING \
-s ${v6.subnet}::${toString thisPeer.clientNum}/${toString v6.mask} \
-o ${extIface} -j MASQUERADE
'';
preDown = with cfg.net; ''
${pkgs.iptables}/bin/iptables -D FORWARD -i ${cfg.iface} -j ACCEPT
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING \
${lib.getExe pkgs.iptables} -D FORWARD -i ${cfg.iface} -j ACCEPT
${lib.getExe pkgs.iptables} -t nat -D POSTROUTING \
-s ${v4.subnet}.${toString thisPeer.clientNum}/${toString v4.mask} \
-o ${extIface} -j MASQUERADE
${pkgs.iptables}/bin/ip6tables -D FORWARD -i ${cfg.iface} -j ACCEPT
${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING \
${lib.getExe pkgs.iptables} -D FORWARD -i ${cfg.iface} -j ACCEPT
${lib.getExe pkgs.iptables} -t nat -D POSTROUTING \
-s ${v6.subnet}::${toString thisPeer.clientNum}/${toString v6.mask} \
-o ${extIface} -j MASQUERADE
'';

2
pkgs/ff2mpv-go/default.nix
View file

@ -12,7 +12,7 @@ buildGoModule rec {
vendorHash = null;
postPatch = ''
sed -i -e 's,"mpv","${mpv}/bin/mpv",' ff2mpv.go
sed -i -e 's,"mpv","${lib.getExe mpv}",' ff2mpv.go
'';
postInstall = ''

2
pkgs/unbound-zones-adblock/default.nix
View file

@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation {
installPhase =
let
gawkCmd = lib.concatStringsSep " " [
''${gawk}/bin/awk''
(lib.getExe gawk)
'''{sub(/\r$/,"")}''
''{sub(/^127\.0\.0\.1/,"0.0.0.0")}''
''BEGIN { OFS = "" }''