From 818ea9dd62cb69a5a67977645a1f889aadf6faad Mon Sep 17 00:00:00 2001
From: Jordan Isaacs <mail@jdisaacs.com>
Date: Sun, 11 Dec 2022 02:21:08 -0500
Subject: [PATCH] fix syntax highlighting on startup

---
 modules/treesitter/context.nix    | 1 +
 modules/treesitter/treesitter.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/treesitter/context.nix b/modules/treesitter/context.nix
index d5e88ce..64e421e 100644
--- a/modules/treesitter/context.nix
+++ b/modules/treesitter/context.nix
@@ -10,6 +10,7 @@ with builtins; let
 in {
   options.vim.treesitter.context.enable = mkOption {
     type = types.bool;
+    default = false;
     description = "enable function context [nvim-treesitter-context]";
   };
 
diff --git a/modules/treesitter/treesitter.nix b/modules/treesitter/treesitter.nix
index c363434..56ae709 100644
--- a/modules/treesitter/treesitter.nix
+++ b/modules/treesitter/treesitter.nix
@@ -16,7 +16,7 @@ in {
     };
 
     fold = mkOption {
-      default = true;
+      default = false;
       type = types.bool;
       description = "enable fold with tree-sitter";
     };
@@ -70,7 +70,8 @@ in {
         )
       ];
 
-      vim.configRC.treesitter = writeIf cfg.fold (nvim.dag.entryAnywhere ''
+      # For some reason treesitter highlighting does not work on start if this is set before syntax on
+      vim.configRC.treesitter = writeIf cfg.fold (nvim.dag.entryBefore ["basic"] ''
         " Tree-sitter based folding
         set foldmethod=expr
         set foldexpr=nvim_treesitter#foldexpr()
@@ -86,7 +87,7 @@ in {
           },
 
           auto_install = false,
-          ensure_isntalled = {},
+          ensure_installed = {},
 
           incremental_selection = {
             enable = true,