Skip to content

Commit ae19017

Browse files
committed
Update to main init.lua
enabled friendly-snippets, changed blink.cmp auto complete, added emmet abbrv to html files fixed require for SchemaStore added autotag for HTML files
1 parent 01d9c6f commit ae19017

File tree

4 files changed

+45
-12
lines changed

4 files changed

+45
-12
lines changed

init.lua

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ require('lazy').setup({
695695
csharp_ls = {},
696696
intelephense = {},
697697
html = {},
698+
emmet_language_server = {},
698699
cssls = {},
699700
docker_compose_language_service = {},
700701
dockerls = {},
@@ -839,13 +840,14 @@ require('lazy').setup({
839840
dependencies = {
840841
-- `friendly-snippets` contains a variety of premade snippets.
841842
-- See the README about individual language/framework/plugin snippets:
843+
-- Default snipits are enabled. Only see link abount framwork specific snipits as they are disabled.
842844
-- https://github.com/rafamadriz/friendly-snippets
843-
-- {
844-
-- 'rafamadriz/friendly-snippets',
845-
-- config = function()
846-
-- require('luasnip.loaders.from_vscode').lazy_load()
847-
-- end,
848-
-- },
845+
{
846+
'rafamadriz/friendly-snippets',
847+
config = function()
848+
require('luasnip.loaders.from_vscode').lazy_load()
849+
end,
850+
},
849851
},
850852
opts = {},
851853
},
@@ -892,6 +894,14 @@ require('lazy').setup({
892894
-- By default, you may press `<c-space>` to show the documentation.
893895
-- Optionally, set `auto_show = true` to show the documentation after a delay.
894896
documentation = { auto_show = false, auto_show_delay_ms = 500 },
897+
menu = {
898+
draw = {
899+
columns = {
900+
{ 'kind_icon', 'kind', 'label', gap = 1 },
901+
{ 'source_name' },
902+
},
903+
},
904+
},
895905
},
896906

897907
sources = {

lazy-lock.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@
44
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
55
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
66
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
7-
"gitsigns.nvim": { "branch": "main", "commit": "4666d040b60d1dc0e474ccd9a3fd3c4d67b4767c" },
7+
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
8+
"gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" },
89
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
910
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
1011
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
1112
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
1213
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
13-
"mason-lspconfig.nvim": { "branch": "main", "commit": "7815740f4d0afb74ada00956c36e18ad695ed9e3" },
14+
"mason-lspconfig.nvim": { "branch": "main", "commit": "c2465eb07db648026eee81005a659abe26e6d077" },
1415
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
1516
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
1617
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
17-
"mini.nvim": { "branch": "main", "commit": "3f71fd3573981bf18f76b2bfb6518c4ae728638d" },
18+
"mini.nvim": { "branch": "main", "commit": "48f48e4b3f317e9da34ee7a01958b4c5018e2d34" },
1819
"neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
1920
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
2021
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
2122
"nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" },
2223
"nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
2324
"nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
24-
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
25+
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
2526
"nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" },
26-
"nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" },
27+
"nvim-lspconfig": { "branch": "master", "commit": "7fac9025a967a4d0846660f751cd392fac6bb788" },
2728
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
2829
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
29-
"nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
30+
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
31+
"nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" },
3032
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
3133
"schemastore.nvim": { "branch": "main", "commit": "36fb914c0defa2274207e670182253508e5569d5" },
3234
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },

lua/custom/plugins/init.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ return {
99
require 'custom.plugins.harpoon2',
1010
require 'custom.plugins.jp-terminal',
1111
require('custom.indentation').setup(),
12+
require 'custom.plugins.SchemaStore',
13+
require 'custom.plugins.nvim-ts-autotag',
1214
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
return {
2+
'windwp/nvim-ts-autotag',
3+
opts = {
4+
opts = {
5+
-- Defaults
6+
enable_close = true, -- Auto close tags
7+
enable_rename = true, -- Auto rename pairs of tags
8+
enable_close_on_slash = false, -- Auto close on trailing </
9+
},
10+
},
11+
-- Also override individual filetype configs, these take priority.
12+
-- Empty by default, useful if one of the "opts" global settings
13+
-- doesn't work well in a specific filetype
14+
-- per_filetype = {
15+
-- ["html"] = {
16+
-- enable_close = false
17+
-- }
18+
-- }
19+
}

0 commit comments

Comments
 (0)