Switch to nvchad.

This commit is contained in:
Bartek Stalewski 2023-10-14 14:48:19 +02:00
parent 4ffa1ed610
commit dae4bd3581
21 changed files with 253 additions and 2 deletions

3
_nvchad_custom/README.md Normal file
View File

@ -0,0 +1,3 @@
# Example_config
This can be used as an example custom config for NvChad. Do check the https://github.com/NvChad/nvcommunity

23
_nvchad_custom/chadrc.lua Normal file
View File

@ -0,0 +1,23 @@
--@type ChadrcConfig
local M = {}
-- Path to overriding theme and highlights files
local highlights = require "custom.highlights"
M.ui = {
theme = "monekai",
hl_override = highlights.override,
hl_add = highlights.add,
statusline = {
theme = "vscode_colored",
}
}
M.plugins = "custom.plugins"
-- check core.mappings for table structure
M.mappings = require "custom.mappings"
return M

View File

@ -0,0 +1,16 @@
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 = {}
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = on_attach,
capabilities = capabilities,
}
end
-- lspconfig.pyright.setup { blabla}

View File

@ -0,0 +1,21 @@
local null_ls = require "null-ls"
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,
}
null_ls.setup {
debug = true,
sources = sources,
}

View File

@ -0,0 +1,41 @@
local M = {}
M.treesitter = {
ensure_installed = {
"bash",
"lua",
"markdown",
"markdown_inline",
"python",
"terraform",
"vim",
},
indent = {
enable = true,
-- disable = {
-- "python"
-- },
},
}
-- M.mason = {
-- ensure_installed = {},
-- }
-- git support in nvimtree
M.nvimtree = {
git = {
enable = true,
},
renderer = {
highlight_git = true,
icons = {
show = {
git = true,
},
},
},
}
return M

View File

@ -0,0 +1,29 @@
-- To find any highlight groups: "<cmd> 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 = {
-- ColorColumn = { bg = "#770000" },
-- Comment = { italic = true, },
-- DiffChange = { bg = "NONE", fg = "#e7c547" },
-- DiffText = { bg = "NONE", fg = "#ff8700" },
-- FoldColumn = { bg = "NONE" },
-- NormalFloat = { bg = "NONE" },
-- LineNr = { bg = "NONE", fg = "#465457" },
-- NonText = { bg = "NONE" },
-- Normal = { bg = "NONE" },
-- SignColumn = { bg = "NONE" },
-- SpellBad = { bg = "#770000", fg = "#ffffff" },
-- TelescopeNormal = { bg = "NONE" },
-- Visual = { bg = "#005577", fg = "#ffffff" },
}
---@type HLTable
M.add = {
NvimTreeOpenedFolderName = { fg = "green", bold = true },
}
return M

22
_nvchad_custom/init.lua Normal file
View File

@ -0,0 +1,22 @@
local autocmd = vim.api.nvim_create_autocmd
local opt = vim.opt
autocmd("BufRead", {
pattern = "*.gotmpl",
command = "set filetype=yaml",
})
autocmd("BufNewFile", {
pattern = "*.gotmpl",
command = "set filetype=yaml",
})
opt.hlsearch = false
opt.shiftround = true
opt.relativenumber = false
opt.wrap = true
opt.writebackup = false
opt.foldcolumn = "0"
-- opt.laststatus = 2
-- opt.mouse = ""
-- opt.scrolloff = 5

View File

@ -0,0 +1,30 @@
local M = {}
M.disabled = {
n = {
["<leader>m"] = "",
}
}
M.general = {
i = {
["<C-a>"] = { "<esc>I" },
["<C-e>"] = { "<esc>A" },
},
n = {
["<esc><cr>"] = { "<esc><cmd>wq!<cr>", "Save and Exit" },
["<leader>m"] = { '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', "Toggle Column" },
["<leader>h"] = { "<cmd>set hlsearch!<cr>", "Toggle hlsearch" },
["<leader>j"] = { "<cmd>bprevious<cr>", "Buffer Previous" },
["<leader>k"] = { "<cmd>bnext<cr>", "Buffer Next" },
["<leader>n"] = { '<cmd>set number!<cr><cmd>IndentBlanklineToggle<cr><cmd>execute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")<cr>', "Toggle Decorations" },
["<leader>w"] = { "<cmd>lua require('whitespace-nvim').trim()<cr>", "Trim Trailing Whitespaces" },
["<leader>x"] = { "<cmd>bd<cr>", "Buffer Close" },
["<tab>"] = { "<C-w>w", },
},
v = {
[">"] = { ">gv", "indent"},
},
}
return M

View File

@ -0,0 +1,65 @@
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,
},
-- To make a plugin not be loaded
-- {
-- "NvChad/nvim-colorizer.lua",
-- enabled = false
-- },
-- All NvChad plugins are lazy-loaded by default
-- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
-- {
-- "mg979/vim-visual-multi",
-- lazy = false,
-- }
}
return plugins

View File

@ -19,8 +19,9 @@ git clone https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles
# astronvim
rm -rf ~/.config/nvim $XDG_DATA_HOME/repos/AstroNvim ~/.local/share/nvim ~/.local/state/nvim
git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_DATA_HOME/repos/AstroNvim
ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim
git clone https://github.com/NvChad/NvChad $XDG_CONFIG_HOME/nvim --depth 1
rm -rf $XDG_CONFIG_HOME/nvim/lua/custom
ln -sf $XDG_DATA_HOME/repos/dotfiles/_nvchad_custom $XDG_CONFIG_HOME/nvim/lua/custom
# zsh modules
mkdir -p $XDG_DATA_HOME/repos/zsh_modules