Skip to content

Commit 32190da

Browse files
Abdulkader-SafiAbdulkader-Safi
committed
Add Blade support and enhance AI plugin configurations
1 parent cf23688 commit 32190da

13 files changed

+108
-59
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pack/
2+

‎after/queries/blade/highlights.scm

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(directive) @function
2+
(directive_start) @function
3+
(directive_end) @function
4+
(comment) @comment
5+
((parameter) @include (#set! "priority" 110))
6+
((php_only) @include (#set! "priority" 110))
7+
((bracket_start) @function (#set! "priority" 120))
8+
((bracket_end) @function (#set! "priority" 120))
9+
(keyword) @function
10+

‎after/queries/blade/injections.scm

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
((text) @injection.content
2+
(#not-has-ancestor? @injection.content "envoy")
3+
(#set! injection.combined)
4+
(#set! injection.language php))
5+

‎docs/README.md

-10
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,6 @@ Code formater
8181

8282
---
8383

84-
### Linting
85-
86-
Code formater
87-
88-
| Key | Mode | Description |
89-
| :-------- | :----- | :------------------------------- |
90-
| leader mp | normal | Trigger linting for current file |
91-
92-
---
93-
9484
### Markdown
9585

9686
Markdown Preview Toggle

‎lazy-lock.json

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
{
22
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
33
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
4-
"alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" },
5-
"catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" },
4+
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
5+
"catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
66
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
77
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
8-
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
8+
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
99
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
10-
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
11-
"codeium.vim": { "branch": "main", "commit": "8bed5fb5708c94cd69f418d1381d6fbf07cb0313" },
12-
"conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" },
13-
"dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
14-
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
15-
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
16-
"indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" },
17-
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
18-
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
10+
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
11+
"conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" },
12+
"copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
13+
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
14+
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
15+
"gitsigns.nvim": { "branch": "main", "commit": "ac38d7860b258ec07085d8d1931e1a487bcee21d" },
16+
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
17+
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
18+
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
1919
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
20-
"mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" },
20+
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
2121
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
2222
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
2323
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
24-
"nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" },
25-
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
24+
"nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" },
25+
"nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
2626
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
27-
"nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" },
28-
"nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" },
29-
"nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" },
30-
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
31-
"nvim-tree.lua": { "branch": "master", "commit": "210478677cb9d672c4265deb0e9b59d58b675bd4" },
32-
"nvim-treesitter": { "branch": "master", "commit": "e085c614fcd716eedb8e2e55bae2ccad4becd40d" },
33-
"nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" },
34-
"nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
35-
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
36-
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
37-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
27+
"nvim-lint": { "branch": "master", "commit": "ec9fda13a5254783a80b37563ed5eb97b75c28b7" },
28+
"nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
29+
"nvim-lspconfig": { "branch": "master", "commit": "e118ce58dab72c17216292eef7df4cee3cf60885" },
30+
"nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
31+
"nvim-tree.lua": { "branch": "master", "commit": "fca0b67c0b5a31727fb33addc4d9c100736a2894" },
32+
"nvim-treesitter": { "branch": "master", "commit": "07bd1b53bf465e42d53253b48b7437892d6c45e8" },
33+
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
34+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
35+
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
36+
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
37+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
3838
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
39-
"todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
40-
"transparent.nvim": { "branch": "main", "commit": "2c78d94448b534c35ca1d88a3bae90b1cd1a3d4d" },
41-
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
39+
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
40+
"transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
41+
"trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
4242
"vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" },
43-
"vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
44-
"which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }
43+
"vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" },
44+
"which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
4545
}

‎lua/safi/lazy.lua

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ vim.opt.rtp:prepend(lazypath)
1414
require("lazy").setup({
1515
{ import = "safi.plugins" },
1616
{ import = "safi.plugins.lsp" },
17+
{ import = "safi.plugins.ai" },
1718
}, {
1819
checker = {
1920
enabled = true,

‎lua/safi/plugins/ai/codeium.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
return {
2+
-- "Exafunction/codeium.vim",
3+
-- event = "BufEnter",
4+
-- config = function()
5+
-- vim.keymap.set("i", "<c-;>", function()
6+
-- return vim.fn["codeium#Accept"]()
7+
-- end, { expr = true })
8+
-- vim.keymap.set("i", "<c-,>", function()
9+
-- return vim.fn["codeium#CycleCompletions"](1)
10+
-- end, { expr = true })
11+
-- vim.keymap.set("i", "<c-.>", function()
12+
-- return vim.fn["codeium#CycleCompletions"](-1)
13+
-- end, { expr = true })
14+
-- vim.keymap.set("i", "<c-x>", function()
15+
-- return vim.fn["codeium#Clear"]()
16+
-- end, { expr = true })
17+
-- end,
18+
}

‎lua/safi/plugins/ai/copilot.lua

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
return {
2+
{
3+
"github/copilot.vim",
4+
config = function()
5+
-- Configure Copilot key mappings and behavior here
6+
vim.g.copilot_no_tab_map = true -- Disable default <Tab> behavior
7+
8+
-- Customize key mappings
9+
vim.api.nvim_set_keymap("i", "<C-e>", 'copilot#Accept("<CR>")', { silent = true, expr = true })
10+
vim.api.nvim_set_keymap("i", "<C-n>", "copilot#Next()", { silent = true, expr = true })
11+
vim.api.nvim_set_keymap("i", "<C-p>", "copilot#Previous()", { silent = true, expr = true })
12+
13+
-- Enable Copilot suggestions by file type
14+
vim.g.copilot_filetypes = {
15+
["*"] = true, -- Enable Copilot for all file types
16+
markdown = true, -- Example: explicitly allow Markdown
17+
text = false, -- Example: disable Copilot for plain text files
18+
}
19+
end,
20+
},
21+
}

‎lua/safi/plugins/codeium.lua

-18
This file was deleted.

‎lua/safi/plugins/formatting.lua

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ return {
2020
liquid = { "prettier" },
2121
lua = { "stylua" },
2222
python = { "isort", "black" },
23+
blade = { "blade-formaatter" },
2324
},
2425
format_on_save = {
2526
lsp_fallback = true,

‎lua/safi/plugins/lsp/lspconfig.lua

+8
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,14 @@ return {
119119
})
120120
end,
121121

122+
["clangd"] = function()
123+
lspconfig["clangd"].setup({
124+
cmd = { "clangd", "--background-index" },
125+
filetypes = { "c", "cpp", "objc", "objcpp" },
126+
root_dir = require("lspconfig").util.root_pattern("compile_commands.json", ".git"),
127+
})
128+
end,
129+
122130
["tsserver"] = function()
123131
-- configure emmet language server
124132
lspconfig["tsserver"].setup({

‎lua/safi/plugins/nvim-cmp.lua

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ return {
4343
-- sources for autocompletion
4444
sources = cmp.config.sources({
4545
{ name = "emoji" },
46+
{ name = "copilot" },
4647
{ name = "nvim_lsp" },
4748
{ name = "luasnip" }, -- snippets
4849
{ name = "buffer" }, -- text within current buffer

‎lua/safi/plugins/tree-sitter.lua

+10
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,15 @@ return {
5353
"javascript",
5454
"typescript.tsx",
5555
}
56+
57+
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
58+
parser_config["blade"] = {
59+
install_info = {
60+
url = "https://github.com/EmranMR/tree-sitter-blade",
61+
files = { "src/parser.c" },
62+
branch = "main",
63+
},
64+
filetype = "blade",
65+
}
5666
end,
5767
}

0 commit comments

Comments
 (0)