diff --git a/.github/workflows/upstream-digest.yaml b/.github/workflows/upstream-digest.yml similarity index 98% rename from .github/workflows/upstream-digest.yaml rename to .github/workflows/upstream-digest.yml index 17020d4..2ebfc22 100644 --- a/.github/workflows/upstream-digest.yaml +++ b/.github/workflows/upstream-digest.yml @@ -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 78a7d8a..c0448ca 100644 --- a/.luarc.json +++ b/.luarc.json @@ -4,8 +4,7 @@ "pathStrict": true }, "workspace": { - "checkThirdParty": false, - "ignoreDir": [".direnv"] + "checkThirdParty": false }, "type": { "checkTableShape": true diff --git a/.styluaignore b/.styluaignore deleted file mode 100644 index 9b42106..0000000 --- a/.styluaignore +++ /dev/null @@ -1 +0,0 @@ -.direnv/ diff --git a/README.md b/README.md index 771c6a7..02e14d7 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ 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 f83b4a2..5754760 100644 --- a/doc/upstream.md +++ b/doc/upstream.md @@ -46,7 +46,6 @@ 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 @@ -162,4 +161,3 @@ 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 | diff --git a/flake.nix b/flake.nix index fb5faf0..aebd6d8 100644 --- a/flake.nix +++ b/flake.nix @@ -13,12 +13,9 @@ ... }: 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 deleted file mode 100755 index 7714909..0000000 --- a/scripts/ci.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 fmt -git diff --exit-code -- '*.nix' -nix develop --command busted