Merge branch 'main' into feature/tera

This commit is contained in:
raf 2025-12-23 10:35:46 +03:00 committed by GitHub
commit c60749b9eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 66 additions and 23 deletions

View file

@ -8,7 +8,7 @@
## Preface ## Preface
[LICENSE]: ../LICENSE [LICENSE]: /LICENSE
I am glad you are thinking about contributing to nvf! The project is shaped by I am glad you are thinking about contributing to nvf! The project is shaped by
contributors and user feedback, and all contributions are appreciated. contributors and user feedback, and all contributions are appreciated.
@ -30,7 +30,7 @@ personally.
## Contributing Process ## 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]. 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 When you create a pull request, you will find a checklist of items to complete

View file

@ -23,7 +23,7 @@ jobs:
token: ${{ steps.app-token.outputs.token }} token: ${{ steps.app-token.outputs.token }}
- name: Backport Action - name: Backport Action
uses: korthout/backport-action@v3 uses: korthout/backport-action@v4
with: with:
# Regex pattern for labels that should trigger a backport AND extracts the target branch # 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 # from the name (e.g. v0.x or v0.x.y; we use zerover). This action will ONLY proceed if

View file

@ -25,7 +25,7 @@ jobs:
name: Checkout name: Checkout
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.8.4 uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |

View file

@ -18,7 +18,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31.8.4 - uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v6 uses: actions/checkout@v6
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.8.4 uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -93,7 +93,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31.8.4 - uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -112,7 +112,7 @@ jobs:
run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT} run: echo "date=$(date +'%Y-%m-%d-%H%M%S')" >> ${GITHUB_OUTPUT}
- name: Upload doc artifacts - name: Upload doc artifacts
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v6
with: with:
name: "${{ matrix.package }}" name: "${{ matrix.package }}"
path: result/share/doc/nvf path: result/share/doc/nvf
@ -124,7 +124,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31.8.4 - uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -162,7 +162,7 @@ jobs:
cat "$HOME/changed_files" cat "$HOME/changed_files"
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.8.4 uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |

View file

@ -3,7 +3,7 @@ name: Build and Preview Manual
on: on:
workflow_dispatch: workflow_dispatch:
pull_request_target: pull_request_target:
types: [opened, synchronize, reopened, closed] types: [opened, synchronize, reopened, labeled, unlabeled, edited]
paths: paths:
- ".github/workflows/docs-preview.yml" - ".github/workflows/docs-preview.yml"
- "modules/**" - "modules/**"
@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31.8.4 - uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -73,7 +73,7 @@ jobs:
id: prelude id: prelude
run: | run: |
PR_NUMBER=${{ github.event.pull_request.number }} 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 # Propagate non-interpolatable environment vars
echo "URL=$URL" >> "$GITHUB_OUTPUT" echo "URL=$URL" >> "$GITHUB_OUTPUT"

View file

@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31.8.4 - uses: cachix/install-nix-action@v31.9.0
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: | extra_nix_config: |
@ -59,3 +59,4 @@ jobs:
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public publish_dir: ./public
cname: nvf.notashelf.dev

View file

@ -12,4 +12,5 @@ release-notes/rl-0.5.md
release-notes/rl-0.6.md release-notes/rl-0.6.md
release-notes/rl-0.7.md release-notes/rl-0.7.md
release-notes/rl-0.8.md release-notes/rl-0.8.md
release-notes/rl-0.9.md
``` ```

View file

@ -627,3 +627,7 @@
- Aligned `codelldb` adapter setup with [rustaceanvim]s built-in logic. - Aligned `codelldb` adapter setup with [rustaceanvim]s built-in logic.
- Added `languages.rust.dap.backend` option to choose between `codelldb` and - Added `languages.rust.dap.backend` option to choose between `codelldb` and
`lldb-dap` adapters. `lldb-dap` adapters.
[Libadoxon](https://github.com/Libadoxon)
- `toggleterm` open map now also works when in terminal mode

View file

@ -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.

6
flake.lock generated
View file

@ -56,11 +56,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1765435293, "lastModified": 1765720983,
"narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
"owner": "feel-co", "owner": "feel-co",
"repo": "ndg", "repo": "ndg",
"rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -24,15 +24,33 @@ in {
# Recommended by upstream, so enabled here. # Recommended by upstream, so enabled here.
visuals.nvim-web-devicons.enable = true; visuals.nvim-web-devicons.enable = true;
# See `:help bufferline-hover-events`
options = mkIf cfg.setupOpts.options.hover.enabled {
mousemoveevent = true;
};
maps.normal = mkMerge [ 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<CR>" mappings.cycleNext.description) (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext<CR>" mappings.cycleNext.description)
(mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext<CR>" mappings.cycleNext.description) (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext<CR>" mappings.cycleNext.description)
(mkBinding cfg.mappings.cyclePrevious ":BufferLineCyclePrev<CR>" mappings.cyclePrevious.description) (mkBinding cfg.mappings.cyclePrevious ":BufferLineCyclePrev<CR>" mappings.cyclePrevious.description)
(mkBinding cfg.mappings.pick ":BufferLinePick<CR>" mappings.pick.description) (mkBinding cfg.mappings.pick ":BufferLinePick<CR>" mappings.pick.description)
(mkBinding cfg.mappings.sortByExtension ":BufferLineSortByExtension<CR>" mappings.sortByExtension.description) (
(mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory<CR>" mappings.sortByDirectory.description) mkBinding cfg.mappings.sortByExtension ":BufferLineSortByExtension<CR>"
(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) mappings.sortByExtension.description
)
(
mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory<CR>"
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<CR>" mappings.moveNext.description) (mkBinding cfg.mappings.moveNext ":BufferLineMoveNext<CR>" mappings.moveNext.description)
(mkBinding cfg.mappings.movePrevious ":BufferLineMovePrev<CR>" mappings.movePrevious.description) (mkBinding cfg.mappings.movePrevious ":BufferLineMovePrev<CR>" mappings.movePrevious.description)
]; ];

View file

@ -17,9 +17,20 @@ in {
vim = { vim = {
lazy.plugins.toggleterm-nvim = { lazy.plugins.toggleterm-nvim = {
package = "toggleterm-nvim"; package = "toggleterm-nvim";
cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"]; cmd = [
"ToggleTerm"
"ToggleTermSendCurrentLine"
"ToggleTermSendVisualLines"
"ToggleTermSendVisualSelection"
"ToggleTermSetName"
"ToggleTermToggleAll"
];
keys = keys =
[(mkKeymap "n" cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" {desc = "Toggle terminal";})] [
(mkKeymap ["n" "t"] cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" {
desc = "Toggle terminal";
})
]
++ optional cfg.lazygit.enable { ++ optional cfg.lazygit.enable {
key = cfg.lazygit.mappings.open; key = cfg.lazygit.mappings.open;
mode = "n"; mode = "n";