magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-22 08:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix usages of getExe in matrix containers

Browse source 
Signed-off-by: magic_rb <richard@brezak.sk>
This commit is contained in:
magic_rb 2023-10-07 20:25:38 +02:00
parent b56681fbab
commit 09f2f000cb
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixng/containers/matrix/heisenbridge/default.nix
View file

@ -8,7 +8,7 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
inherit (lib) inherit (lib)
getExe; getExe';
in in
{ {
dumb-init = { dumb-init = {
@ -23,7 +23,7 @@
script = pkgs.writeShellScript "heisenbridge" '' script = pkgs.writeShellScript "heisenbridge" ''
REGISTRATION_FILE="/var/lib/registrations/heisenbridge.yaml" REGISTRATION_FILE="/var/lib/registrations/heisenbridge.yaml"
${getExe pkgs.heisenbridge} 'https://matrix.redalder.org/' \ ${getExe' pkgs.heisenbridge "heisenbridge"} 'https://matrix.redalder.org/' \
-c "$REGISTRATION_FILE" \ -c "$REGISTRATION_FILE" \
$([ -e "$REGISTRATION_FILE" ] || echo "--generate") \ $([ -e "$REGISTRATION_FILE" ] || echo "--generate") \
-l 127.0.0.1 \ -l 127.0.0.1 \

8
nixng/containers/matrix/mautrix-discord/default.nix
View file

@ -18,7 +18,7 @@
script = script =
let let
inherit (lib) inherit (lib)
getExe; getExe';
mautrix-discord = (pkgs.appendOverlays [ config.flake.overlays.mautrix-discord ]).mautrix-discord; mautrix-discord = (pkgs.appendOverlays [ config.flake.overlays.mautrix-discord ]).mautrix-discord;
in in
pkgs.writeShellScript "mautrix-discord" pkgs.writeShellScript "mautrix-discord"
@ -28,12 +28,12 @@
REGISTRATION_FILE="/var/lib/registrations/mautrix-discord.yaml" REGISTRATION_FILE="/var/lib/registrations/mautrix-discord.yaml"
DB_FILE="$DATA_DIR/sqlite.db" DB_FILE="$DATA_DIR/sqlite.db"
${getExe pkgs.envsubst} < ${./mautrix-discord.yaml} > "$CONFIG_FILE" ${getExe' pkgs.envsubst "envsubst"} < ${./mautrix-discord.yaml} > "$CONFIG_FILE"
chmod 755 "$CONFIG_FILE" chmod 755 "$CONFIG_FILE"
[ -e "$REGISTRATION_FILE" ] || \ [ -e "$REGISTRATION_FILE" ] || \
${getExe mautrix-discord} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g ${getExe' mautrix-discord "mautrix-discord"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
${getExe mautrix-discord} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n ${getExe' mautrix-discord "mautrix-discord"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
''; '';
}; };
}; };

6
nixng/containers/matrix/mautrix-signal/default.nix
View file

@ -24,8 +24,8 @@
cp ${./mautrix-signal.yaml} "$CONFIG_FILE" ; chmod 755 "$CONFIG_FILE" cp ${./mautrix-signal.yaml} "$CONFIG_FILE" ; chmod 755 "$CONFIG_FILE"
[ -e "$REGISTRATION_FILE" ] || \ [ -e "$REGISTRATION_FILE" ] || \
${lib.getExe pkgs.mautrix-signal} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g ${lib.getExe' pkgs.mautrix-signal "mautrix-signal"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
${lib.getExe pkgs.mautrix-signal} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n ${lib.getExe' pkgs.mautrix-signal "mautrix-signal"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
''; '';
}; };
@ -38,7 +38,7 @@
mkdir -p $(dirname $SOCKET_PATH) mkdir -p $(dirname $SOCKET_PATH)
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
${lib.getExe pkgs.signald} -d $DATA_DIR -s $SOCKET_PATH ${lib.getExe' pkgs.signald "signald"} -d $DATA_DIR -s $SOCKET_PATH
''; '';
}; };
}; };