diff --git a/hosts/bekkalokk/services/website/fetch-gallery.nix b/hosts/bekkalokk/services/website/fetch-gallery.nix index 236bd41..53aa2b4 100644 --- a/hosts/bekkalokk/services/website/fetch-gallery.nix +++ b/hosts/bekkalokk/services/website/fetch-gallery.nix @@ -47,8 +47,8 @@ in { }} # Delete files and directories that exists in the gallery that don't exist in the tarball - filesToRemove=$(uniq -u <(sort <(find . -not -path "./.thumbnails*") <(tar -tf ${transferDir}/gallery.tar.gz | sed 's|/$||'))) - while IFS= read fname; do + filesToRemove=$(uniq -u <(sort <(find . -not -path './.thumbnails*') <(tar -tf '${transferDir}/gallery.tar.gz' | sed 's|/$||'))) + while IFS= read -r fname; do rm -f "$fname" ||: rm -f ".thumbnails/$fname.png" ||: done <<< "$filesToRemove" @@ -56,9 +56,9 @@ in { find . -type d -empty -delete mkdir -p .thumbnails - images=$(find . -type f -not -path "./.thumbnails*") + images=$(find . -type f -not -path './.thumbnails*') - while IFS= read fname; do + while IFS= read -r fname; do # Skip this file if an up-to-date thumbnail already exists if [ -f ".thumbnails/$fname.png" ] && \ [ "$(date -R -r "$fname")" == "$(date -R -r ".thumbnails/$fname.png")" ] @@ -67,7 +67,7 @@ in { fi echo "Creating thumbnail for $fname" - mkdir -p $(dirname ".thumbnails/$fname") + mkdir -p "$(dirname ".thumbnails/$fname")" magick -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||: touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png" done <<< "$images" diff --git a/hosts/bicep/services/mysql/backup.nix b/hosts/bicep/services/mysql/backup.nix index 2936a2a..12879d4 100644 --- a/hosts/bicep/services/mysql/backup.nix +++ b/hosts/bicep/services/mysql/backup.nix @@ -57,7 +57,7 @@ in rm "$STATE_DIRECTORY/mysql-dump-latest.sql.zst" ||: ln -T "$OUT_FILE" "$STATE_DIRECTORY/mysql-dump-latest.sql.zst" - while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt ${toString (rotations + 1)} ]; do + while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt '${toString (rotations + 1)}' ]; do rm "$(find "$STATE_DIRECTORY" -type f -printf '%T+ %p\n' | sort | head -n 1 | cut -d' ' -f2)" done ''; diff --git a/hosts/bicep/services/postgresql/backup.nix b/hosts/bicep/services/postgresql/backup.nix index ebb508a..81e9c9c 100644 --- a/hosts/bicep/services/postgresql/backup.nix +++ b/hosts/bicep/services/postgresql/backup.nix @@ -58,7 +58,7 @@ in rm "$STATE_DIRECTORY/postgresql-dump-latest.sql.zst" ||: ln -T "$OUT_FILE" "$STATE_DIRECTORY/postgresql-dump-latest.sql.zst" - while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt ${toString (rotations + 1)} ]; do + while [ "$(find "$STATE_DIRECTORY" -type f -printf '.' | wc -c)" -gt '${toString (rotations + 1)}' ]; do rm "$(find "$STATE_DIRECTORY" -type f -printf '%T+ %p\n' | sort | head -n 1 | cut -d' ' -f2)" done ''; diff --git a/hosts/kommode/services/gitea/customization/default.nix b/hosts/kommode/services/gitea/customization/default.nix index cfe28ea..6b4fa90 100644 --- a/hosts/kommode/services/gitea/customization/default.nix +++ b/hosts/kommode/services/gitea/customization/default.nix @@ -99,23 +99,23 @@ in ]; } '' # Bigger icons - install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl" + install -Dm444 '${cfg.package.src}/templates/repo/icon.tmpl' "$out/repo/icon.tmpl" sed -i -e 's/24/60/g' "$out/repo/icon.tmpl" ''; in '' - install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg - install -Dm444 ${logo-png} ${cfg.customDir}/public/assets/img/logo.png - install -Dm444 ${./loading.apng} ${cfg.customDir}/public/assets/img/loading.png - install -Dm444 ${extraLinks} ${cfg.customDir}/templates/custom/extra_links.tmpl - install -Dm444 ${extraLinksFooter} ${cfg.customDir}/templates/custom/extra_links_footer.tmpl - install -Dm444 ${project-labels} ${cfg.customDir}/options/label/project-labels.yaml + install -Dm444 '${logo-svg}' '${cfg.customDir}/public/assets/img/logo.svg' + install -Dm444 '${logo-png}' '${cfg.customDir}/public/assets/img/logo.png' + install -Dm444 '${./loading.apng}' '${cfg.customDir}/public/assets/img/loading.png' + install -Dm444 '${extraLinks}' '${cfg.customDir}/templates/custom/extra_links.tmpl' + install -Dm444 '${extraLinksFooter}' '${cfg.customDir}/templates/custom/extra_links_footer.tmpl' + install -Dm444 '${project-labels}' '${cfg.customDir}/options/label/project-labels.yaml' - install -Dm644 ${./emotes/bruh.png} ${cfg.customDir}/public/assets/img/emoji/bruh.png - install -Dm644 ${./emotes/huh.gif} ${cfg.customDir}/public/assets/img/emoji/huh.png - install -Dm644 ${./emotes/grr.png} ${cfg.customDir}/public/assets/img/emoji/grr.png - install -Dm644 ${./emotes/okiedokie.jpg} ${cfg.customDir}/public/assets/img/emoji/okiedokie.png + install -Dm644 '${./emotes/bruh.png}' '${cfg.customDir}/public/assets/img/emoji/bruh.png' + install -Dm644 '${./emotes/huh.gif}' '${cfg.customDir}/public/assets/img/emoji/huh.png' + install -Dm644 '${./emotes/grr.png}' '${cfg.customDir}/public/assets/img/emoji/grr.png' + install -Dm644 '${./emotes/okiedokie.jpg}' '${cfg.customDir}/public/assets/img/emoji/okiedokie.png' - "${lib.getExe pkgs.rsync}" -a "${customTemplates}/" ${cfg.customDir}/templates/ + '${lib.getExe pkgs.rsync}' -a '${customTemplates}/' '${cfg.customDir}/templates/' ''; }; } diff --git a/modules/matrix-ooye.nix b/modules/matrix-ooye.nix index 071e8f6..366b03c 100644 --- a/modules/matrix-ooye.nix +++ b/modules/matrix-ooye.nix @@ -77,29 +77,29 @@ in id echo "Before if statement" - stat ''${REGISTRATION_FILE} + stat "''${REGISTRATION_FILE}" - if [[ ! -f ''${REGISTRATION_FILE} ]]; then + if [[ ! -f "''${REGISTRATION_FILE}" ]]; then echo "No registration file found at '$REGISTRATION_FILE'" - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + cp --no-preserve=mode,ownership "${baseConfig}" "''${REGISTRATION_FILE}" fi echo "After if statement" - stat ''${REGISTRATION_FILE} + stat "''${REGISTRATION_FILE}" - AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE}) - HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE}) - DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token) - DISCORD_CLIENT_SECRET=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_client_secret) + AS_TOKEN="$('${lib.getExe pkgs.jq}' -r .as_token "''${REGISTRATION_FILE}")" + HS_TOKEN="$('${lib.getExe pkgs.jq}' -r .hs_token "''${REGISTRATION_FILE}")" + DISCORD_TOKEN="$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token)" + DISCORD_CLIENT_SECRET="$(cat /run/credentials/matrix-ooye-pre-start.service/discord_client_secret)" # Check if we have all required tokens if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then - AS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) + AS_TOKEN="$('${lib.getExe pkgs.openssl}' rand -hex 64)" echo "Generated new AS token: ''${AS_TOKEN}" fi if [[ -z "$HS_TOKEN" || "$HS_TOKEN" == "null" ]]; then - HS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64) + HS_TOKEN="$('${lib.getExe pkgs.openssl}' rand -hex 64)" echo "Generated new HS token: ''${HS_TOKEN}" fi @@ -115,13 +115,13 @@ in exit 1 fi - shred -u ''${REGISTRATION_FILE} - cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE} + shred -u "''${REGISTRATION_FILE}" + cp --no-preserve=mode,ownership "${baseConfig}" "''${REGISTRATION_FILE}" - ${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'" | .ooye.discord_client_secret = "'$DISCORD_CLIENT_SECRET'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp + '${lib.getExe pkgs.jq}' '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'" | .ooye.discord_client_secret = "'$DISCORD_CLIENT_SECRET'"' "''${REGISTRATION_FILE}" > "''${REGISTRATION_FILE}.tmp" - shred -u ''${REGISTRATION_FILE} - mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE} + shred -u "''${REGISTRATION_FILE}" + mv "''${REGISTRATION_FILE}.tmp" "''${REGISTRATION_FILE}" ''; in diff --git a/modules/snakeoil-certs.nix b/modules/snakeoil-certs.nix index 61f086a..37303ee 100644 --- a/modules/snakeoil-certs.nix +++ b/modules/snakeoil-certs.nix @@ -51,24 +51,24 @@ in script = let openssl = lib.getExe pkgs.openssl; in lib.concatMapStringsSep "\n" ({ name, value }: '' - mkdir -p $(dirname "${value.certificate}") $(dirname "${value.certificateKey}") - if ! ${openssl} x509 -checkend 86400 -noout -in ${value.certificate} + mkdir -p "$(dirname '${value.certificate}')" "$(dirname '${value.certificateKey}')" + if ! ${openssl} x509 -checkend 86400 -noout -in '${value.certificate}' then echo "Regenerating '${value.certificate}'" ${openssl} req \ -newkey rsa:4096 \ -new -x509 \ - -days "${toString value.daysValid}" \ + -days '${toString value.daysValid}' \ -nodes \ - -subj "${value.subject}" \ - -out "${value.certificate}" \ - -keyout "${value.certificateKey}" \ + -subj '${value.subject}' \ + -out '${value.certificate}' \ + -keyout '${value.certificateKey}' \ ${lib.escapeShellArgs value.extraOpenSSLArgs} fi - chown "${value.owner}:${value.group}" "${value.certificate}" - chown "${value.owner}:${value.group}" "${value.certificateKey}" - chmod "${value.mode}" "${value.certificate}" - chmod "${value.mode}" "${value.certificateKey}" + chown '${value.owner}:${value.group}' '${value.certificate}' + chown '${value.owner}:${value.group}' '${value.certificateKey}' + chmod '${value.mode}' '${value.certificate}' + chmod '${value.mode}' '${value.certificateKey}' echo "\n-----------------\n" '') (lib.attrsToList cfg);