From fecca27e9229212a7b238383993c97dc8a52e0f0 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Mon, 24 Nov 2025 22:42:08 +0100
Subject: [PATCH] added typst preview, fixed leap.

---
 flake.nix                           |  6 ++++++
 lua/myLuaConf/LSPs/init.lua         | 13 ++++++++++++-
 lua/myLuaConf/plugins/init.lua      | 27 ++++++++++++++++++++-------
 lua/myLuaConf/plugins/which-key.lua |  4 +++-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 54a9a38..414764a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,6 +116,9 @@
             shellcheck
             bash-language-server
           ];
+          typst = [
+            tinymist
+          ];
         };
         format = [
         ];
@@ -193,6 +196,9 @@
           lua = [
             lazydev-nvim
           ];
+          typst = [
+            typst-preview-nvim
+          ];
         };
         git = [
           gitsigns-nvim
diff --git a/lua/myLuaConf/LSPs/init.lua b/lua/myLuaConf/LSPs/init.lua
index 9f74cce..6291662 100644
--- a/lua/myLuaConf/LSPs/init.lua
+++ b/lua/myLuaConf/LSPs/init.lua
@@ -13,7 +13,7 @@ vim.keymap.set("n", "<leader>lws", Snacks.picker.lsp_workspace_symbols, { desc =
 
 vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration, { desc = "Goto [D]eclaration" })
 vim.keymap.set("n", "<leader>lD", vim.lsp.buf.type_definition, { desc = "Type [D]efinition" })
-vim.keymap.set("n", "<leader>la", vim.lsp.buf.code_action, { desc = "[C]ode Action" })
+vim.keymap.set({"n", "v",}, "<leader>la", vim.lsp.buf.code_action, { desc = "[C]ode Action" })
 vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition, { desc = "Goto [D]efinition" })
 vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { desc = "Format buffer" })
 vim.keymap.set("n", "<leader>lh", vim.lsp.buf.hover, { desc = "Hover Documentation" })
@@ -176,6 +176,17 @@ require('lze').load {
     enabled = nixCats("lsp.python"),
     lsp = {},
   },
+  {
+    "tinymist",
+    enabled = nixCats("lsp.tinymist"),
+    lsp = {
+      filetypes = { "typst" },
+      settings = {
+        formatterMode = "typstyle",
+
+      },
+    },
+  },
   {
     "nixd",
     enabled = catUtils.isNixCats and nixCats('lsp.nix'),
diff --git a/lua/myLuaConf/plugins/init.lua b/lua/myLuaConf/plugins/init.lua
index 6b7b6bc..f44ca18 100644
--- a/lua/myLuaConf/plugins/init.lua
+++ b/lua/myLuaConf/plugins/init.lua
@@ -189,27 +189,40 @@ require('lze').load {
     cmd = { "MarkdownPreview", "MarkdownPreviewStop", "MarkdownPreviewToggle", },
     ft = "markdown",
     keys = {
-      { "<leader>mp", "<cmd>MarkdownPreview <CR>",       mode = { "n" }, noremap = true, desc = "markdown preview" },
-      { "<leader>ms", "<cmd>MarkdownPreviewStop <CR>",   mode = { "n" }, noremap = true, desc = "markdown preview stop" },
-      { "<leader>mt", "<cmd>MarkdownPreviewToggle <CR>", mode = { "n" }, noremap = true, desc = "markdown preview toggle" },
+      { "<leader>pmp", "<cmd>MarkdownPreview <CR>",       mode = { "n" }, noremap = true, desc = "markdown preview" },
+      { "<leader>pms", "<cmd>MarkdownPreviewStop <CR>",   mode = { "n" }, noremap = true, desc = "markdown preview stop" },
+      { "<leader>pmt", "<cmd>MarkdownPreviewToggle <CR>", mode = { "n" }, noremap = true, desc = "markdown preview toggle" },
     },
     before = function()
       vim.g.mkdp_auto_close = 0
     end,
   },
+  {
+    "typst-preview.nvim",
+    for_cat = "lsp.typst",
+    ft = "typst",
+    cmd = { "TypstPreview", "TypstPreviewStop", "TypstPreviewToggle", },
+    keys = {
+      { "<leader>ptp", "<cmd>TypstPreview <CR>",       mode = { "n" }, noremap = true, desc = "typst preview" },
+      { "<leader>pts", "<cmd>TypstPreviewStop <CR>",   mode = { "n" }, noremap = true, desc = "typst preview stop" },
+      { "<leader>ptt", "<cmd>TypstPreviewToggle <CR>", mode = { "n" }, noremap = true, desc = "typst preview toggle" },
+    },
+    after = function()
+      require('typst-preview').setup {}
+    end
+  },
   {
     "leap.nvim",
     for_cat = 'always',
     event = "DeferredUIEnter",
-    after = function()
-      require('leap').set_default_mappings()
-    end,
+    keys = {
+      { "s", "<Plug>(leap)", mode = { "n", "x", "o", "v" }, noremap = true, desc = "leap to char sequence" }
+    },
   },
   {
     "nvim-surround",
     for_cat = 'always',
     event = "DeferredUIEnter",
-    -- keys = "",
     after = function()
       require('nvim-surround').setup()
     end,
diff --git a/lua/myLuaConf/plugins/which-key.lua b/lua/myLuaConf/plugins/which-key.lua
index 881a34d..55b73ab 100644
--- a/lua/myLuaConf/plugins/which-key.lua
+++ b/lua/myLuaConf/plugins/which-key.lua
@@ -8,7 +8,9 @@ return {
       { "<leader>g",  group = "[g]it" },
       { "<leader>z",  group = "[z]ettelkasten" },
       { "<leader>gt", group = "[t]oggle" },
-      { "<leader>m",  group = "[m]arkdown" },
+      { "<leader>p",  group = "[p]review" },
+      { "<leader>pt",  group = "[p]review [t]ypst" },
+      { "<leader>pm",  group = "[p]review [m]arkdown" },
       { "<leader>f",  group = "[f]ind" },
       { "<leader>t",  group = "[t]ree" },
       { "<leader>c",  group = "[c]heck" },