diff --git a/config/nvim/lua/chadrc.lua b/config/nvim/lua/chadrc.lua index 1469e2f..79629dd 100644 --- a/config/nvim/lua/chadrc.lua +++ b/config/nvim/lua/chadrc.lua @@ -4,33 +4,28 @@ ---@type ChadrcConfig local M = {} -M.ui = { - theme = "monekai", - +M.base46 = { hl_override = { ColorColumn = { bg = "#770000" }, Comment = { italic = true, }, DiffChange = { bg = "NONE", fg = "#e7c547" }, DiffText = { bg = "NONE", fg = "#ff8700" }, - FoldColumn = { bg = "NONE" }, - NonText = { bg = "NONE" }, - Normal = { bg = "NONE" }, - NormalFloat = { bg = "NONE" }, - SignColumn = { bg = "NONE" }, SpellBad = { bg = "#770000", fg = "#ffffff" }, - TelescopeNormal = { bg = "NONE" }, Visual = { bg = "#0094d8", fg = "#ffffff" }, }, + theme = "monekai", + transparency = false +} +M.ui = { statusline = { theme = "vscode_colored", } - } M.mason = { cmd = true, - pkgs = {"lua-language-server"} + pkgs = { "lua-language-server" } } return M diff --git a/config/nvim/lua/init.lua b/config/nvim/lua/init.lua new file mode 100644 index 0000000..1af498a --- /dev/null +++ b/config/nvim/lua/init.lua @@ -0,0 +1,3 @@ +vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46_cache/" +dofile(vim.g.base46_cache .. "defaults") +dofile(vim.g.base46_cache .. "statusline") diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index b3c5aea..0888475 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -1,12 +1,28 @@ return { { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - config = function() - require "configs.conform" - end, + "nvim-lua/plenary.nvim", + { + "nvchad/ui", + config = function() + require "nvchad" + end + }, + { + "nvchad/base46", + lazy = true, + build = function() + require("base46").load_all_highlights() + end, + }, + "nvchad/volt", -- optional, needed for theme switcher + }, + { + "stevearc/conform.nvim", + -- event = 'BufWritePre', -- uncomment for format on save + config = function() + require "configs.conform" + end, }, - { "nvim-treesitter/nvim-treesitter", opts = { @@ -21,6 +37,7 @@ return { }, }, }, +} -- These are some examples, uncomment them if you want to see them work! -- { @@ -53,4 +70,3 @@ return { -- "mg979/vim-visual-multi", -- lazy = false, -- } -}