From 4056deb411191dd69d8b673106b579f25b17a4c3 Mon Sep 17 00:00:00 2001 From: ItsSorae <> Date: Sun, 28 Apr 2024 15:07:41 -0400 Subject: [PATCH] languages/typst: add typst language support --- configuration.nix | 1 + modules/plugins/languages/default.nix | 1 + modules/plugins/languages/typst.nix | 100 ++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 modules/plugins/languages/typst.nix diff --git a/configuration.nix b/configuration.nix index 9532046..b7d9330 100644 --- a/configuration.nix +++ b/configuration.nix @@ -74,6 +74,7 @@ inputs: let terraform.enable = isMaximal; nim.enable = false; tailwind.enable = isMaximal; + typst.enable = isMaximal; clang = { enable = isMaximal; lsp.server = "clangd"; diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 08fda19..8597b72 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -24,6 +24,7 @@ in { ./tailwind.nix ./terraform.nix ./ts.nix + ./typst.nix ./zig.nix ]; diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix new file mode 100644 index 0000000..da63c54 --- /dev/null +++ b/modules/plugins/languages/typst.nix @@ -0,0 +1,100 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.lists) isList; + inherit (lib.types) enum either listOf package str; + inherit (lib.attrsets) attrNames; + inherit (lib.nvim.lua) expToLua; + inherit (lib.nvim.types) mkGrammarOption; + + cfg = config.vim.languages.typst; + + defaultFormat = "typstfmt"; + formats = { + typstfmt = { + package = pkgs.typstfmt; + nullConfig = '' + table.insert( + ls_sources, + null_ls.builtins.formatting.typstfmt.with({ + command = "${cfg.format.package}/bin/typstfmt", + }) + ) + ''; + }; + # https://github.com/Enter-tainer/typstyle + typstyle = { + package = pkgs.typstyle; + nullConfig = '' + table.insert( + ls_sources, + null_ls.builtins.formatting.typstfmt.with({ + command = "${cfg.format.package}/bin/typstyle", + }) + ) + ''; + }; + }; +in { + options.vim.languages.typst = { + enable = mkEnableOption "Typst language support"; + + treesitter = { + enable = mkEnableOption "Typst treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "typst"; + }; + + lsp = { + enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.languages.enableLSP;}; + + package = mkOption { + description = "typst-lsp package, or the command to run as a list of strings"; + example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]''; + type = either package (listOf str); + default = pkgs.typst-lsp; + }; + }; + + format = { + enable = mkEnableOption "Typst document formatting" // {default = config.vim.languages.enableFormat;}; + + type = mkOption { + description = "Typst formatter to use"; + type = enum (attrNames formats); + default = defaultFormat; + }; + + package = mkOption { + description = "Typst formatter package"; + type = package; + default = formats.${cfg.format.type}.package; + }; + }; + }; + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.typst-lsp = '' + lspconfig.typst_lsp.setup { + capabilities = capabilities, + on_attach=default_on_attach, + cmd = ${ + if isList cfg.lsp.package + then expToLua cfg.lsp.package + else ''{"${cfg.lsp.package}/bin/typst-lsp"}'' + }, + } + ''; + }) + ]); +}