Compare commits

...

12 Commits

Author SHA1 Message Date
arne314
0638638a81 docs: version info 2025-11-06 15:26:00 +01:00
Arne
b82fc5d35a Merge pull request #22 from arne314/dev
V1.4.2
2025-11-04 23:04:54 +01:00
arne314
89e850fce8 chore: bump version to 1.4.2 2025-11-04 22:53:49 +01:00
arne314
6cb071a954 style: format nix code 2025-11-04 22:52:06 +01:00
arne314
d6ba115ac7 chore: update nix flake 2025-11-04 22:52:06 +01:00
arne314
f43fa4d175 feat(snip)!: Typst 0.14 compatibility 2025-11-04 22:33:41 +01:00
arne314
fd598779b6 minor(snip): add ^perp snippet 2025-11-03 21:28:45 +01:00
arne314
e0184b8a4e refactor(snip): reorder math snippets 2025-10-29 21:10:57 +01:00
arne314
a75b85e446 feat(snip): add basic "physics" snippets 2025-10-28 17:28:36 +01:00
arne314
8695355610 minor(snip): add ^complement snippet 2025-10-20 21:54:07 +02:00
arne314
4df11718ea minor(snip)!: update compose snippet 2025-10-17 16:10:49 +02:00
arne314
c3465da447 minor(snip)!: update plus/minus snippets 2025-10-17 16:02:30 +02:00
8 changed files with 107 additions and 93 deletions

1
.gitignore vendored
View File

@@ -3,4 +3,5 @@
.obsidian
assets
result

View File

@@ -156,6 +156,7 @@ require('typstar').setup({ -- depending on your neovim plugin system
</details>
### Snippets
0. The snippets are designed to work with Typst `0.14`. For older versions check out the legacy `typst-0.13` branch.
1. Install [LuaSnip](https://github.com/L3MON4D3/LuaSnip/), set `enable_autosnippets = true` and set a visual mode selection key (e.g. `store_selection_keys = '<Tab>'`) in the configuration
2. Install [jsregexp](https://github.com/kmarius/jsregexp) as described [here](https://github.com/L3MON4D3/LuaSnip/blob/master/DOC.md#transformations) (You will see a warning on startup if jsregexp isn't installed properly)
3. Install [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) and run `:TSInstall typst`
@@ -175,7 +176,6 @@ require('typstar').setup({ -- depending on your neovim plugin system
4. See comment 4 above at Excalidraw
### Anki
0. Typst version `0.12.0` or higher is required
1. Install [Anki](https://apps.ankiweb.net/#download)
2. Install [Anki-Connect](https://ankiweb.net/shared/info/2055492159) and make sure `http://localhost` is added to `webCorsOriginList` in the Add-on config (should be added by default)
3. Install the typstar python package (I recommend using [pipx](https://github.com/pypa/pipx) via `pipx install git+https://github.com/arne314/typstar`, you will need to have python build tools and clang installed) \[Note: this may take a while\]

18
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"lastModified": 1762040540,
"narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"rev": "0010412d62a25d959151790968765a70c436598b",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750386251,
"narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
"lastModified": 1762156382,
"narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
"rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
"type": "github"
},
"original": {
@@ -36,11 +36,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1748740939,
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"lastModified": 1761765539,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github"
},
"original": {

133
flake.nix
View File

@@ -6,78 +6,79 @@
flake-parts.url = "github:hercules-ci/flake-parts";
};
outputs = inputs @ {
self,
nixpkgs,
flake-parts,
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
outputs =
inputs@{
self,
nixpkgs,
flake-parts,
...
}:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
perSystem = {system, ...}: let
pkgs = import nixpkgs {inherit system;};
typstar = pkgs.vimUtils.buildVimPlugin {
name = "typstar";
src = self;
buildInputs = [
pkgs.vimPlugins.luasnip
pkgs.vimPlugins.nvim-treesitter-parsers.typst
];
# TODO: make this check pass instead of skipping
neovimRequireCheckHook = ''
echo "Skipping neovimRequireCheckHook"
'';
perSystem =
{ system, ... }:
let
pkgs = import nixpkgs { inherit system; };
typstar = pkgs.vimUtils.buildVimPlugin {
name = "typstar";
src = self;
buildInputs = [
pkgs.vimPlugins.luasnip
pkgs.vimPlugins.nvim-treesitter-parsers.typst
];
};
in
{
packages = {
default = typstar;
nvim =
let
config = pkgs.neovimUtils.makeNeovimConfig {
customRC = ''
lua << EOF
print("Welcome to Typstar! This is just a demo.")
vim.g.mapleader = " "
require('nvim-treesitter.configs').setup {
highlight = { enable = true },
}
local ls = require('luasnip')
ls.config.set_config({
enable_autosnippets = true,
store_selection_keys = "<Tab>",
})
local typstar = require('typstar')
typstar.setup({})
vim.keymap.set({'n', 'i'}, '<M-t>', '<Cmd>TypstarToggleSnippets<CR>', { silent = true, noremap = true })
vim.keymap.set({'s', 'i'}, '<M-j>', '<Cmd>TypstarSmartJump<CR>', { silent = true, noremap = true })
vim.keymap.set({'s', 'i'}, '<M-k>', '<Cmd>TypstarSmartJumpBack<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>e', '<Cmd>TypstarInsertExcalidraw<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>r', '<Cmd>TypstarInsertRnote<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>o', '<Cmd>TypstarOpenDrawing<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>a', '<Cmd>TypstarAnkiScan<CR>', { silent = true, noremap = true })
EOF
'';
plugins = [
typstar
pkgs.vimPlugins.luasnip
pkgs.vimPlugins.nvim-treesitter
pkgs.vimPlugins.nvim-treesitter-parsers.typst
];
};
in
pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped config;
};
};
in {
packages = {
default = typstar;
nvim = let
config = pkgs.neovimUtils.makeNeovimConfig {
customRC = ''
lua << EOF
print("Welcome to Typstar! This is just a demo.")
vim.g.mapleader = " "
require('nvim-treesitter.configs').setup {
highlight = { enable = true },
}
local ls = require('luasnip')
ls.config.set_config({
enable_autosnippets = true,
store_selection_keys = "<Tab>",
})
local typstar = require('typstar')
typstar.setup({})
vim.keymap.set({'n', 'i'}, '<M-t>', '<Cmd>TypstarToggleSnippets<CR>', { silent = true, noremap = true })
vim.keymap.set({'s', 'i'}, '<M-j>', '<Cmd>TypstarSmartJump<CR>', { silent = true, noremap = true })
vim.keymap.set({'s', 'i'}, '<M-k>', '<Cmd>TypstarSmartJumpBack<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>e', '<Cmd>TypstarInsertExcalidraw<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>r', '<Cmd>TypstarInsertRnote<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>o', '<Cmd>TypstarOpenDrawing<CR>', { silent = true, noremap = true })
vim.keymap.set('n', '<leader>a', '<Cmd>TypstarAnkiScan<CR>', { silent = true, noremap = true })
EOF
'';
plugins = [
typstar
pkgs.vimPlugins.luasnip
pkgs.vimPlugins.nvim-treesitter
pkgs.vimPlugins.nvim-treesitter-parsers.typst
];
};
in
pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped config;
};
};
};
}

View File

@@ -9,7 +9,6 @@ local cap = helper.cap
return {
snip('fa', 'forall ', {}, math),
snip('ex', 'exists ', {}, math),
snip('ni', 'in.not ', {}, math),
snip('Sq', 'square', {}, math),
-- logical chunks
@@ -19,6 +18,8 @@ return {
snip('een', 'exists epsilon>>0 ', {}, math),
-- boolean logic
snip('and', 'and ', {}, math),
snip('or', 'or ', {}, math),
snip('not', 'not ', {}, math),
snip('ip', '==>> ', {}, math),
snip('ib', '<<== ', {}, math),
@@ -34,27 +35,28 @@ return {
snip('ge', '>>= ', {}, math),
-- operators
snip('ak([^k ])', '+ <>', { cap(1) }, math, 100, { wordTrig = false }),
snip('sk([^k ])', '- <>', { cap(1) }, math, 100, { wordTrig = false }),
snip('oak', 'plus.circle ', {}, math),
snip('bak', 'plus.square ', {}, math),
snip('mak', 'plus.minus ', {}, math),
snip('oak', 'plus.o ', {}, math),
snip('bak', 'plus.square ', {}, math),
snip('osk', 'minus.o ', {}, math),
snip('bsk', 'minus.square ', {}, math),
snip('xx', 'times ', {}, math),
snip('oxx', 'times.circle ', {}, math),
snip('oxx', 'times.o ', {}, math),
snip('bxx', 'times.square ', {}, math),
snip('ff', '(<>) / (<>) <>', { i(1, 'a'), i(2, 'b'), i(3) }, math),
-- exponents
-- subscript/superscript
snip('iv', '^(-1) ', {}, math, 500, { wordTrig = false, blacklist = { 'equiv' } }),
snip('tp', '^top ', {}, math, 500, { wordTrig = false }),
snip('cmp', '^complement ', {}, math, 500, { wordTrig = false }),
snip('prp', '^perp ', {}, math, 500, { wordTrig = false }),
snip('sr', '^2 ', {}, math, 500, { wordTrig = false }),
snip('cb', '^3 ', {}, math, 500, { wordTrig = false }),
snip('jj', '_(<>) ', { i(1, 'n') }, math, 500, { wordTrig = false }),
snip('kk', '^(<>) ', { i(1, 'n') }, math, 500, { wordTrig = false }),
snip('ep', 'exp(<>) ', { i(1, '1') }, math),
-- sets
-- 'st' to '{<>} in ./visual.lua
-- 'st' to '{<>}' in ./visual.lua
snip('set', '{<> mid(|) <>}', { i(1), i(2) }, math),
snip('es', 'emptyset ', {}, math),
snip('ses', '{emptyset} ', {}, math),
@@ -67,37 +69,45 @@ return {
snip('bnn', 'inter.big ', {}, math),
snip('buu', 'union.big ', {}, math),
snip('swo', 'without ', {}, math),
snip('ni', 'in.not ', {}, math),
-- misc
snip('to', '->> ', {}, math),
snip('mt', '|->> ', {}, math),
snip('Oo', 'compose ', {}, math),
snip('cp', 'compose ', {}, math),
snip('iso', 'tilde.equiv ', {}, math),
snip('cc', 'cases(\n\t<>\n)\\', { i(1, '1') }, math),
snip('nab', 'nabla ', {}, math),
snip('ep', 'exp(<>) ', { i(1, '1') }, math),
snip('ccs', 'cases(\n\t<>,\n)', { i(1, '1') }, math),
snip('([A-Za-z])o([A-Za-z0-9]) ', '<>(<>) ', { cap(1), cap(2) }, math, 100, {
maxTrigLength = 4,
blacklist = { 'bot ', 'cos ', 'cot ', 'dot ', 'log ', 'mod ', 'top ', 'won ', 'xor ' },
blacklist = { 'bot ', 'cos ', 'cot ', 'dot ', 'log ', 'mod ', 'not ', 'top ', 'won ', 'xor ' },
}),
snip('(K|M|N|Q|R|S|Z)([\\dn]) ', '<><>^<> ', { cap(1), cap(1), cap(2) }, math),
-- derivatives
snip('dx', 'dif / (dif <>) ', { i(1, 'x') }, math),
snip('ddx', '(dif <>) / (dif <>) ', { i(1, 'f'), i(2, 'x') }, math),
snip('DX', 'diff / (diff <>) ', { i(1, 'x') }, math),
snip('DDX', '(diff <>) / (diff <>) ', { i(1, 'f'), i(2, 'x') }, math),
snip('DX', 'partial / (partial <>) ', { i(1, 'x') }, math),
snip('DDX', '(partial <>) / (partial <>) ', { i(1, 'f'), i(2, 'x') }, math),
snip('part', 'partial ', {}, math, 1600),
-- integrals
snip('it', 'integral ', {}, math),
snip('int', 'integral_(<>)^(<>) ', { i(1, 'a'), i(2, 'b') }, math),
snip('oit', 'integral.cont_(<>) ', { i(1, 'C') }, math),
snip('dit', 'integral_(<>) ', { i(1, 'Omega') }, math),
-- sums
snip('sm', 'sum ', {}, math),
snip('sum', 'sum_(<>)^(<>) ', { i(1, 'k=1'), i(2, 'oo') }, math),
snip('dsm', 'sum_(<>) ', { i(1, 'Omega') }, math),
-- products
snip('prd', 'product ', {}, math),
snip('prod', 'product_(<>)^(<>) ', { i(1, 'k=1'), i(2, 'n') }, math),
-- limits
snip('lm', 'lim ', {}, math),
snip('lim', 'lim_(<> ->> <>) ', { i(1, 'n'), i(2, 'oo') }, math),
snip('lim (sup|inf)', 'lim<> ', { cap(1) }, math),

View File

@@ -28,7 +28,7 @@ local operations = { -- first boolean: existing brackets should be kept; second
{ 'sQ', '[', ']', false, false }, -- replace with square brackets
{ 'BB', '', '', false, false }, -- remove brackets
{ 'ss', '"', '"', false, false },
{ 'agl', 'lr(angle.l ', ' angle.r)', false, false },
{ 'chv', 'lr(chevron.l ', ' chevron.r)', false, false },
{ 'abs', 'abs', '', true, true },
{ 'ul', 'underline', '', true, true },
{ 'ol', 'overline', '', true, true },
@@ -37,9 +37,11 @@ local operations = { -- first boolean: existing brackets should be kept; second
{ 'ht', 'hat', '', true, true },
{ 'br', 'macron', '', true, true },
{ 'dt', 'dot', '', true, true },
{ 'dia', 'diaer', '', true, true },
{ 'ci', 'circle', '', true, true },
{ 'td', 'tilde', '', true, true },
{ 'nr', 'norm', '', true, true },
{ 'arr', 'arrow', '', true, true },
{ 'vv', 'vec', '', true, true },
{ 'rt', 'sqrt', '', true, true },
{ 'flo', 'floor', '', true, true },

View File

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
[project]
name = "typstar"
version = "1.4.1"
version = "1.4.2"
description = "Neovim plugin for efficient note taking in Typst"
authors = [
{ name = "arne314" }

2
uv.lock generated
View File

@@ -516,7 +516,7 @@ wheels = [
[[package]]
name = "typstar"
version = "1.4.1"
version = "1.4.2"
source = { editable = "." }
dependencies = [
{ name = "aiohttp" },