Quarto: init

configuration.nix

@@ -176,6 +176,7 @@ isMaximal: {
       obsidian.enable = false; # FIXME: neovim fails to build if obsidian is enabled
       neorg.enable = false;
       orgmode.enable = false;
+      quarto-nvim.enable = isMaximal;
       mind-nvim.enable = isMaximal;
       todo-comments.enable = true;
     };

docs/release-notes/rl-0.7.md

@@ -262,6 +262,7 @@ everyone.
 - Add LSP and Treesitter support for R under `vim.languages.R`.
 - Add Otter support under `vim.lsp.otter` and an assert to prevent conflict with
   ccc
+- Fixed typo in Otter's setupOpts
 - Add Neorg support under `vim.notes.neorg`
 - Add LSP, diagnostics, formatter and Treesitter support for Kotlin under
   `vim.languages.kotlin`

flake.nix

@@ -170,6 +170,10 @@
       flake = false;
     };
 
+    plugin-quarto-nvim = {
+      url = "github:quarto-dev/quarto-nvim";
+      flake = false;
+    };
     plugin-otter-nvim = {
       url = "github:jmbuhr/otter.nvim";
       flake = false;

modules/plugins/lsp/otter/config.nix

@@ -32,7 +32,7 @@ in {
 
       pluginRC.otter-nvim = entryAnywhere ''
         -- Enable otter diagnostics viewer
-        require("otter").setup({${toLuaObject cfg.otter-nvim.setupOpts}})
+        require("otter").setup(${toLuaObject cfg.otter-nvim.setupOpts})
       '';
     };
   };

modules/plugins/notes/default.nix

@@ -3,6 +3,7 @@
     ./obsidian
     ./orgmode
     ./neorg
+    ./quarto
     ./mind-nvim
     ./todo-comments
   ];

modules/plugins/notes/quarto/config.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  cfg = config.vim.notes.quarto-nvim;
+in {
+  config = mkIf cfg.enable (mkMerge [
+    {
+      vim = {
+        startPlugins = ["otter-nvim" "quarto-nvim"];
+
+        pluginRC.quarto-nvim = entryAnywhere ''
+          require('quarto').setup(${toLuaObject cfg.setupOpts})
+        '';
+      };
+    }
+
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.quartoPackage];
+    })
+  ]);
+}

modules/plugins/notes/quarto/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./quarto.nix
+    ./config.nix
+  ];
+}

modules/plugins/notes/quarto/quarto.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
+in {
+  options.vim.notes.quarto-nvim = {
+    enable = mkEnableOption ''
+      Quarto-nvim, which provides tools for working on Quarto manuscripts in Neovim.
+    '';
+
+    setupOpts = mkPluginSetupOption "quarto-nvim" {};
+
+    treesitter = {
+      enable = mkEnableOption "Quarto treesitter" // {default = config.vim.languages.enableTreesitter;};
+      quartoPackage = mkGrammarOption pkgs "markdown";
+      quartoInlinePackage = mkGrammarOption pkgs "markdown-inline";
+    };
+  };
+}