Skip to content
forked from NvChad/NvChad

Commit d4ecd87

Browse files
committed
chore: merge develop into main
2 parents e0deb20 + 5aa9009 commit d4ecd87

File tree

9 files changed

+76
-22
lines changed

9 files changed

+76
-22
lines changed

.github/images/megaman.jpeg

57 KB
Loading

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,21 @@ install-windows:
9797
echo "- Hack Nerd Font"; \
9898
fi
9999

100+
# Install git hooks
101+
.PHONY: hooks
102+
hooks:
103+
@echo "Installing git hooks..."
104+
@cp scripts/commit-msg .git/hooks/commit-msg
105+
@chmod +x .git/hooks/commit-msg
106+
@echo "Git hooks installed successfully."
107+
100108
# Help target
101109
.PHONY: help
102110
help:
103111
@echo "Available targets:"
104-
@echo " install - Install dependencies for the detected OS"
112+
@echo " install - Install dependencies for the detected OS"
105113
@echo " install-macos - Install dependencies for macOS (requires Homebrew)"
106114
@echo " install-linux - Install dependencies for Linux (apt/yum/pacman)"
107115
@echo " install-windows - Install dependencies for Windows (Chocolatey/Scoop)"
108-
@echo " help - Show this help message"
116+
@echo " hooks - Install git hooks for conventional commits"
117+
@echo " help - Show this help message"

README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# NvMegaChad
22

3+
![Neovim](https://img.shields.io/badge/Neovim-0.11+-blueviolet?style=flat-square&logo=neovim)
4+
![Lua](https://img.shields.io/badge/Made%20with-Lua-blue?style=flat-square&logo=lua)
5+
![NvChad](https://img.shields.io/badge/Built%20on-NvChad-green?style=flat-square)
6+
![GitHub license](https://img.shields.io/github/license/le4ker/NvMegaChad?style=flat-square)
7+
38
![plugins](https://dotfyle.com/le4ker/nvmegachad/badges/plugins)
49
![leader](https://dotfyle.com/le4ker/nvmegachad/badges/leaderkey)
510
![lazy](https://dotfyle.com/le4ker/nvmegachad/badges/plugin-manager)
@@ -113,6 +118,30 @@ NVIM_APPNAME=le4ker/NvMegaChad nvim
113118
| Vimscript | [vim-language-server](https://github.com/iamcco/vim-language-server) ||||
114119
| SQL || [sql-formatter](https://github.com/sql-formatter-org/sql-formatter) |||
115120

121+
## 🛠️ Development
122+
123+
### Git Hooks Setup
124+
125+
This repository uses [Conventional Commits](https://www.conventionalcommits.org/). To enforce this on your local clone, run:
126+
127+
```sh
128+
make hooks
129+
```
130+
131+
This installs a commit-msg hook that validates your commit messages follow the format:
132+
133+
```
134+
<type>(<scope>): <description>
135+
```
136+
137+
**Allowed types:** `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`, `revert`
138+
139+
**Examples:**
140+
141+
- `feat(mappings): add new keybinding for terminal`
142+
- `fix(lsp): resolve null reference error`
143+
- `docs: update README`
144+
116145
## 📄 License
117146

118147
See [LICENSE](LICENSE) for details.

lazy-lock.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
{
22
"LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
3-
"NvChad": { "branch": "v2.5", "commit": "30e75dbbdf33f393430d6e7612dd32ef84e2a710" },
3+
"NvChad": { "branch": "v2.5", "commit": "c57b82473b821274f6017eb03582ba1d13be9d8c" },
44
"base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
55
"cmp-async-path": { "branch": "main", "commit": "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1" },
66
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
77
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
88
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
99
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
10-
"codecompanion.nvim": { "branch": "main", "commit": "b6fcc25ced5628d3d960e6e4bc287ce8fc9a1710" },
11-
"conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" },
12-
"gitsigns.nvim": { "branch": "main", "commit": "6bd29494e3f79ff08be1d35bc1926ed23c22ed9a" },
10+
"codecompanion.nvim": { "branch": "main", "commit": "6e164a1967096564fbabd8e01e86b6ffda819620" },
11+
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
12+
"gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
1313
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
1414
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
1515
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
16-
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
16+
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
1717
"menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
1818
"minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
1919
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
2020
"nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" },
21-
"nvim-dap": { "branch": "master", "commit": "7bb46cc612bb127d7b0e3e9ed695267d830824ec" },
21+
"nvim-dap": { "branch": "master", "commit": "085386b9359ddf8d76ad89b98973b8e332dc5ba3" },
2222
"nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
2323
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
2424
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
25-
"nvim-lint": { "branch": "master", "commit": "1f19dacd945a7b1a57f29f32b2d7168384df3d36" },
26-
"nvim-lspconfig": { "branch": "master", "commit": "ac04ec3c2af08e9821b4eb64ede86072b9b213bf" },
25+
"nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
26+
"nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
2727
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
28-
"nvim-tree.lua": { "branch": "master", "commit": "b8b44b6a2494d086a9177251a119f9daec6cace8" },
28+
"nvim-tree.lua": { "branch": "master", "commit": "1701e41b07d398757101ac35e11d6992085fc75f" },
2929
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
30-
"nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
30+
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
3131
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
32-
"telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
33-
"ui": { "branch": "v3.0", "commit": "ebf58649bc5c759ee6c730c87d8d2d4dd4124c0d" },
32+
"telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
33+
"ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
3434
"volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
3535
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
3636
}

lua/configs/lspconfig.lua

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ local servers = {
2020
"yamlls",
2121
}
2222

23-
-- Load custom configs from lua/lsp/<server>.lua
24-
for _, server in ipairs(servers) do
25-
local ok, custom = pcall(require, "lsp." .. server)
26-
if ok then
27-
vim.lsp.config(server, custom)
28-
end
29-
end
30-
3123
-- Enable inlay hints
3224
vim.lsp.inlay_hint.enable(true)
3325

lua/lsp/gopls.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
-- Disable insertReplaceSupport to fix completion error with gopls
2+
-- See: https://github.com/neovim/neovim/issues/30332
3+
local capabilities = vim.lsp.protocol.make_client_capabilities()
4+
capabilities.textDocument.completion.completionItem.insertReplaceSupport = false
5+
16
return {
7+
capabilities = capabilities,
28
settings = {
39
gopls = {
410
completeUnimported = true,

lua/mappings.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ map("n", "<leader>q", "<cmd>q<CR>", { desc = "General Quit", silent = true })
2121
map("n", "<leader>v", "<cmd>vsplit<CR>", { desc = "General Vertical Split", silent = true })
2222
map("n", "<leader>lu", "<cmd>Lazy update<CR>", { desc = "General Update Lazy Plugins", silent = true })
2323
map("n", "<leader>mu", function()
24+
vim.notify("Updating Mason packages...", vim.log.levels.INFO)
2425
local registry = require "mason-registry"
2526
registry.refresh(function()
2627
local installed = registry.get_installed_packages()

lua/options.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ local opt = vim.opt
44

55
opt.backup = false
66
opt.swapfile = false
7+
opt.undofile = true
78
opt.colorcolumn = "100"
89
opt.relativenumber = true
910
opt.list = true

scripts/commit-msg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
commit_regex='^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?: .{1,}'
3+
4+
if ! grep -qE "$commit_regex" "$1"; then
5+
echo "ERROR: Commit message does not follow Conventional Commits format."
6+
echo ""
7+
echo "Format: <type>(<scope>): <description>"
8+
echo ""
9+
echo "Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert"
10+
echo ""
11+
echo "Examples:"
12+
echo " feat(mappings): add new keybinding for terminal"
13+
echo " fix(lsp): resolve null reference error"
14+
echo " docs: update README"
15+
exit 1
16+
fi

0 commit comments

Comments
 (0)