updates

modules/module/settings/cat-packages.nix

@@ -43,6 +43,7 @@ in
       python313Packages.pylatexenc
       quartoPkg
       zk
+      marksman
     ]);
 
     nix = maybe "nix" (with pkgs; [
@@ -99,13 +100,12 @@ in
       quartoPkg
       pkgs.air-formatter
       pkgs.yaml-language-server
-      pkgs.rnvimserver
     ];
 
     # cats without packages get empty lists
     general = [ ];
     gitPlugins = [ ];
-    treesitterParsers = [ pkgs.tree-sitter ];
+    treesitterParsers = [ ];
     utils = [ ];
   };
 }

modules/module/settings/core.nix

@@ -14,10 +14,6 @@
   # Enable RC wrapping (allows neovim to find the config)
   config.settings.wrapRc = lib.mkDefault true;
 
-  # Lua packages available to neovim (for :lua require())
-  config.settings.nvim_lua_env = lp:
-    lib.optionals (config.cats.general or false) [ lp.tiktoken_core ];
-
   # Binary name for the wrapper
   config.binName = lib.mkDefault "vv";
 

modules/module/settings/env.nix

@@ -11,10 +11,9 @@
       UV_PYTHON_DOWNLOADS = "never";
       UV_PYTHON = pkgs.python.interpreter;
     })
-    (lib.mkIf (config.cats.r or false) {
-      RNVIM_COMPLDIR = "$PWD/.r-compl";
-      TMPDIR = "$PWD/.r-tmp";
-    })
+    # R.nvim v1.x owns its cache and temporary directories and exports
+    # RNVIM_COMPLDIR/RNVIM_TMPDIR during setup. Do not inject literal `$PWD`
+    # values into the wrapper environment.
   ];
 
   # Environment variables with defaults (can be overridden by user)

modules/module/settings/hosts.nix

@@ -22,16 +22,6 @@ in
         nvim-host.flags."--neovim-bin" = "${builtins.placeholder "out"}/bin/${config.binName}";
       };
 
-      m = {
-        nvim-host.enable = false;
-        nvim-host.package = "${pkgs.uv}/bin/uv";
-        nvim-host.argv0 = "uv";
-        nvim-host.addFlag = [
-          "run"
-          "marimo"
-          "edit"
-        ];
-      };
     }
     (lib.mkIf (config.cats.julia or false) {
       jl = {