Merge branch 'main' into improve-terraformls

This commit is contained in:
ppenguin 2026-01-24 12:19:49 +01:00 committed by GitHub
commit 63d59ff40a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 71 additions and 28 deletions

View file

@ -31,13 +31,10 @@ in
# Generate the final manual from a set of parameters. This uses
# feel-co/ndg to render the web manual.
ndg html \
ndg --config-file ${./ndg.toml} html \
--jobs $NIX_BUILD_CORES --title "NVF" \
--module-options ${optionsJSON}/share/doc/nixos/options.json \
--manpage-urls ${path}/doc/manpage-urls.json \
--options-depth 3 \
--generate-search \
--highlight-code \
--input-dir ./manual \
--output-dir "$out/share/doc"

View file

@ -19,7 +19,7 @@ hooks should do what you need.
```nix
{
config.vim.lazy.plugins = {
aerial.nvim = {
"aerial.nvim" = {
# ^^^^^^^^^ this name should match the package.pname or package.name
package = aerial-nvim;

View file

@ -143,7 +143,8 @@ Some other settings and commands are now deprecated but are still supported.
- Added [sqruff](https://github.com/quarylabs/sqruff) support to `languages.sql`
- Added [Pyrefly](https://pyrefly.org/) support to `languages.python`
- Added [Pyrefly](https://pyrefly.org/) and [zuban](https://zubanls.com/)
support to `languages.python`
- Added TOML support via {option}`languages.toml` and the
[Tombi](https://tombi-toml.github.io/tombi/) language server, linter, and
@ -155,3 +156,8 @@ Some other settings and commands are now deprecated but are still supported.
[Machshev](https://github.com/machshev):
- Added `ruff` and `ty` LSP support for Python under `programs.python`.
[Snoweuph](https://github.com/snoweuph)
- Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
`languages.lua`.

28
docs/ndg.toml Normal file
View file

@ -0,0 +1,28 @@
# NDG Configuration File
# Input directory containing markdown files
input_dir = "docs"
# Output directory for generated documentation
output_dir = "build"
# Title for the documentation
title = "NVF"
# Footer text for the documentation
footer_text = "Generated with ndg"
generate_anchors = true
# Search configuration
[search]
enable = true
highlight_code = true
tab_style = "none"
revision = "main"
# Maximum heading level to index
max_heading_level = 3
# Depth of parent categories in options TOC
options_toc_depth = 2