From 980467b73f093d47010555c3fc4c7f955f77999e Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Apr 2023 22:53:25 -0500 Subject: [PATCH] add nvchad config to repo --- .config/nvchad/custom/README.md | 3 + .config/nvchad/custom/chadrc.lua | 20 +++++++ .config/nvchad/custom/configs/lspconfig.lua | 17 ++++++ .config/nvchad/custom/configs/null-ls.lua | 28 +++++++++ .config/nvchad/custom/configs/overrides.lua | 64 +++++++++++++++++++++ .config/nvchad/custom/highlights.lua | 19 ++++++ .config/nvchad/custom/init.lua | 18 ++++++ .config/nvchad/custom/mappings.lua | 12 ++++ .config/nvchad/custom/plugins.lua | 62 ++++++++++++++++++++ 9 files changed, 243 insertions(+) create mode 100644 .config/nvchad/custom/README.md create mode 100644 .config/nvchad/custom/chadrc.lua create mode 100644 .config/nvchad/custom/configs/lspconfig.lua create mode 100644 .config/nvchad/custom/configs/null-ls.lua create mode 100644 .config/nvchad/custom/configs/overrides.lua create mode 100644 .config/nvchad/custom/highlights.lua create mode 100644 .config/nvchad/custom/init.lua create mode 100644 .config/nvchad/custom/mappings.lua create mode 100644 .config/nvchad/custom/plugins.lua diff --git a/.config/nvchad/custom/README.md b/.config/nvchad/custom/README.md new file mode 100644 index 0000000..a6ef0d1 --- /dev/null +++ b/.config/nvchad/custom/README.md @@ -0,0 +1,3 @@ +# Example_config + +This can be used as an example custom config for NvChad, this branch is a minimal one. Do check the feature_full branch if you need all the ease in your config. diff --git a/.config/nvchad/custom/chadrc.lua b/.config/nvchad/custom/chadrc.lua new file mode 100644 index 0000000..154c455 --- /dev/null +++ b/.config/nvchad/custom/chadrc.lua @@ -0,0 +1,20 @@ +---@type ChadrcConfig +local M = {} + +-- Path to overriding theme and highlights files +local highlights = require "custom.highlights" + +M.ui = { + theme = "onedark", + theme_toggle = { "onedark", "one_light" }, + + hl_override = highlights.override, + hl_add = highlights.add, +} + +M.plugins = "custom.plugins" + +-- check core.mappings for table structure +M.mappings = require "custom.mappings" + +return M diff --git a/.config/nvchad/custom/configs/lspconfig.lua b/.config/nvchad/custom/configs/lspconfig.lua new file mode 100644 index 0000000..52e5cc0 --- /dev/null +++ b/.config/nvchad/custom/configs/lspconfig.lua @@ -0,0 +1,17 @@ +local on_attach = require("plugins.configs.lspconfig").on_attach +local capabilities = require("plugins.configs.lspconfig").capabilities + +local lspconfig = require "lspconfig" + +-- if you just want default config for the servers then put them in a table +local servers = { "html", "cssls", "tsserver", "clangd", "hls" } + +for _, lsp in ipairs(servers) do + lspconfig[lsp].setup { + on_attach = on_attach, + capabilities = capabilities, + } +end + +-- +-- lspconfig.pyright.setup { blabla} diff --git a/.config/nvchad/custom/configs/null-ls.lua b/.config/nvchad/custom/configs/null-ls.lua new file mode 100644 index 0000000..4683b1f --- /dev/null +++ b/.config/nvchad/custom/configs/null-ls.lua @@ -0,0 +1,28 @@ +local present, null_ls = pcall(require, "null-ls") + +if not present then + return +end + +local b = null_ls.builtins + +local sources = { + + -- webdev stuff + b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! + b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes + + -- Lua + b.formatting.stylua, + + -- cpp + b.formatting.clang_format, + + b.formatting.stylish_haskell, + b.diagnostics.shellcheck, +} + +null_ls.setup { + debug = true, + sources = sources, +} diff --git a/.config/nvchad/custom/configs/overrides.lua b/.config/nvchad/custom/configs/overrides.lua new file mode 100644 index 0000000..a68772b --- /dev/null +++ b/.config/nvchad/custom/configs/overrides.lua @@ -0,0 +1,64 @@ +local M = {} + +M.treesitter = { + ensure_installed = { + "vim", + "lua", + "html", + "css", + "javascript", + "typescript", + "tsx", + "c", + "markdown", + "markdown_inline", + "haskell", + }, + indent = { + enable = true, + -- disable = { + -- "python" + -- }, + }, +} + +M.mason = { + ensure_installed = { + -- lua stuff + "lua-language-server", + "stylua", + + -- web dev stuff + "css-lsp", + "html-lsp", + "typescript-language-server", + "deno", + "prettier", + + -- c/cpp stuff + "clangd", + "clang-format", + + --my additions + "haskell-language-server", + "shellcheck", + }, +} + +-- git support in nvimtree +M.nvimtree = { + git = { + enable = true, + }, + + renderer = { + highlight_git = true, + icons = { + show = { + git = true, + }, + }, + }, +} + +return M diff --git a/.config/nvchad/custom/highlights.lua b/.config/nvchad/custom/highlights.lua new file mode 100644 index 0000000..ebf2dfb --- /dev/null +++ b/.config/nvchad/custom/highlights.lua @@ -0,0 +1,19 @@ +-- To find any highlight groups: " Telescope highlights" +-- Each highlight group can take a table with variables fg, bg, bold, italic, etc +-- base30 variable names can also be used as colors + +local M = {} + +---@type Base46HLGroupsList +M.override = { + Comment = { + italic = true, + }, +} + +---@type HLTable +M.add = { + NvimTreeOpenedFolderName = { fg = "green", bold = true }, +} + +return M diff --git a/.config/nvchad/custom/init.lua b/.config/nvchad/custom/init.lua new file mode 100644 index 0000000..30c6a20 --- /dev/null +++ b/.config/nvchad/custom/init.lua @@ -0,0 +1,18 @@ +-- local autocmd = vim.api.nvim_create_autocmd + +-- Auto resize panes when resizing nvim window +-- autocmd("VimResized", { +-- pattern = "*", +-- command = "tabdo wincmd =", +-- }) + +local g = vim.g +local wo = vim.wo +local bo = vim.bo +local opt = vim.opt + +bo.tabstop = 4 +bo.shiftwidth = 4 +bo.expandtab = true + +opt.colorcolumn = "80" diff --git a/.config/nvchad/custom/mappings.lua b/.config/nvchad/custom/mappings.lua new file mode 100644 index 0000000..9ce068a --- /dev/null +++ b/.config/nvchad/custom/mappings.lua @@ -0,0 +1,12 @@ +---@type MappingsTable +local M = {} + +M.general = { + n = { + [";"] = { ":", "enter command mode", opts = { nowait = true } }, + }, +} + +-- more keybinds! + +return M diff --git a/.config/nvchad/custom/plugins.lua b/.config/nvchad/custom/plugins.lua new file mode 100644 index 0000000..31e66af --- /dev/null +++ b/.config/nvchad/custom/plugins.lua @@ -0,0 +1,62 @@ +local overrides = require("custom.configs.overrides") + +---@type NvPluginSpec[] +local plugins = { + + -- Override plugin definition options + + { + "neovim/nvim-lspconfig", + dependencies = { + -- format & linting + { + "jose-elias-alvarez/null-ls.nvim", + config = function() + require "custom.configs.null-ls" + end, + }, + }, + config = function() + require "plugins.configs.lspconfig" + require "custom.configs.lspconfig" + end, -- Override to setup mason-lspconfig + }, + + -- override plugin configs + { + "williamboman/mason.nvim", + opts = overrides.mason + }, + + { + "nvim-treesitter/nvim-treesitter", + opts = overrides.treesitter, + }, + + { + "nvim-tree/nvim-tree.lua", + opts = overrides.nvimtree, + }, + + -- Install a plugin + { + "max397574/better-escape.nvim", + event = "InsertEnter", + config = function() + require("better_escape").setup() + end, + }, + + { + "vimwiki/vimwiki", + }, + + -- To make a plugin not be loaded + -- { + -- "NvChad/nvim-colorizer.lua", + -- enabled = false + -- }, + +} + +return plugins