Skip to content

Commit 7267cf3

Browse files
authored
Merge branch 'main' into main
2 parents 7806649 + 5b5548d commit 7267cf3

File tree

40 files changed

+1044
-591
lines changed

40 files changed

+1044
-591
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ it above in your description.
2424
-->
2525

2626
[editorconfig]: https://editorconfig.org
27-
[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/release-notes
28-
[hacking nvf]: https://notashelf.github.io/nvf/index.xhtml#sec-guidelines
27+
[changelog]: https://github.com/NotAShelf/nvf/tree/main/docs/manual/release-notes
28+
[hacking nvf]: https://nvf.notashelf.dev/hacking.html#sec-guidelines
2929

3030
- [ ] I have updated the [changelog] as per my changes
3131
- [ ] I have tested, and self-reviewed my code

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Check Flake
2929
run: nix flake check
3030

31-
format-with-alejandra:
31+
format-sources:
3232
name: "Check formatting"
3333
runs-on: ubuntu-latest
3434
if: "!contains(github.event.pull_request.title, '[skip ci]')"

.github/workflows/docs-preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and Preview Manual
33
on:
44
workflow_dispatch:
55
pull_request_target:
6-
types: [opened, synchronize, reopened, closed]
6+
types: [opened, synchronize, reopened, labeled, unlabeled, edited]
77
paths:
88
- ".github/workflows/docs-preview.yml"
99
- "modules/**"
@@ -73,7 +73,7 @@ jobs:
7373
id: prelude
7474
run: |
7575
PR_NUMBER=${{ github.event.pull_request.number }}
76-
URL="https://${{ github.repository_owner }}.github.io/nvf/docs-preview-${PR_NUMBER}/"
76+
URL="https:///nvf.notashelf.dev/docs-preview-${PR_NUMBER}/"
7777
7878
# Propagate non-interpolatable environment vars
7979
echo "URL=$URL" >> "$GITHUB_OUTPUT"

.github/workflows/manual.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ jobs:
5959
with:
6060
github_token: ${{ secrets.GITHUB_TOKEN }}
6161
publish_dir: ./public
62+
cname: nvf.notashelf.dev

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565

6666
## Features
6767

68-
[standalone]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-installation
69-
[NixOS module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-nixos
70-
[Home-Manager module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-hm
68+
[standalone]: https://nvf.notashelf.dev/#ch-standalone-installation
69+
[NixOS module]: https://nvf.notashelf.dev/#ch-standalone-nixos
70+
[Home-Manager module]: https://nvf.notashelf.dev/#ch-standalone-hm
7171
[release notes]: https://notashelf.github.io/nvf/release-notes.html
7272
[discussions tab]: https://github.com/notashelf/nvf/discussions
7373
[FAQ section]: #frequently-asked-questions

configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ isMaximal: {
214214
};
215215

216216
notes = {
217-
obsidian.enable = false; # FIXME: neovim fails to build if obsidian is enabled
218217
neorg.enable = false;
219218
orgmode.enable = false;
220219
mind-nvim.enable = isMaximal;

docs/manual/configuring.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
[helpful tips section]: ./tips.html#ch-helpful-tips
44
[options reference]: ./options.html
55

6-
nvf allows for _very_ extensive configuration in Neovim through the Nix module
7-
interface. The below chapters describe several of the options exposed in nvf for
8-
your convenience. You might also be interested in the [helpful tips section] for
9-
more advanced or unusual configuration options supported by nvf.
6+
**nvf** allows for _very_ extensive configuration in Neovim through the Nix
7+
module interface. The below chapters describe several of the options exposed in
8+
nvf for your convenience. You might also be interested in the
9+
[helpful tips section] for more advanced or unusual configuration options
10+
supported by nvf.
1011

1112
Note that this section does not cover module _options_. For an overview of all
1213
module options provided by nvf, please visit the [options reference]

0 commit comments

Comments
 (0)