diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2379973f..121915c4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,7 +8,7 @@ ## Preface -[LICENSE]: ../LICENSE +[LICENSE]: /LICENSE I am glad you are thinking about contributing to nvf! The project is shaped by contributors and user feedback, and all contributions are appreciated. @@ -30,7 +30,7 @@ personally. ## Contributing Process -[pull request template]: ./PULL_REQUEST_TEMPLATE.md +[pull request template]: /.github/PULL_REQUEST_TEMPLATE.md The contribution process is mostly documented in the [pull request template]. When you create a pull request, you will find a checklist of items to complete diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index cb2927e4..0542862e 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -23,7 +23,7 @@ jobs: token: ${{ steps.app-token.outputs.token }} - name: Backport Action - uses: korthout/backport-action@v3 + uses: korthout/backport-action@v4 with: # Regex pattern for labels that should trigger a backport AND extracts the target branch # from the name (e.g. v0.x or v0.x.y; we use zerover). This action will ONLY proceed if diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 88768ee9..63a0fd6f 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -25,7 +25,7 @@ jobs: name: Checkout - name: Install Nix - uses: cachix/install-nix-action@v31.8.4 + uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 78671a88..5583213e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.8.4 + - uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v6 - name: Install Nix - uses: cachix/install-nix-action@v31.8.4 + uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -93,7 +93,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.8.4 + - uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -112,7 +112,7 @@ jobs: run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT} - name: Upload doc artifacts - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: "${{ matrix.package }}" path: result/share/doc/nvf @@ -124,7 +124,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.8.4 + - uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -162,7 +162,7 @@ jobs: cat "$HOME/changed_files" - name: Install Nix - uses: cachix/install-nix-action@v31.8.4 + uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 74fd4b34..984654d2 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -3,7 +3,7 @@ name: Build and Preview Manual on: workflow_dispatch: pull_request_target: - types: [opened, synchronize, reopened, closed] + types: [opened, synchronize, reopened, labeled, unlabeled, edited] paths: - ".github/workflows/docs-preview.yml" - "modules/**" @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.8.4 + - uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -73,7 +73,7 @@ jobs: id: prelude run: | PR_NUMBER=${{ github.event.pull_request.number }} - URL="https://${{ github.repository_owner }}.github.io/nvf/docs-preview-${PR_NUMBER}/" + URL="https:///nvf.notashelf.dev/docs-preview-${PR_NUMBER}/" # Propagate non-interpolatable environment vars echo "URL=$URL" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 9a8b690f..4b6e2eff 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.8.4 + - uses: cachix/install-nix-action@v31.9.0 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -59,3 +59,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./public + cname: nvf.notashelf.dev diff --git a/docs/manual/release-notes.md b/docs/manual/release-notes.md index 296b20b1..ddb53883 100644 --- a/docs/manual/release-notes.md +++ b/docs/manual/release-notes.md @@ -12,4 +12,5 @@ release-notes/rl-0.5.md release-notes/rl-0.6.md release-notes/rl-0.7.md release-notes/rl-0.8.md +release-notes/rl-0.9.md ``` diff --git a/docs/manual/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md index fadb2e69..bb26a9a2 100644 --- a/docs/manual/release-notes/rl-0.8.md +++ b/docs/manual/release-notes/rl-0.8.md @@ -627,3 +627,7 @@ - Aligned `codelldb` adapter setup with [rustaceanvim]’s built-in logic. - Added `languages.rust.dap.backend` option to choose between `codelldb` and `lldb-dap` adapters. + +[Libadoxon](https://github.com/Libadoxon) + +- `toggleterm` open map now also works when in terminal mode diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md new file mode 100644 index 00000000..16bc1cf0 --- /dev/null +++ b/docs/manual/release-notes/rl-0.9.md @@ -0,0 +1,8 @@ +# Release 0.9 {#sec-release-0-9} + +## Changelog {#sec-release-0-9-changelog} + +[suimong](https://github.com/suimong): + +- Fix `vim.tabline.nvimBufferline` where `setupOpts.options.hover` requires + `vim.opt.mousemoveevent` to be set. diff --git a/flake.lock b/flake.lock index e55e64f1..de4d1484 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765435293, - "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "lastModified": 1765720983, + "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", "owner": "feel-co", "repo": "ndg", - "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", + "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", "type": "github" }, "original": { diff --git a/modules/plugins/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix index 396e6886..b3285537 100644 --- a/modules/plugins/tabline/nvim-bufferline/config.nix +++ b/modules/plugins/tabline/nvim-bufferline/config.nix @@ -24,15 +24,33 @@ in { # Recommended by upstream, so enabled here. visuals.nvim-web-devicons.enable = true; + # See `:help bufferline-hover-events` + options = mkIf cfg.setupOpts.options.hover.enabled { + mousemoveevent = true; + }; + maps.normal = mkMerge [ - (mkLuaBinding cfg.mappings.closeCurrent "require(\"bufdelete\").bufdelete" mappings.closeCurrent.description) + ( + mkLuaBinding cfg.mappings.closeCurrent "require(\"bufdelete\").bufdelete" + mappings.closeCurrent.description + ) (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext" mappings.cycleNext.description) (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext" mappings.cycleNext.description) (mkBinding cfg.mappings.cyclePrevious ":BufferLineCyclePrev" mappings.cyclePrevious.description) (mkBinding cfg.mappings.pick ":BufferLinePick" mappings.pick.description) - (mkBinding cfg.mappings.sortByExtension ":BufferLineSortByExtension" mappings.sortByExtension.description) - (mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory" mappings.sortByDirectory.description) - (mkLuaBinding cfg.mappings.sortById "function() require(\"bufferline\").sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end) end" mappings.sortById.description) + ( + mkBinding cfg.mappings.sortByExtension ":BufferLineSortByExtension" + mappings.sortByExtension.description + ) + ( + mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory" + mappings.sortByDirectory.description + ) + ( + mkLuaBinding cfg.mappings.sortById + "function() require(\"bufferline\").sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end) end" + mappings.sortById.description + ) (mkBinding cfg.mappings.moveNext ":BufferLineMoveNext" mappings.moveNext.description) (mkBinding cfg.mappings.movePrevious ":BufferLineMovePrev" mappings.movePrevious.description) ]; diff --git a/modules/plugins/terminal/toggleterm/config.nix b/modules/plugins/terminal/toggleterm/config.nix index 280f29d2..85cca09f 100644 --- a/modules/plugins/terminal/toggleterm/config.nix +++ b/modules/plugins/terminal/toggleterm/config.nix @@ -17,9 +17,20 @@ in { vim = { lazy.plugins.toggleterm-nvim = { package = "toggleterm-nvim"; - cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"]; + cmd = [ + "ToggleTerm" + "ToggleTermSendCurrentLine" + "ToggleTermSendVisualLines" + "ToggleTermSendVisualSelection" + "ToggleTermSetName" + "ToggleTermToggleAll" + ]; keys = - [(mkKeymap "n" cfg.mappings.open "execute v:count . \"ToggleTerm\"" {desc = "Toggle terminal";})] + [ + (mkKeymap ["n" "t"] cfg.mappings.open "execute v:count . \"ToggleTerm\"" { + desc = "Toggle terminal"; + }) + ] ++ optional cfg.lazygit.enable { key = cfg.lazygit.mappings.open; mode = "n";