Merge branch 'main' into feat/vtsls-support

docs/manual/hacking.md

@@ -388,7 +388,7 @@ generated and opened by typing the following in a shell within a clone of the
 $ nix build .#docs-html
 
 # Open it with a valid browser
-$ xdg-open $PWD/result/share/doc/nvf/index.html
+$ xdg-open $PWD/result/share/doc/index.html
 ```
 
 Additionally, if you are adding new links to the documentation it is **generally

docs/manual/installation/modules/home-manager.md

@@ -19,20 +19,13 @@ To use **nvf** with flakes, we first need to add the input to our `flake.nix`.
 # flake.nix
 {
   inputs = {
-    # Optional, if you intend to follow nvf's obsidian-nvim input
-    # you must also add it as a flake input.
-    obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
-
-    # Required, nvf works best and only directly supports flakes
+    # nvf works best with and only directly supports flakes
     nvf = {
       url = "github:NotAShelf/nvf";
       # You can override the input nixpkgs to follow your system's
       # instance of nixpkgs. This is safe to do as nvf does not depend
       # on a binary cache.
       inputs.nixpkgs.follows = "nixpkgs";
-      # Optionally, you can also override individual plugins
-      # for example:
-      inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
     };
 
     # ...
@@ -44,8 +37,8 @@ Followed by importing the home-manager module somewhere in your configuration.
 
 ```nix
 {
-  # Assuming "nvf" is in your inputs and inputs is in the argument set.
-  # See example installation below
+  # Assuming nvf is in your inputs and inputs is in the argument set.
+  # See example installation below.
   imports = [ inputs.nvf.homeManagerModules.default ];
 }
 ```

docs/manual/installation/modules/nixos.md

@@ -19,20 +19,13 @@ To use **nvf** with flakes, we first need to add the input to our `flake.nix`.
 # flake.nix
 {
   inputs = {
-    # Optional, if you intend to follow nvf's obsidian-nvim input
-    # you must also add it as a flake input.
-    obsidian-nvim.url = "github:epwalsh/obsidian.nvim";
-
-    # Required, nvf works best and only directly supports flakes
+    # nvf works best with and only directly supports flakes
     nvf = {
       url = "github:NotAShelf/nvf";
       # You can override the input nixpkgs to follow your system's
       # instance of nixpkgs. This is safe to do as nvf does not depend
       # on a binary cache.
       inputs.nixpkgs.follows = "nixpkgs";
-      # Optionally, you can also override individual plugins
-      # for example:
-      inputs.obsidian-nvim.follows = "obsidian-nvim"; # <- this will use the obsidian-nvim from your inputs
     };
 
     # ...
@@ -44,8 +37,8 @@ Followed by importing the NixOS module somewhere in your configuration.
 
 ```nix
 {
-  # assuming nvf is in your inputs and inputs is in the argset
-  # see example below
+  # Assuming nvf is in your inputs and inputs is in the argument set.
+  # See example below.
   imports = [ inputs.nvf.nixosModules.default ];
 }
 ```
@@ -79,7 +72,6 @@ configure **nvf**.
 {
   programs.nvf = {
     enable = true;
-    
     # Your settings need to go into the settings attribute set
     # most settings are documented in the appendix
     settings = {

docs/manual/release-notes/rl-0.9.md

@@ -6,9 +6,39 @@
   `vimPlugins.nvim-treesitter`. Namely, it changes from the frozen `master`
   branch to the new main branch. This change removes incremental selections, so
   it is no longer available.
+- [obsidian.nvim] now uses a maintained fork which has removed the `dir`
+  setting. Use `workspaces` instead:
+
+  ```nix
+  {
+    workspaces = [
+      {
+        name = "any-string";
+        path = "~/old/dir/path/value";
+      }
+    ];
+  }
+  ```
+
+  Some other settings and commands are now deprecated but are still supported.
+
+  - The `setupOpts.mappings` options were also removed. Use the built-in
+    Neovim settings (nvf's {option}`vim.keymaps`)
 
 ## Changelog {#sec-release-0-9-changelog}
 
+[taylrfnt](https://github.com/taylrfnt)
+
+- Introduce a `darwinModule` option for Darwin users. The ergonomics of
+  importing a `nixosModule` into a Darwin flake were less than ideal, and when
+  users fork and update npins, they are prone to encountering errors like the
+  following:
+
+  ```shell
+  (class: "nixos") cannot be imported into a module 
+  evaluation that expects class "darwin".
+  ```
+
 [suimong](https://github.com/suimong):
 
 - Fix `vim.tabline.nvimBufferline` where `setupOpts.options.hover` requires
@@ -49,3 +79,61 @@
           servers = ["vtsls"];
         };
       };`
+
+[jtliang24](https://github.com/jtliang24):
+
+- Updated nix language plugin to use pkgs.nixfmt instead of pkgs.nixfmt-rfc-style
+
+[alfarel](https://github.com/alfarelcynthesis):
+
+[obsidian.nvim]: https://github.com/obsidian-nvim/obsidian.nvim
+[blink.cmp]: https://cmp.saghen.dev/
+[snacks.nvim]: https://github.com/folke/snacks.nvim
+[mini.nvim]: https://nvim-mini.org/mini.nvim/
+[telescope.nvim]: https://github.com/nvim-telescope/telescope.nvim
+[fzf-lua]: https://github.com/ibhagwan/fzf-lua
+[render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
+[markview.nvim]: https://github.com/OXY2DEV/markview.nvim
+[which-key.nvim]: https://github.com/folke/which-key.nvim
+
+- Upgrade [obsidian.nvim] to use a maintained fork, instead of the unmaintained
+  upstream.
+  - Various upstream improvements:
+    - Support [blink.cmp] and completion plugin autodetection.
+    - Support various pickers for prompts, including [snacks.nvim]'s
+      `snacks.picker`, [mini.nvim]'s `mini.pick`, [telescope.nvim], and
+      [fzf-lua].
+    - Merge commands like `ObsidianBacklinks` into `Obisidian backlinks`. The
+      old format is still supported by default.
+    - Some `setupOpts` options have changed:
+      - `disable_frontmatter` -> `frontmatter.enabled` (and inverted), still
+        supported.
+      - `note_frontmatter_func` -> `frontmatter.func`, still supported.
+      - `statusline` module is now deprecated in favour of `footer`, still
+        supported.
+      - `dir` is no longer supported, use `workspaces`:
+
+        ```nix
+        {
+          workspaces = [
+            {
+              name = "any-string";
+              path = "~/old/dir/path/value";
+            }
+          ];
+        }
+        ```
+
+      - `use_advanced_uri` -> `open.use_advanced_uri`.
+      - Mappings are now expected to be set using the built-in Neovim APIs,
+        managed by `vim.keymaps` in nvf, instead of `mappings` options.
+      - Some option defaults have changed.
+    - And more.
+  - Automatically configure an enabled picker in the order mentioned above, if
+    any are enabled.
+  - Add integration with `snacks.image` for rendering workspace/vault assets.
+  - Detect if [render-markdown.nvim] or [markview.nvim] are enabled and disable
+    the `ui` module if so. It should work without this, but `render-markdown`'s
+    {command}`:healthcheck` doesn't know that.
+  - Remove [which-key.nvim] `<leader>o` `+Notes` description which did not
+    actually correspond to any keybinds.