diff --git a/nvim/.config/nvim/after/ftplugin/djot.lua b/nvim/.config/nvim/after/ftplugin/djot.lua index 8bdca83..d0bf301 100644 --- a/nvim/.config/nvim/after/ftplugin/djot.lua +++ b/nvim/.config/nvim/after/ftplugin/djot.lua @@ -1,2 +1,5 @@ -- just copy markdown settings vim.cmd.runtime({"after/ftplugin/markdown.lua", bang=true}) + +-- until there's a specific djot TS, use markdown +vim.treesitter.language.register("markdown", "djot") diff --git a/nvim/.config/nvim/after/ftplugin/vimwiki.lua b/nvim/.config/nvim/after/ftplugin/vimwiki.lua new file mode 100644 index 0000000..4ec075d --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/vimwiki.lua @@ -0,0 +1,2 @@ +-- to make render-markdown render it nicely +vim.treesitter.language.register("markdown", "vimwiki") diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 17a3aec..06ee9ad 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -48,6 +48,7 @@ "mason.nvim": { "branch": "main", "commit": "7f265cd6ae56cecdd0aa50c8c73fc593b0604801" }, "mcphub.nvim": { "branch": "main", "commit": "85a7a659fc82da1429a2241ab61e9ce07b3db374" }, "mdeval.nvim": { "branch": "master", "commit": "0e1b248db174a9659a9ab16eb8c90ff3aec55264" }, + "mdx.nvim": { "branch": "main", "commit": "464a74be368dce212cff02f6305845dc7f209ab3" }, "mini.base16": { "branch": "main", "commit": "2eb2d2b889a8c861d1a66ec651bd0edb417d5c7f" }, "mini.files": { "branch": "main", "commit": "49c855977e9f4821d1ed8179ed44fe098b93ea2a" }, "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" }, diff --git a/nvim/.config/nvim/lua/core/languages.lua b/nvim/.config/nvim/lua/core/languages.lua index 22bc23e..9cac9f2 100644 --- a/nvim/.config/nvim/lua/core/languages.lua +++ b/nvim/.config/nvim/lua/core/languages.lua @@ -72,7 +72,7 @@ local languages = { dap = { "delve" }, }, graphql = { format = { graphql = { "prettier" } } }, - html = { format = { html = { "prettier", "rustywind" } } }, + html = { lsp = { htmx = {} }, format = { html = { "prettier", "rustywind" } } }, julia = { lsp = { julials = {} }, ts = { "julia" } }, json = { lsp = { jsonls = {} }, @@ -103,7 +103,7 @@ local languages = { lsp = { marksman = {} }, ts = { "markdown", "markdown_inline" }, lint = { markdown = { "markdownlint" } }, - format = { markdown = { "prettier", "injected" } }, + format = { markdown = { "prettier", "mdslw", "injected" } }, }, nim = { lsp = { nim_langserver = {} }, ts = { "nim", "nim_format_string" }, format = { nim = { "nimpretty" } } }, nu = nushell(), diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index a4dcf9e..ed4e512 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -13,6 +13,7 @@ end local md_like = { "markdown", + "mdx", "djot", "pandoc", "quarto", @@ -345,6 +346,12 @@ local prose_plugs = { branch = "dev", }, { "let-def/texpresso.vim", ft = { "tex" } }, + { + "davidmh/mdx.nvim", + config = true, + dependencies = { "nvim-treesitter/nvim-treesitter" }, + event = { "BufEnter *.mdx" }, -- since the plug itself defines mdx ft + }, } return prose_plugs diff --git a/office/.config/aerc/binds.conf b/office/.config/aerc/binds.conf index 5245faa..9db98df 100644 --- a/office/.config/aerc/binds.conf +++ b/office/.config/aerc/binds.conf @@ -50,6 +50,7 @@ gr = :cf Trash v = :mark -t V = :mark -V +v = :unmark -a J = :mark -t:next K = :mark -t:prev T = :prompt "Mark filter: " :mark @@ -118,6 +119,8 @@ N = :prev-result s = :split S = :vsplit + = :send-keys JJJ + = :send-keys KKK # send mails to taskwarrior ,t = :pipe -s -m mail-totask -c -d -t