Compare commits

..

1 commit

Author SHA1 Message Date
8e031476d0
meta: mark as release
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I9bcc09a3f81b228b5758e9cec7aad1ad6a6a6964
2025-12-12 14:09:05 +03:00
18 changed files with 62 additions and 166 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]: /.github/PULL_REQUEST_TEMPLATE.md [pull request template]: ./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

@ -17,13 +17,13 @@ jobs:
if: | if: |
github.event.pull_request.merged == true && startsWith(github.event.label.name, 'backport-') github.event.pull_request.merged == true && startsWith(github.event.label.name, 'backport-')
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v5
with: with:
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
token: ${{ steps.app-token.outputs.token }} token: ${{ steps.app-token.outputs.token }}
- name: Backport Action - name: Backport Action
uses: korthout/backport-action@v4 uses: korthout/backport-action@v3
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

@ -21,16 +21,11 @@ jobs:
- nix - nix
- maximal - maximal
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v5
name: Checkout name: Checkout
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.9.0 uses: DeterminateSystems/nix-installer-action@main
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- uses: cachix/cachix-action@v16 - uses: cachix/cachix-action@v16
with: with:

View file

@ -17,13 +17,10 @@ jobs:
if: "!contains(github.event.pull_request.title, '[skip ci]')" if: "!contains(github.event.pull_request.title, '[skip ci]')"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- uses: cachix/install-nix-action@v31.9.0
with: - name: Install Nix
nix_path: nixpkgs=channel:nixos-unstable uses: DeterminateSystems/nix-installer-action@main
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Check Flake - name: Check Flake
run: nix flake check run: nix flake check
@ -34,15 +31,10 @@ jobs:
if: "!contains(github.event.pull_request.title, '[skip ci]')" if: "!contains(github.event.pull_request.title, '[skip ci]')"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.9.0 uses: DeterminateSystems/nix-installer-action@main
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Check formatting via Alejandra - name: Check formatting via Alejandra
run: nix run nixpkgs#alejandra -- --check . --exclude npins run: nix run nixpkgs#alejandra -- --check . --exclude npins
@ -64,7 +56,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[skip ci]')" if: "!contains(github.event.pull_request.title, '[skip ci]')"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: Check for typos - name: Check for typos
uses: crate-ci/typos@master uses: crate-ci/typos@master
@ -91,14 +83,11 @@ jobs:
- docs-manpages - docs-manpages
- docs-json - docs-json
steps: steps:
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- uses: cachix/install-nix-action@v31.9.0
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Set default git branch (to reduce log spam) - name: Set default git branch (to reduce log spam)
run: git config --global init.defaultBranch main run: git config --global init.defaultBranch main
@ -112,7 +101,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@v6 uses: actions/upload-artifact@v5
with: with:
name: "${{ matrix.package }}" name: "${{ matrix.package }}"
path: result/share/doc/nvf path: result/share/doc/nvf
@ -122,14 +111,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: false # disabled until we fix ndg docs if: false # disabled until we fix ndg docs
steps: steps:
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- uses: cachix/install-nix-action@v31.9.0
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Build linkcheck package - name: Build linkcheck package
run: nix build .#docs-linkcheck -Lv run: nix build .#docs-linkcheck -Lv
@ -140,7 +126,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[skip ci]')" if: "!contains(github.event.pull_request.title, '[skip ci]')"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
with: with:
fetch-depth: 2 # slows down checkout, but we need to compare against the previous commit on push events fetch-depth: 2 # slows down checkout, but we need to compare against the previous commit on push events
@ -162,12 +148,7 @@ jobs:
cat "$HOME/changed_files" cat "$HOME/changed_files"
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31.9.0 uses: DeterminateSystems/nix-installer-action@main
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Checking Editorconfig conformance - name: Checking Editorconfig conformance
shell: bash shell: bash

View file

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: "Delete old branches" - name: "Delete old branches"
uses: beatlabs/delete-old-branches-action@v0.0.11 uses: beatlabs/delete-old-branches-action@v0.0.11

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, labeled, unlabeled, edited] types: [opened, synchronize, reopened, closed]
paths: paths:
- ".github/workflows/docs-preview.yml" - ".github/workflows/docs-preview.yml"
- "modules/**" - "modules/**"
@ -24,13 +24,11 @@ jobs:
build-preview: build-preview:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - name: Install Nix
- uses: cachix/install-nix-action@v31.9.0 uses: DeterminateSystems/nix-installer-action@main
with:
nix_path: nixpkgs=channel:nixos-unstable - name: Checkout
extra_nix_config: | uses: actions/checkout@v5
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- name: Set default git branch (to reduce log spam) - name: Set default git branch (to reduce log spam)
run: git config --global init.defaultBranch main run: git config --global init.defaultBranch main
@ -51,7 +49,7 @@ jobs:
mkdir -p $PREVIEW_DIR mkdir -p $PREVIEW_DIR
# Copy the build files to the preview subdirectory # Copy the build files to the preview subdirectory
cp -rvf ../result/share/doc/* ./$PREVIEW_DIR cp -rvf ../result/share/doc/nvf/* ./$PREVIEW_DIR
# Configure git to use the GitHub Actions token for authentication # Configure git to use the GitHub Actions token for authentication
git config --global user.name "GitHub Actions" git config --global user.name "GitHub Actions"
@ -73,7 +71,7 @@ jobs:
id: prelude id: prelude
run: | run: |
PR_NUMBER=${{ github.event.pull_request.number }} PR_NUMBER=${{ github.event.pull_request.number }}
URL="https:///nvf.notashelf.dev/docs-preview-${PR_NUMBER}/" URL="https://${{ github.repository_owner }}.github.io/nvf/docs-preview-${PR_NUMBER}/"
# Propagate non-interpolatable environment vars # Propagate non-interpolatable environment vars
echo "URL=$URL" >> "$GITHUB_OUTPUT" echo "URL=$URL" >> "$GITHUB_OUTPUT"
@ -129,7 +127,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: Delete preview for closed/merged PR - name: Delete preview for closed/merged PR
run: | run: |
@ -166,7 +164,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: Double check preview directory deletion - name: Double check preview directory deletion
run: | run: |

View file

@ -28,7 +28,7 @@ jobs:
outputs: outputs:
should_run: ${{ steps.should_run.outputs.should_run }} should_run: ${{ steps.should_run.outputs.should_run }}
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v5
- name: print latest_commit - name: print latest_commit
run: echo ${{ github.sha }} run: echo ${{ github.sha }}
@ -43,20 +43,12 @@ jobs:
if: ${{ needs.check_date.outputs.should_run != 'false' }} if: ${{ needs.check_date.outputs.should_run != 'false' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v5
- uses: cachix/install-nix-action@v31.9.0 - uses: DeterminateSystems/nix-installer-action@main
with:
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: |
substituters = https://cache.nixos.org/ https://feel-co.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= feel-co.cachix.org-1:nwEFNnwZvtl4KKSH5LDg+/+K7bV0vcs6faMHAJ6xx0w=
- run: | - run: |
nix build .#docs -Lv nix build .#docs -Lv
cp -r result/share/doc public cp -r result/share/doc/nvf public
- uses: peaceiris/actions-gh-pages@v4 - uses: peaceiris/actions-gh-pages@v4
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public publish_dir: ./public
cname: nvf.notashelf.dev

View file

@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v5
- name: "Install Nix" - name: "Install Nix"
uses: cachix/install-nix-action@v31.9.0 uses: cachix/install-nix-action@v31.8.2
- name: Set up Git - name: Set up Git
run: | run: |
@ -69,7 +69,7 @@ jobs:
- name: Create Pull Request - name: Create Pull Request
if: steps.check_changes.outputs.changes_detected == 'true' if: steps.check_changes.outputs.changes_detected == 'true'
uses: peter-evans/create-pull-request@v8 uses: peter-evans/create-pull-request@v7
with: with:
branch: ${{ env.BRANCH_NAME }} branch: ${{ env.BRANCH_NAME }}
base: main base: main

View file

@ -12,5 +12,4 @@ 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

@ -621,13 +621,3 @@
[JudahZF](https://github.com/JudahZF): [JudahZF](https://github.com/JudahZF):
- Added gitFiles mapping option to telescope - Added gitFiles mapping option to telescope
[Ring-A-Ding-Ding-Baby](https://github.com/Ring-A-Ding-Ding-Baby)
- 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

View file

@ -1,8 +0,0 @@
# 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": 1765720983, "lastModified": 1765435293,
"narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
"owner": "feel-co", "owner": "feel-co",
"repo": "ndg", "repo": "ndg",
"rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,5 +1,5 @@
{ {
inputs, self,
config, config,
pkgs, pkgs,
lib, lib,
@ -43,7 +43,7 @@
defaultFormat = ["prettier"]; defaultFormat = ["prettier"];
formats = let formats = let
parser = "${inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-astro}/index.js"; parser = "${self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-astro}/index.js";
in { in {
prettier = { prettier = {
command = getExe pkgs.prettier; command = getExe pkgs.prettier;

View file

@ -87,19 +87,6 @@ in {
type = package; type = package;
default = pkgs.lldb; default = pkgs.lldb;
}; };
adapter = mkOption {
type = enum ["lldb-dap" "codelldb"];
default = "codelldb";
description = ''
Select which LLDB-based debug adapter to use:
- "codelldb": use the CodeLLDB adapter from the vadimcn.vscode-lldb extension.
- "lldb-dap": use the LLDB DAP implementation shipped with LLVM (lldb-dap).
The default "codelldb" backend generally provides a better debugging experience for Rust.
'';
};
}; };
extensions = { extensions = {
@ -204,20 +191,11 @@ in {
${optionalString cfg.dap.enable '' ${optionalString cfg.dap.enable ''
dap = { dap = {
adapter = ${ adapter = {
if cfg.dap.adapter == "lldb-dap" type = "executable",
then '' command = "${cfg.dap.package}/bin/lldb-dap",
{ name = "rustacean_lldb",
type = "executable", },
command = "${cfg.dap.package}/bin/lldb-dap",
name = "rustacean_lldb",
}''
else let
codelldb = pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter;
codelldbPath = "${codelldb}/bin/codelldb";
liblldbPath = "${codelldb}/share/lldb/lib/liblldb.so";
in ''require("rustaceanvim.config").get_codelldb_adapter("${codelldbPath}", "${liblldbPath}")''
},
}, },
''} ''}
} }

View file

@ -1,5 +1,5 @@
{ {
inputs, self,
config, config,
pkgs, pkgs,
lib, lib,
@ -56,7 +56,7 @@
defaultFormat = ["prettier"]; defaultFormat = ["prettier"];
formats = let formats = let
prettierPlugin = inputs.self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte; prettierPlugin = self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte;
prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js"; prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js";
in { in {
prettier = { prettier = {

View file

@ -24,33 +24,15 @@ 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.sortByExtension ":BufferLineSortByExtension<CR>" (mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory<CR>" mappings.sortByDirectory.description)
mappings.sortByExtension.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.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,20 +17,9 @@ in {
vim = { vim = {
lazy.plugins.toggleterm-nvim = { lazy.plugins.toggleterm-nvim = {
package = "toggleterm-nvim"; package = "toggleterm-nvim";
cmd = [ cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"];
"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";

View file

@ -1,4 +1,4 @@
{ {
"release": "v0.9", "release": "v0.8",
"isReleaseBranch": false "isReleaseBranch": true
} }