Compare commits

...

5 Commits

Author SHA1 Message Date
siduck
6833c60694 add default hl for term
so floating term windows wont have that darker bg anymore!
2024-03-26 13:26:00 +05:30
siduck
32d8a1fdff make nvconfig base46.integrations support new integrations only
0f933db516 so now users will just have to add the new integrations name instead of including default ones too
2024-03-24 08:11:01 +05:30
siduck
82413d957e disable colornames in nvim-colorizer 2024-03-24 06:07:53 +05:30
siduck
e5f8a38ae3 reload chadrc in autocmd 2024-03-19 09:32:01 +05:30
siduck
2e54fce028 add nvchad_types back & conform plugin 2024-03-18 06:29:28 +05:30
6 changed files with 24 additions and 27 deletions

View File

@ -21,6 +21,7 @@ autocmd("BufWritePost", {
local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".") local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".")
require("plenary.reload").reload_module "nvconfig" require("plenary.reload").reload_module "nvconfig"
require("plenary.reload").reload_module "chadrc"
require("plenary.reload").reload_module "base46" require("plenary.reload").reload_module "base46"
require("plenary.reload").reload_module(module) require("plenary.reload").reload_module(module)

View File

@ -37,7 +37,7 @@ end
-- disable semanticTokens -- disable semanticTokens
M.on_init = function(client, _) M.on_init = function(client, _)
if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then if client.supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil client.server_capabilities.semanticTokensProvider = nil
end end
end end
@ -80,6 +80,8 @@ M.defaults = function()
library = { library = {
[vim.fn.expand "$VIMRUNTIME/lua"] = true, [vim.fn.expand "$VIMRUNTIME/lua"] = true,
[vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
[vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
[vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
}, },
maxPreload = 100000, maxPreload = 100000,
preloadFileSize = 10000, preloadFileSize = 10000,

View File

@ -21,11 +21,11 @@ map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "Toggle Line number" })
map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle Relative number" }) map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle Relative number" })
map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Toggle NvCheatsheet" }) map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Toggle NvCheatsheet" })
-- global lsp mappings
map("n", "<leader>fm", function() map("n", "<leader>fm", function()
vim.lsp.buf.format { async = true } require("conform").format { lsp_fallback = true }
end, { desc = "Lsp formatting" }) end, { desc = "Format Files" })
-- global lsp mappings
map("n", "<leader>lf", vim.diagnostic.open_float, { desc = "Lsp floating diagnostics" }) map("n", "<leader>lf", vim.diagnostic.open_float, { desc = "Lsp floating diagnostics" })
map("n", "[d", vim.diagnostic.goto_prev, { desc = "Lsp prev diagnostic" }) map("n", "[d", vim.diagnostic.goto_prev, { desc = "Lsp prev diagnostic" })
map("n", "]d", vim.diagnostic.goto_next, { desc = "Lsp next diagnostic" }) map("n", "]d", vim.diagnostic.goto_next, { desc = "Lsp next diagnostic" })

View File

@ -2,6 +2,19 @@ return {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
-- formatting!
{
"stevearc/conform.nvim",
opts = {
formatters_by_ft = {
lua = { "stylua" },
},
},
config = function(_, opts)
require("conform").setup(opts)
end,
},
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },

View File

@ -20,6 +20,7 @@ return {
{ {
"NvChad/nvim-colorizer.lua", "NvChad/nvim-colorizer.lua",
event = "User FilePost", event = "User FilePost",
opts = { user_default_options = { names = false } },
config = function(_, opts) config = function(_, opts)
require("colorizer").setup(opts) require("colorizer").setup(opts)

View File

@ -63,13 +63,10 @@ M.ui = {
cheatsheet = { theme = "grid" }, -- simple/grid cheatsheet = { theme = "grid" }, -- simple/grid
lsp = { lsp = { signature = true },
signature = true,
semantic_tokens = false,
},
term = { term = {
-- hl = "Normal:term,WinSeparator:WinSeparator", hl = "Normal:term,WinSeparator:WinSeparator",
sizes = { sp = 0.3, vsp = 0.2 }, sizes = { sp = 0.3, vsp = 0.2 },
float = { float = {
relative = "editor", relative = "editor",
@ -83,24 +80,7 @@ M.ui = {
} }
M.base46 = { M.base46 = {
integrations = { integrations = {},
"blankline",
"cmp",
"defaults",
"devicons",
"git",
"lsp",
"mason",
"nvcheatsheet",
"nvdash",
"nvimtree",
"statusline",
"syntax",
"treesitter",
"tbline",
"telescope",
"whichkey",
},
} }
return vim.tbl_deep_extend("force", M, require "chadrc") return vim.tbl_deep_extend("force", M, require "chadrc")