feat: improve typst support

chore: remove commented out typstpreviewupdate autocmd
fix: provide tinymist and websocat binaries directly to typst-preview
2024-11-28 12:13:51 -08:00 · 2024-10-08 00:06:40 -07:00 · 2024-10-07 19:15:32 -07:00 · 2024-10-07 19:15:01 -07:00 · 2024-10-07 13:35:52 -07:00
6 changed files with 100 additions and 65 deletions
--- a/config/autocmds.nix
+++ b/config/autocmds.nix
@ -6,19 +6,5 @@
        "TermOpen"
      ];
    }
-    # {
-    #   command = {
-    #     __raw = ''
-    #       require('typst-preview').update()
-    #     '';
-    #   };
-    #   event = [
-    #     "BufEnter"
-    #     "BufWinEnter"
-    #   ];
-    #   pattern = [
-    #     "*.typ"
-    #   ];
-    # }
  ];
 }
--- a/config/plugins/lsps.nix
+++ b/config/plugins/lsps.nix
@ -13,7 +13,7 @@
        nushell.enable = true;
        svelte.enable = true;
        tailwindcss.enable = true;
-        typst-lsp.enable = true;
+        tinymist.enable = true;
        marksman.enable = true;
      };
    };
--- a/config/plugins/qol.nix
+++ b/config/plugins/qol.nix
@ -18,7 +18,57 @@
      enable = true;
      settings.delay = 1000;
    };
-    nvim-autopairs.enable = true;
+    nvim-autopairs = {
+      enable = true;
+      luaConfig.post = ''
+        local npairs = require('nvim-autopairs')
+        local Rule = require('nvim-autopairs.rule')
+        local cond = require('nvim-autopairs.conds')
+
+        npairs.add_rules({
+          Rule("$", "$",{"tex", "latex", "typst"})
+            -- don't add a pair if the next character is %
+            :with_pair(cond.not_after_regex("%%"))
+            -- don't add a pair if  the previous character is xxx
+            :with_pair(cond.not_before_regex("xxx", 3))
+            -- don't move right when repeat character
+            :with_move(cond.none())
+            -- don't delete if the next character is xx
+            :with_del(cond.not_after_regex("xx"))
+            -- disable adding a newline when you press <cr>
+            :with_cr(cond.none())
+          },
+          {
+          Rule("_", "_","typst")
+            -- don't add a pair if  the previous character is xxx
+            :with_pair(cond.not_before_regex("[%w%.]", 3))
+            -- don't move right when repeat character
+            :with_move(cond.none())
+            -- don't delete if the next character is xx
+            :with_del(cond.not_after_regex("[%w%.]"))
+          },
+          {
+          Rule("*", "*","typst")
+            -- don't add a pair if  the previous character is xxx
+            :with_pair(cond.not_before_regex("[%w%.]", 3))
+            -- don't move right when repeat character
+            :with_move(cond.none())
+            -- don't delete if the next character is xx
+            :with_del(cond.not_after_regex("[%w%.]"))
+          },
+          {
+          Rule("$$","$$","tex")
+            :with_pair(function(opts)
+                print(vim.inspect(opts))
+                if opts.line=="aa $$" then
+                -- don't add pair on that line
+                  return false
+                end
+            end)
+           }
+        )
+      '';
+    };
    yanky = {
      enable = true;
      enableTelescope = true;
--- a/config/plugins/setup.nix
+++ b/config/plugins/setup.nix
@ -8,8 +8,8 @@

    require 'typst-preview'.setup {
      dependencies_bin = {
-        ['typst-preview'] = ${pkgs.tinymist},
-        ['websocat'] = ${pkgs.websocat}
+        ['typst-preview'] = "${pkgs.tinymist}/bin/tinymist",
+        ['websocat'] = "${pkgs.websocat}/bin/websocat"
      }
    }

--- a/config/plugins/typst.nix
+++ b/config/plugins/typst.nix
@ -1,6 +1,5 @@
 { inputs, pkgs, ... }:
 {
-  plugins.typst-vim.enable = true;
  extraPlugins = [
    (pkgs.vimUtils.buildVimPlugin {
      name = "typst-preview.nvim";
--- a/flake.lock
+++ b/flake.lock
@ -56,11 +56,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1726153070,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
        "type": "github"
      },
      "original": {
@ -77,11 +77,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726153070,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
        "type": "github"
      },
      "original": {
@ -95,11 +95,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@ -125,11 +125,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725513492,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "lastModified": 1728092656,
+        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
        "type": "github"
      },
      "original": {
@ -163,11 +163,11 @@
    "haskell-tools": {
      "flake": false,
      "locked": {
-        "lastModified": 1726521542,
-        "narHash": "sha256-TyqjJohmIwuqMqy01H3sRRcm8okNeWtAfLqX2Ehr9mQ=",
+        "lastModified": 1728323645,
+        "narHash": "sha256-vjzTrqkiVmDUwUfzjzjRC/dFBP8MSMnNymgvxZ15lUw=",
        "owner": "mrcjkb",
        "repo": "haskell-tools.nvim",
-        "rev": "1edf2bb5ced056b5d3d1df783dd02041ce09b087",
+        "rev": "bacbf122d82e70b9000f36d6322d5de1a524ea3c",
        "type": "github"
      },
      "original": {
@ -184,11 +184,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726357542,
-        "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
+        "lastModified": 1728041527,
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
        "type": "github"
      },
      "original": {
@ -221,11 +221,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726188813,
-        "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
+        "lastModified": 1727999297,
+        "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
+        "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
        "type": "github"
      },
      "original": {
@ -236,11 +236,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1726463316,
-        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
        "type": "github"
      },
      "original": {
@ -252,14 +252,14 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1725233747,
-        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      }
    },
    "nixvim": {
@ -277,11 +277,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1726502324,
-        "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
+        "lastModified": 1728321376,
+        "narHash": "sha256-pEx+lat5gK59sdWn4zt7XW8s9GQC+BbOk2Qw3LY/O+0=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "2e3083e42509c399b224239f6d7fa17976b18536",
+        "rev": "cb3c1bfcaf44fd6f0043d916f3a14f666c3364a4",
        "type": "github"
      },
      "original": {
@ -299,11 +299,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726392886,
-        "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
+        "lastModified": 1728017046,
+        "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
+        "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
        "type": "github"
      },
      "original": {
@ -315,11 +315,11 @@
    "render-markdown": {
      "flake": false,
      "locked": {
-        "lastModified": 1726511696,
-        "narHash": "sha256-l0k39OXcpoH7D6UmuQy0LNLj+8HCkKz9R/4zVH4bEt0=",
+        "lastModified": 1728331543,
+        "narHash": "sha256-+tpNIQOBDlSkeCNcoTcjmnK+ms5OHBtwr0+4k1tweNk=",
        "owner": "MeanderingProgrammer",
        "repo": "render-markdown.nvim",
-        "rev": "2424693c7a4c79641a7ea1e2a838dbc9238d6066",
+        "rev": "d20d19fa54965f6eb94558c0b84fe9a942169fb4",
        "type": "github"
      },
      "original": {
@ -344,11 +344,11 @@
    "satellite": {
      "flake": false,
      "locked": {
-        "lastModified": 1725437627,
-        "narHash": "sha256-5WMKEsS9e9nTuylZ5pRPIW+G/52HKC1bjSdz3GvJg+8=",
+        "lastModified": 1727707770,
+        "narHash": "sha256-WVOYouiEFeLkQBe1Ptazw/mIfzxmaQmOuEK8KlfMYoQ=",
        "owner": "lewis6991",
        "repo": "satellite.nvim",
-        "rev": "dfc2b220f4969ebc49b0f2a94ab6faae240705bd",
+        "rev": "ea0a2e92bbb57981043fca334f5b274c0f279238",
        "type": "github"
      },
      "original": {
@ -380,11 +380,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725271838,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "lastModified": 1727984844,
+        "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
        "type": "github"
      },
      "original": {
@ -396,11 +396,11 @@
    "typst-preview": {
      "flake": false,
      "locked": {
-        "lastModified": 1724595641,
-        "narHash": "sha256-kJ6IfLSBmJMgEFuCy6fGtqSRBXjt2Aoxu2NW9iyzRLU=",
+        "lastModified": 1727642175,
+        "narHash": "sha256-n0TfcXJLlRXdS6S9dwYHN688IipVSDLVXEqyYs+ROG8=",
        "owner": "chomosuke",
        "repo": "typst-preview.nvim",
-        "rev": "7ae2b82cf334819494505b772745beb28705b12b",
+        "rev": "0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a",
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Youwen Wu	6cdb83a772	feat: improve typst support	2024-10-08 00:06:40 -07:00
Youwen Wu	ad551a46f8	chore: remove commented out typstpreviewupdate autocmd	2024-10-07 19:15:32 -07:00
Youwen Wu	fb308fc6d7	fix: provide tinymist and websocat binaries directly to typst-preview	2024-10-07 19:15:01 -07:00
Youwen Wu	c7d664b923	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12) → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1' (2024-10-01) • Updated input 'flake-parts/nixpkgs-lib': '`356624c120`.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01) → '`fb192fec7c`.tar.gz?narHash=sha256-0xHYkMkeLVQAMa7gvkddbPqpxph%2BhDzdu1XdGPJR%2BOs%3D' (2024-10-01) • Updated input 'haskell-tools': 'github:mrcjkb/haskell-tools.nvim/1edf2bb5ced056b5d3d1df783dd02041ce09b087' (2024-09-16) → 'github:mrcjkb/haskell-tools.nvim/bacbf122d82e70b9000f36d6322d5de1a524ea3c' (2024-10-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16) → 'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) • Updated input 'nixvim': 'github:nix-community/nixvim/2e3083e42509c399b224239f6d7fa17976b18536' (2024-09-16) → 'github:nix-community/nixvim/cb3c1bfcaf44fd6f0043d916f3a14f666c3364a4' (2024-10-07) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12) → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1' (2024-10-01) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528' (2024-09-05) → 'github:cachix/git-hooks.nix/1211305a5b237771e13fcca0c51e60ad47326a9a' (2024-10-05) • Updated input 'nixvim/home-manager': 'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f' (2024-09-14) → 'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e' (2024-10-04) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80' (2024-09-13) → 'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b' (2024-10-03) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/97d34b70deed4878fcb2449ac89dab717d72efa1' (2024-09-15) → 'github:NuschtOS/search/ba81d9c1eae20fc3a1cd066062a05ac2e799e629' (2024-10-04) • Updated input 'nixvim/nuschtosSearch/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02) → 'github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64' (2024-10-03) • Updated input 'render-markdown': 'github:MeanderingProgrammer/render-markdown.nvim/2424693c7a4c79641a7ea1e2a838dbc9238d6066' (2024-09-16) → 'github:MeanderingProgrammer/render-markdown.nvim/d20d19fa54965f6eb94558c0b84fe9a942169fb4' (2024-10-07) • Updated input 'satellite': 'github:lewis6991/satellite.nvim/dfc2b220f4969ebc49b0f2a94ab6faae240705bd' (2024-09-04) → 'github:lewis6991/satellite.nvim/ea0a2e92bbb57981043fca334f5b274c0f279238' (2024-09-30) • Updated input 'typst-preview': 'github:chomosuke/typst-preview.nvim/7ae2b82cf334819494505b772745beb28705b12b' (2024-08-25) → 'github:chomosuke/typst-preview.nvim/0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a' (2024-09-29)	2024-10-07 13:35:52 -07:00