From ad03b3771a5cd05f62cd51549b3e4a58b60256b1 Mon Sep 17 00:00:00 2001 From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:07:53 -0500 Subject: [PATCH 1/4] ci(digest): approve with DIGEST_PAT after disabling require_last_push_approval (#66) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit require_last_push_approval blocked barrettruth from approving their own push. Disabled that restriction in the ruleset — 1 approval is still required for all PRs, but the approver can now be the pusher. DIGEST_PAT (barrettruth) approves, CI runs via PAT push, auto-merge fires when checks pass. --- .github/workflows/upstream-digest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upstream-digest.yml b/.github/workflows/upstream-digest.yml index df155e2..2ebfc22 100644 --- a/.github/workflows/upstream-digest.yml +++ b/.github/workflows/upstream-digest.yml @@ -45,5 +45,6 @@ jobs: --body "Automated weekly digest of new upstream activity. Triage by updating statuses and notes." \ --base main \ --head "${BRANCH}") + GH_TOKEN="${{ secrets.DIGEST_PAT }}" gh pr review "${PR_URL}" --approve gh pr merge "${PR_URL}" --auto --squash fi From 9b656387fb295fa1742dad3fb793cfa41eac252a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 21:08:58 +0000 Subject: [PATCH 2/4] docs(upstream): upstream digest (#67) docs(upstream): upstream digest 2026-03-03 Co-authored-by: github-actions[bot] --- doc/upstream.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/upstream.md b/doc/upstream.md index 5754760..f83b4a2 100644 --- a/doc/upstream.md +++ b/doc/upstream.md @@ -46,6 +46,7 @@ Bugs fixed in this fork that remain open upstream. | [#708](https://github.com/stevearc/oil.nvim/pull/708) | Move file into new dir by renaming | deferred — needs rewrite | | [#721](https://github.com/stevearc/oil.nvim/pull/721) | `create_hook` to populate file contents | open | | [#728](https://github.com/stevearc/oil.nvim/pull/728) | `open_split` for opening oil in a split | tracked — [#2](https://github.com/barrettruth/canola.nvim/issues/2) | +| [#735](https://github.com/stevearc/oil.nvim/pull/735) | gX opens external program with a selection. | open | ## Upstream issues @@ -161,3 +162,4 @@ addressed, `open` = not yet triaged. | [#714](https://github.com/stevearc/oil.nvim/issues/714) | not actionable | Support question — answered | | [#719](https://github.com/stevearc/oil.nvim/issues/719) | not actionable | Neovim crash on node_modules — libuv/neovim bug | | [#726](https://github.com/stevearc/oil.nvim/issues/726) | not actionable | Meta discussion/roadmap | +| [#736](https://github.com/stevearc/oil.nvim/issues/736) | open | feature request: make icons virtual text | From eb3ad2bcb0215dab145ea91edff8a40170d39e33 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Mar 2026 13:44:12 -0500 Subject: [PATCH 3/4] ci: format + scripts --- ...stream-digest.yml => upstream-digest.yaml} | 2 +- .luarc.json | 3 ++- .styluaignore | 1 + README.md | 3 ++- doc/upstream.md | 20 +++++++++---------- scripts/ci.sh | 7 +++++++ 6 files changed, 23 insertions(+), 13 deletions(-) rename .github/workflows/{upstream-digest.yml => upstream-digest.yaml} (98%) create mode 100644 .styluaignore create mode 100755 scripts/ci.sh diff --git a/.github/workflows/upstream-digest.yml b/.github/workflows/upstream-digest.yaml similarity index 98% rename from .github/workflows/upstream-digest.yml rename to .github/workflows/upstream-digest.yaml index 2ebfc22..17020d4 100644 --- a/.github/workflows/upstream-digest.yml +++ b/.github/workflows/upstream-digest.yaml @@ -2,7 +2,7 @@ name: upstream digest on: schedule: - - cron: "0 9 * * 1" + - cron: '0 9 * * 1' workflow_dispatch: permissions: diff --git a/.luarc.json b/.luarc.json index c0448ca..78a7d8a 100644 --- a/.luarc.json +++ b/.luarc.json @@ -4,7 +4,8 @@ "pathStrict": true }, "workspace": { - "checkThirdParty": false + "checkThirdParty": false, + "ignoreDir": [".direnv"] }, "type": { "checkTableShape": true diff --git a/.styluaignore b/.styluaignore new file mode 100644 index 0000000..9b42106 --- /dev/null +++ b/.styluaignore @@ -0,0 +1 @@ +.direnv/ diff --git a/README.md b/README.md index 02e14d7..771c6a7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ A refined [oil.nvim](https://github.com/stevearc/oil.nvim) — edit your filesystem like a buffer, with bug fixes and community PRs that haven't landed upstream. -[Upstream tracker](doc/upstream.md) — full PR and issue triage against [oil.nvim](https://github.com/stevearc/oil.nvim) +[Upstream tracker](doc/upstream.md) — full PR and issue triage against +[oil.nvim](https://github.com/stevearc/oil.nvim) https://user-images.githubusercontent.com/506791/209727111-6b4a11f4-634a-4efa-9461-80e9717cea94.mp4 diff --git a/doc/upstream.md b/doc/upstream.md index 5754760..dadeea1 100644 --- a/doc/upstream.md +++ b/doc/upstream.md @@ -36,16 +36,16 @@ Bugs fixed in this fork that remain open upstream. ## Open upstream PRs -| PR | Description | Status | -| ----------------------------------------------------- | ------------------------------------------- | ------------------------------------------------------------------------------------ | -| [#488](https://github.com/stevearc/oil.nvim/pull/488) | Parent directory in a split | not actionable — empty PR | -| [#493](https://github.com/stevearc/oil.nvim/pull/493) | UNC paths on Windows | not actionable — superseded by [#686](https://github.com/stevearc/oil.nvim/pull/686) | -| [#591](https://github.com/stevearc/oil.nvim/pull/591) | release-please changelog | not applicable | -| [#667](https://github.com/stevearc/oil.nvim/pull/667) | Virtual text columns + headers | deferred — WIP, conflicting | -| [#686](https://github.com/stevearc/oil.nvim/pull/686) | Windows path conversion fix | not actionable — Windows-only | -| [#708](https://github.com/stevearc/oil.nvim/pull/708) | Move file into new dir by renaming | deferred — needs rewrite | -| [#721](https://github.com/stevearc/oil.nvim/pull/721) | `create_hook` to populate file contents | open | -| [#728](https://github.com/stevearc/oil.nvim/pull/728) | `open_split` for opening oil in a split | tracked — [#2](https://github.com/barrettruth/canola.nvim/issues/2) | +| PR | Description | Status | +| ----------------------------------------------------- | --------------------------------------- | ------------------------------------------------------------------------------------ | +| [#488](https://github.com/stevearc/oil.nvim/pull/488) | Parent directory in a split | not actionable — empty PR | +| [#493](https://github.com/stevearc/oil.nvim/pull/493) | UNC paths on Windows | not actionable — superseded by [#686](https://github.com/stevearc/oil.nvim/pull/686) | +| [#591](https://github.com/stevearc/oil.nvim/pull/591) | release-please changelog | not applicable | +| [#667](https://github.com/stevearc/oil.nvim/pull/667) | Virtual text columns + headers | deferred — WIP, conflicting | +| [#686](https://github.com/stevearc/oil.nvim/pull/686) | Windows path conversion fix | not actionable — Windows-only | +| [#708](https://github.com/stevearc/oil.nvim/pull/708) | Move file into new dir by renaming | deferred — needs rewrite | +| [#721](https://github.com/stevearc/oil.nvim/pull/721) | `create_hook` to populate file contents | open | +| [#728](https://github.com/stevearc/oil.nvim/pull/728) | `open_split` for opening oil in a split | tracked — [#2](https://github.com/barrettruth/canola.nvim/issues/2) | ## Upstream issues diff --git a/scripts/ci.sh b/scripts/ci.sh new file mode 100755 index 0000000..3e9356d --- /dev/null +++ b/scripts/ci.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +nix develop --command stylua --check lua spec +git ls-files '*.lua' | xargs nix develop --command selene --display-style quiet +nix develop --command prettier --check . +nix develop --command busted From 161d25e9222a2ed1e3a258e6371dab6b99220b12 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 4 Mar 2026 14:07:40 -0500 Subject: [PATCH 4/4] ci: nix --- flake.nix | 5 ++++- scripts/ci.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aebd6d8..fb5faf0 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,12 @@ ... }: let - forEachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); + forEachSystem = + f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); in { + formatter = forEachSystem (pkgs: pkgs.nixfmt-tree); + devShells = forEachSystem (pkgs: { default = pkgs.mkShell { packages = [ diff --git a/scripts/ci.sh b/scripts/ci.sh index 3e9356d..7714909 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -4,4 +4,6 @@ set -eu nix develop --command stylua --check lua spec git ls-files '*.lua' | xargs nix develop --command selene --display-style quiet nix develop --command prettier --check . +nix fmt +git diff --exit-code -- '*.nix' nix develop --command busted