From 070bfc728a5d44d79ac5e53212b8865c3a96b4f3 Mon Sep 17 00:00:00 2001
From: caandt <caandt@twoha.cc>
Date: Sun, 8 Mar 2026 13:47:03 -0500
Subject: [PATCH] nvim

---
 user/config/nvim/default.nix            | 11 ++++++-----
 user/config/nvim/lua/u/bindings.lua     | 14 ++++++++++----
 user/config/nvim/lua/u/plugins/init.lua | 13 ++++---------
 user/config/nvim/lua/u/plugins/lsp.lua  |  1 +
 user/prog.nix                           |  1 +
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/user/config/nvim/default.nix b/user/config/nvim/default.nix
index 746907f..c37402a 100644
--- a/user/config/nvim/default.nix
+++ b/user/config/nvim/default.nix
@@ -25,18 +25,18 @@
       nvim-colorizer-lua
       lazydev-nvim
       Coqtail
-      neorg
+      plenary-nvim
+      typst-preview-nvim
       (pkgs.vimUtils.buildVimPlugin {
         pname = "undotree";
-        version = "2024-2-9";
+        version = "2026-1-25";
         src = pkgs.fetchFromGitHub {
           owner = "jiaoshijie";
           repo = "undotree";
-          rev = "eab459ab87dd249617b5f7187bb69e614a083047";
-          sha256 = "sha256-FIYDyfkaIS9C16ClWKLMdpSPv/OrcOalVVsyFJBU2eI=";
+          rev = "ac02e6055fc2b9a5d904e40eb3d943c8dc2cad01";
+          sha256 = "sha256-Sb8tlFROVEuHgXgHViS8eFiWZzjVh2ZNzyZuQdFFkq0=";
         };
         meta.homepage = "https://github.com/jiaoshijie/undotree";
-        buildInputs = [plenary-nvim];
       })
     ];
     extraPackages = with pkgs; [
@@ -46,6 +46,7 @@
       nixd
       lua-language-server
       zls
+      tinymist
     ];
     withRuby = false;
     withPython3 = true;
diff --git a/user/config/nvim/lua/u/bindings.lua b/user/config/nvim/lua/u/bindings.lua
index 31fc691..4af900d 100644
--- a/user/config/nvim/lua/u/bindings.lua
+++ b/user/config/nvim/lua/u/bindings.lua
@@ -10,7 +10,13 @@ map('n', '<leader>h', '<cmd>sp<cr>', {desc = "split [H]orizontal"})
 map('n', 'q:', '<nop>')
 map('n', '<leader>cd', vim.diagnostic.open_float, {desc = "[C]ode [D]iagnostic"})
 map('n', 'x', '"_x')
-map('n', '<down>', '<cmd>CoqNext<cr>')
-map('n', '<up>', '<cmd>CoqUndo<cr>')
-map('i', '<c-a-j>', '<cmd>CoqNext<cr>')
-map('i', '<c-a-k>', '<cmd>CoqUndo<cr>')
+
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = { 'coq' },
+  callback = function ()
+    map('n', '<down>', '<cmd>CoqNext<cr>')
+    map('n', '<up>', '<cmd>CoqUndo<cr>')
+    map('i', '<c-a-j>', '<cmd>CoqNext<cr>')
+    map('i', '<c-a-k>', '<cmd>CoqUndo<cr>')
+  end
+})
diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua
index bba6590..73350f2 100644
--- a/user/config/nvim/lua/u/plugins/init.lua
+++ b/user/config/nvim/lua/u/plugins/init.lua
@@ -18,7 +18,10 @@ require('gitsigns').setup({
   },
 })
 
-require('nvim-treesitter.configs').setup({ highlight = { enable = true } })
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = { 'python' },
+  callback = function() vim.treesitter.start() end,
+})
 
 require('mini.files').setup({
   windows = { preview = true }
@@ -50,11 +53,3 @@ require('undotree').setup({
   }
 })
 require('lazydev').setup()
-
-require('neorg').setup({
-  lazy_loading = true,
-  load = {
-    ["core.defaults"] = {},
-    ["core.concealer"] = {},
-  }
-})
diff --git a/user/config/nvim/lua/u/plugins/lsp.lua b/user/config/nvim/lua/u/plugins/lsp.lua
index 6af1d73..61ef8c0 100644
--- a/user/config/nvim/lua/u/plugins/lsp.lua
+++ b/user/config/nvim/lua/u/plugins/lsp.lua
@@ -55,6 +55,7 @@ vim.lsp.enable("pyright")
 vim.lsp.enable("nixd")
 vim.lsp.enable("lua_ls")
 vim.lsp.enable("zls")
+vim.lsp.enable("tinymist")
 
 vim.lsp.config("clangd",{
   cmd = {
diff --git a/user/prog.nix b/user/prog.nix
index c013a5c..98a21f9 100644
--- a/user/prog.nix
+++ b/user/prog.nix
@@ -25,6 +25,7 @@ lib.mkIf config.u.has.prog {
       pyp
       coq_8_20
       zig
+      typst
     ]
     ++ lib.optionals config.u.has.graphical [
       (cutter.withPlugins (ps: with ps; [jsdec rz-ghidra sigdb]))