diff options
Diffstat (limited to '.config/nvim/lua')
-rw-r--r-- | .config/nvim/lua/chadrc.lua | 23 | ||||
-rw-r--r-- | .config/nvim/lua/configs/conform.lua | 10 | ||||
-rw-r--r-- | .config/nvim/lua/configs/lspconfig.lua | 13 | ||||
-rw-r--r-- | .config/nvim/lua/configs/vimtex.lua | 5 | ||||
-rw-r--r-- | .config/nvim/lua/mappings.lua | 1 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/init.lua (renamed from .config/nvim/lua/plugins.lua) | 15 |
6 files changed, 16 insertions, 51 deletions
diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua index 5bb043eb..e65b336e 100644 --- a/.config/nvim/lua/chadrc.lua +++ b/.config/nvim/lua/chadrc.lua @@ -1,30 +1,15 @@ ----@type ChadrcConfig local M = {} -M.ui = { +M.base46 = { theme = "onenord", - theme_toggle = { "onenord", "onenord_light" }, - changed_themes = { - onenord = { - base_16 = { - base00 = "#2E3440", - }, - }, - }, - statusline = { theme = "vscode_colored" }, - tabufline = { lazyload = true }, - nvdash = { load_on_startup = true }, } M.mason.pkgs = { - "lua-language-server", - "stylua", - "html-lsp", - "css-lsp", - "prettier", - "texlab", "ruff", "python-lsp-server", + "tinymist", + "typstyle", + "prettier", } return M diff --git a/.config/nvim/lua/configs/conform.lua b/.config/nvim/lua/configs/conform.lua index 80c68991..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 = { + css = { "prettier" }, + html = { "prettier" }, python = { "ruff_format" }, - rust = { "rustfmt" }, - lua = { "stylua" }, cpp = { "clang-format" }, c = { "clang-format" }, - css = { "prettier" }, - html = { "prettier" }, - scala = { "scalafmt" }, + typst = { "typstyle" }, }, format_on_save = { timeout_ms = 500, @@ -15,4 +13,4 @@ local options = { }, } -require("conform").setup(options) +return options diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua index b5379bb6..b685abd9 100644 --- a/.config/nvim/lua/configs/lspconfig.lua +++ b/.config/nvim/lua/configs/lspconfig.lua @@ -1,14 +1,13 @@ -local on_attach = require("nvchad.configs.lspconfig").on_attach -local on_init = require("nvchad.configs.lspconfig").on_init -local capabilities = require("nvchad.configs.lspconfig").capabilities +require("nvchad.configs.lspconfig").defaults() local lspconfig = require("lspconfig") -local servers = { "pylsp", "clangd", "cssls", "rust_analyzer", "texlab" } +local servers = { "html", "cssls", "pylsp", "clangd", "tinymist" } +local nvlsp = require("nvchad.configs.lspconfig") for _, lsp in ipairs(servers) do lspconfig[lsp].setup({ - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, + on_attach = nvlsp.on_attach, + on_init = nvlsp.on_init, + capabilities = nvlsp.capabilities, }) end diff --git a/.config/nvim/lua/configs/vimtex.lua b/.config/nvim/lua/configs/vimtex.lua deleted file mode 100644 index c25558d5..00000000 --- a/.config/nvim/lua/configs/vimtex.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.g.tex_flavor='latex' -vim.g.vimtex_view_method='zathura' -vim.g.vimtex_quickfix_mode=0 -vim.opt.conceallevel = 1 -vim.g.tex_conceal='abdmg' diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 73fba0de..dcb3a2e3 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -3,3 +3,4 @@ require("nvchad.mappings") local map = vim.keymap.set map("n", ";", ":", { desc = "CMD enter command mode" }) +map("i", "jk", "<ESC>") diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins/init.lua index ac64bcac..6a669117 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -2,14 +2,11 @@ return { { "stevearc/conform.nvim", event = "BufWritePre", - config = function() - require("configs.conform") - end, + opts = require("configs.conform"), }, { "neovim/nvim-lspconfig", config = function() - require("nvchad.configs.lspconfig").defaults() require("configs.lspconfig") end, }, @@ -25,17 +22,7 @@ return { "cpp", "c", "bash", - "html", - "markdown", - "scala", }, }, }, - { - "lervag/vimtex", - lazy = false, - config = function() - require("configs.vimtex") - end, - }, } |