diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 597637d..fc24fbe 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -93,16 +93,12 @@ jobs: ref: ${{ needs.update.outputs.branch }} - name: Show nixpkgs version run: nix-instantiate --eval -E '(builtins.getFlake (builtins.toString ./.)).inputs.nixos-unstable.lib.version' - - name: Check evaluation + - name: Show evaluation run: nix flake show - - name: Check formatting - run: nix fmt -- --fail-on-change + - name: Check evaluation + run: nix flake check -j 1 - name: Build nix packages - run: | - nix run nixpkgs#cachix -- watch-store toyvo & - nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).all" --option accept-flake-config true - env: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} + run: nix build -j 1 -L ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).all" merge: needs: - update @@ -145,11 +141,7 @@ jobs: -I nixpkgs=$(NIX_PATH="${{ matrix.nixPath }}" nix-instantiate --find-file nixpkgs) \ -I $PWD - name: Build nix packages - run: | - nix run nixpkgs#cachix -- watch-store toyvo & - NIX_PATH="${{ matrix.nixPath }}" nix shell -f '' nix-build-uncached -c nix-build-uncached ci.nix -A cacheOutputs - env: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} + run: NIX_PATH="${{ matrix.nixPath }}" nix shell -f '' nix-build-uncached -c nix-build-uncached ci.nix -A cacheOutputs - name: Trigger NUR update if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} run: curl -XPOST "https://nur-update.nix-community.org/update?repo=https://github.com/ToyVo/nixcfg" diff --git a/modules/home/programs/editors/zed-settings.json b/modules/home/programs/editors/zed-settings.json index 9f04f2d..2d5be37 100644 --- a/modules/home/programs/editors/zed-settings.json +++ b/modules/home/programs/editors/zed-settings.json @@ -77,10 +77,7 @@ }, { "external": { - "arguments": [ - "-e", - "s/ *$//" - ], + "arguments": ["-e", "s/ *$//"], "command": "sed" } } @@ -103,10 +100,7 @@ "tab_size": 4, "formatter": { "external": { - "arguments": [ - "--stdin-filepath", - "{buffer_path}" - ], + "arguments": ["--stdin-filepath", "{buffer_path}"], "command": "prettier" } } @@ -118,19 +112,13 @@ }, "formatter": { "external": { - "arguments": [ - "--stdin-filepath", - "{buffer_path}" - ], + "arguments": ["--stdin-filepath", "{buffer_path}"], "command": "prettier" } } }, "Nix": { - "language_servers": [ - "nil", - "!nixd" - ] + "language_servers": ["nil", "!nixd"] }, "http": { "inlay_hints": { @@ -142,9 +130,7 @@ "nil": { "initialization_options": { "formatting": { - "command": [ - "nixfmt" - ] + "command": ["nixfmt"] }, "nix": { "flake": {