diff options
Diffstat (limited to '.config/nvim/lua')
-rw-r--r-- | .config/nvim/lua/chadrc.lua | 4 | ||||
-rw-r--r-- | .config/nvim/lua/configs/conform.lua | 4 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/init.lua | 52 |
3 files changed, 28 insertions, 32 deletions
diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua index 939ad9f3..e65b336e 100644 --- a/.config/nvim/lua/chadrc.lua +++ b/.config/nvim/lua/chadrc.lua @@ -5,12 +5,10 @@ M.base46 = { } M.mason.pkgs = { - "lua-language-server", - "stylua", "ruff", "python-lsp-server", "tinymist", - "typstfmt", + "typstyle", "prettier", } diff --git a/.config/nvim/lua/configs/conform.lua b/.config/nvim/lua/configs/conform.lua index ec005a3e..24342a6e 100644 --- a/.config/nvim/lua/configs/conform.lua +++ b/.config/nvim/lua/configs/conform.lua @@ -1,13 +1,11 @@ local options = { formatters_by_ft = { - lua = { "stylua" }, css = { "prettier" }, html = { "prettier" }, - json = { "prettier" }, python = { "ruff_format" }, cpp = { "clang-format" }, c = { "clang-format" }, - typst = { "typstfmt" }, + typst = { "typstyle" }, }, format_on_save = { timeout_ms = 500, diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index 494b4c4b..6a669117 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -1,28 +1,28 @@ return { - { - "stevearc/conform.nvim", - event = 'BufWritePre', - opts = require "configs.conform", - }, - { - "neovim/nvim-lspconfig", - config = function() - require "configs.lspconfig" - end, - }, - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "lua", - "html", - "css", - "python", - "rust", - "cpp", - "c", - "bash", - }, - }, - }, + { + "stevearc/conform.nvim", + event = "BufWritePre", + opts = require("configs.conform"), + }, + { + "neovim/nvim-lspconfig", + config = function() + require("configs.lspconfig") + end, + }, + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "lua", + "html", + "css", + "python", + "rust", + "cpp", + "c", + "bash", + }, + }, + }, } |