lib/neovim-plugin: Add lazyLoad option to plugins

.github/workflows/update.yml

@@ -1,59 +1,125 @@
-name: update-flake-lock
+name: update
 on:
-  workflow_dispatch: # allows manual triggering
-    inputs:
-      branch:
-        description: "Branch to update"
-        type: choice
-        options:
-          - "stable & unstable"
-          - "main"
-          - "nixos-24.05"
+  # Runs every Saturday at noon
   schedule:
-    - cron: "0 12 * * SAT" # runs weekly on Saturday at noon
+    - cron: "0 12 * * SAT"
+  # Allow manual triggering
+  workflow_dispatch:
+    inputs:
+      nixos-24.05:
+        type: boolean
+        description: Also update nixos-24.05
+
+# Allow one concurrent update per branch
+concurrency:
+  group: "update-${{ github.ref_name }}"
+  cancel-in-progress: true
+
+# Allow running workflows, pushing and creating PRs
+permissions:
+  actions: write
+  contents: write
+  pull-requests: write
 
 jobs:
-  lockfile:
-    strategy:
-      matrix:
-        # This allows to update both stable & unstable branches, but not both when triggered
-        # manually
-        branch: ["main", "nixos-24.05"]
-        selectedBranch: ["${{ inputs.branch }}"]
-        exclude:
-          - selectedBranch: main
-            branch: "nixos-24.05"
-          - selectedBranch: "nixos-24.05"
-            branch: main
+  update:
     name: Update the flake inputs and generate options
     runs-on: ubuntu-latest
     timeout-minutes: 40
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          ref: "${{ matrix.branch }}"
+          ssh-key: ${{ secrets.CI_UPDATE_SSH_KEY }}
+
+      # NOTE: If additional "inputs" are added, copy this step
+      - name: Update nixos-24.05
+        if: inputs['nixos-24.05'] || github.event_name == 'schedule'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh workflow run update.yml --ref nixos-24.05
 
       - name: Install Nix
         uses: cachix/install-nix-action@v26
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Configure git
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+
       - name: Update flake.lock
-        id: update
-        uses: DeterminateSystems/update-flake-lock@v21
-        with:
-          pr-title: "Update flake.lock (${{ matrix.branch }})"
-          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          branch: "update_flake_lock_action-${{ matrix.branch }}"
+        id: flake_lock
+        run: |
+          old=$(git show --no-patch --format=%h)
+          nix flake update --commit-lock-file
+          new=$(git show --no-patch --format=%h)
+          if [ "$old" != "$new" ]; then
+            echo "body<<EOF" >> "$GITHUB_OUTPUT"
+            git show --no-patch --format=%b >> "$GITHUB_OUTPUT"
+            echo "EOF" >> "$GITHUB_OUTPUT"
+          fi
 
-      # TODO: do in one checkout + push the flake.lock update & the re-generation of the files
       - name: Update autogenerated files
+        id: generate
         run: |
-          git checkout update_flake_lock_action-${{ matrix.branch }}
-          nix run .#generate-files
-          git add ./generated
-          git commit -m "generated: Update files"
-          git push
+          old=$(git show --no-patch --format=%h)
+          nix run .#generate-files -- --commit
+          new=$(git show --no-patch --format=%h)
+          if [ "$old" != "$new" ]; then
+            body=$(git show --no-patch --format=%b)
+            echo "body<<EOF" >> "$GITHUB_OUTPUT"
+            if [ -n "$body" ]; then
+              # Multi-file changes are listed in the body
+              echo "$body" >> "$GITHUB_OUTPUT"
+            else
+              # Single-file changes are only in the summary,
+              # e.g. "generated: Updated none-ls.nix"
+              git show --no-patch --format=%s | \
+              sed -e 's/^generated:/-/' >> "$GITHUB_OUTPUT"
+            fi
+            echo "EOF" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create Pull Request
+        id: pr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          add-paths: "!**"
+          branch: update/${{ github.ref_name }}
+          delete-branch: true
+          title: |
+            [${{ github.ref_name }}] Update flake.lock & generated files
+          body: |
+            ## Flake lockfile
+            ```
+            ${{ steps.flake_lock.outputs.body || 'No changes' }}
+            ```
+
+            ## Generate
+            ${{ steps.generate.outputs.body || 'No changes' }}
+
+      - name: Print summary
+        if: ${{ steps.pr.outputs.pull-request-number }}
+        run: |
+          num="${{ steps.pr.outputs.pull-request-number }}"
+          pr_url="${{ steps.pr.outputs.pull-request-url }}"
+          pr_branch="${{ steps.pr.outputs.pull-request-branch }}"
+          head="${{ steps.pr.outputs.pull-request-head-sha }}"
+          operation="${{ steps.pr.outputs.pull-request-operation }}"
+
+          # stdout
+          echo "${head:0:6} pushed to ${pr_branch}"
+          echo "${pr} was ${operation}."
+
+          # markdown summary
+          echo "## ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
+          echo >> $GITHUB_STEP_SUMMARY
+          echo "\`${head:0:6}\` pushed to \`${pr_branch}\`" >> $GITHUB_STEP_SUMMARY
+          echo >> $GITHUB_STEP_SUMMARY
+          echo "[#${num}](${pr_url}) was ${operation}." >> $GITHUB_STEP_SUMMARY
+          echo >> $GITHUB_STEP_SUMMARY

flake-modules/dev/default.nix

@@ -49,6 +49,7 @@
             "**.svg"
             "**/man/*.5"
           ];
+          formatter.ruff-format.options = [ "--isolated" ];
         };
       };
     }

flake-modules/tests.nix

@@ -44,6 +44,8 @@
           inherit pkgs helpers;
           inherit (pkgs) lib;
         };
+
+        maintainers = import ../tests/maintainers.nix { inherit pkgs; };
       };
     };
 }

flake-modules/updates/default.nix

@@ -9,6 +9,21 @@
           repo_root=$(git rev-parse --show-toplevel)
           generated_dir=$repo_root/generated
 
+          commit=
+          while [ $# -gt 0 ]; do
+            case "$1" in
+            --commit) commit=1
+              ;;
+            --*) echo "unknown option $1"
+              ;;
+            *) echo "unexpected argument $1"
+              ;;
+            esac
+            shift
+          done
+
+          mkdir -p "$generated_dir"
+
           echo "Rust-Analyzer"
           nix build .#rust-analyzer-options
           cat ./result >"$generated_dir"/rust-analyzer.nix
@@ -21,7 +36,45 @@
           nix build .#none-ls-builtins
           cat ./result >"$generated_dir"/none-ls.nix
 
+          git add --intent-to-add "$generated_dir"
           nix fmt
+
+          if [ -n "$commit" ]; then
+            cd "$generated_dir"
+            git add .
+
+            # Construct a msg body from `git status -- .`
+            body=$(
+              git status \
+                --short \
+                --ignored=no \
+                --untracked-files=no \
+                --no-ahead-behind \
+                -- . \
+              | sed \
+                -e 's/^\s*\([A-Z]\)\s*/\1 /' \
+                -e 's/^A/Added/' \
+                -e 's/^M/Updated/' \
+                -e 's/^R/Renamed/' \
+                -e 's/^D/Removed/' \
+                -e 's/^/- /'
+            )
+
+            # Construct the commit message based on the body
+            count=$(echo -n "$body" | wc -l)
+            if [ "$count" -gt 1 ] || [ ''${#body} -gt 50 ]; then
+              msg=$(echo -e "generated: Update\n\n$body")
+            else
+              msg="generated:''${body:1}"
+            fi
+
+            # Commit if there are changes
+            if [ "$count" -gt 0 ]; then
+              echo "Committing $count changes..."
+              echo "$msg"
+              git commit -m "$msg" --no-verify
+            fi
+          fi
         '';
       };
 

flake-modules/updates/none-ls.nix

@@ -5,7 +5,7 @@
   pkgs,
 }:
 let
-  inherit (import ../../plugins/none-ls/packages.nix pkgs) packaged noPackage unpackaged;
+  inherit (import ../../plugins/none-ls/packages.nix pkgs) packaged noPackage;
 
   builtinSources = lib.trivial.importJSON "${vimPlugins.none-ls-nvim.src}/doc/builtins.json";
 
@@ -14,11 +14,11 @@ let
   toolNames = lib.unique (lib.flatten (lib.attrValues builtinSourceNames));
 
   undeclaredTool = lib.filter (
-    name: !(lib.hasAttr name packaged || lib.elem name noPackage || lib.elem name unpackaged)
+    name: !(lib.hasAttr name packaged || lib.elem name noPackage)
   ) toolNames;
 
   uselesslyDeclaredTool = lib.filter (name: !(lib.elem name toolNames)) (
-    unpackaged ++ noPackage ++ (lib.attrNames packaged)
+    noPackage ++ (lib.attrNames packaged)
   );
 in
 writeText "efmls-configs-sources.nix" (

generated/rust-analyzer.nix

@@ -28,11 +28,20 @@
       ];
     };
   };
+  "rust-analyzer.assist.termSearch.borrowcheck" = {
+    description = ''
+      Enable borrow checking for term search code assists. If set to false, also there will be more suggestions, but some of them may not borrow-check.
+    '';
+    pluginDefault = true;
+    type = {
+      kind = "boolean";
+    };
+  };
   "rust-analyzer.assist.termSearch.fuel" = {
     description = ''
-      Term search fuel in "units of work" for assists (Defaults to 400).
+      Term search fuel in "units of work" for assists (Defaults to 1800).
     '';
-    pluginDefault = 400;
+    pluginDefault = 1800;
     type = {
       kind = "integer";
       maximum = null;
@@ -683,9 +692,9 @@
   };
   "rust-analyzer.completion.termSearch.fuel" = {
     description = ''
-      Term search fuel in "units of work" for autocompletion (Defaults to 200).
+      Term search fuel in "units of work" for autocompletion (Defaults to 1000).
     '';
-    pluginDefault = 200;
+    pluginDefault = 1000;
     type = {
       kind = "integer";
       maximum = null;