diff --git a/lazy-lock.json b/lazy-lock.json index d9daf27..ba3dc11 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,19 +12,18 @@ "code_runner.nvim": { "branch": "main", "commit": "a010649236fe245eaab2641a13228cd601499715" }, "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" }, "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" }, - "friendly-snippets": { "branch": "main", "commit": "6fa50a94ba5378bb73013a6e163376d8e69bd8a5" }, + "friendly-snippets": { "branch": "main", "commit": "02ed98a1d4bc8baac405480935f3353d3bd60359" }, "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, - "gruvbox-baby": { "branch": "main", "commit": "ea71b4225d0140103d99748ca4a33ecf22c03f62" }, "impatient.nvim": { "branch": "main", "commit": "969f2c5c90457612c09cf2a13fee1adaa986d350" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "jaq-nvim": { "branch": "master", "commit": "236296aae555657487d1bb4d066cbde9d79d8cd4" }, - "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, + "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, "live-server": { "branch": "main", "commit": "ecd7c1418823b65dd2bca710587c80afe42c973e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "lunar.nvim": { "branch": "master", "commit": "29eedf78c430ad9acebdcba814d77619edbe2bac" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" }, "mason-null-ls.nvim": { "branch": "main", "commit": "29ce60f9a16fef3de682a9365ef635f24ae92bf9" }, - "mason.nvim": { "branch": "main", "commit": "5f38eca64b7ed9f8a1f997ce67f2ccc80ab80c91" }, + "mason.nvim": { "branch": "main", "commit": "1c23135467af667c61aef72a7c08b9a032c50a52" }, "mini.animate": { "branch": "main", "commit": "b0c717ed5513b5f23e7c48615449c7dc9fabd05b" }, "mini.indentscope": { "branch": "main", "commit": "ff1e68b5c01426f9dfff3278dd1b10c9b5f000a1" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, @@ -43,14 +42,14 @@ "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "0f23feca2bd08549b779c838b6b1308d1e76df03" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "smart-splits.nvim": { "branch": "master", "commit": "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, "todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" }, "toggleterm.nvim": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, - "trouble.nvim": { "branch": "main", "commit": "c82530083dd248ffa72d7087199ea5c8efe81820" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "vim": { "branch": "master", "commit": "a4f6b0abe6cad85330867a54893864e0d5c59359" }, "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua index da61902..84705f8 100644 --- a/lua/custom/plugins/ui.lua +++ b/lua/custom/plugins/ui.lua @@ -1,5 +1,6 @@ return { { "dracula/vim" }, + { "luisiacc/gruvbox-baby", enabled = false }, -- { "folke/tokyonight.nvim" }, -- { "arcticicestudio/nord-vim" }, -- { "sainnhe/sonokai" }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 062f96f..68a0609 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -83,7 +83,7 @@ return { documentation = cmp.config.window.bordered(), }, experimental = { - ghost_text = false, + ghost_text = true, native_menu = false, }, } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index aadf310..13a8fdf 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -46,7 +46,7 @@ return { "rafamadriz/friendly-snippets", config = function() require("luasnip.loaders.from_vscode").lazy_load() - require("user.snip") + require("user.snippets") end, }, opts = { diff --git a/lua/user/snippets.lua b/lua/user/snippets.lua new file mode 100644 index 0000000..6035439 --- /dev/null +++ b/lua/user/snippets.lua @@ -0,0 +1,10 @@ +local status_ok = pcall(require, "luasnip") +if not status_ok then + return +end + +local lpath = vim.fn.stdpath("config") .. "/my-snippets" +require("luasnip.loaders.from_vscode").lazy_load({ + paths = lpath, +}) +require("luasnip.loaders.from_vscode").load({ paths = lpath }) diff --git a/my-snippets/package.json b/my-snippets/package.json index f97173b..26b0959 100644 --- a/my-snippets/package.json +++ b/my-snippets/package.json @@ -1,144 +1,142 @@ { - "name": "html-snippets", - "displayName": "HTML/CSS/JavaScript Snippets", - "description": "HTML/CSS/JavaScript/Jade/Pug/Less/Sass/Stylus/ES6 Snippets Support", - "version": "1.0.6", - "publisher": "wscats", - "icon": "images/logo.png", - "engines": { - "vscode": "^1.40.0" - }, - "keywords": [ - "html", - "html5", - "css", - "css3", - "javascript", - "typescript", - "ES6", - "ES7", - "snippets" - ], - "author": { - "name": "Eno Yao", - "email": "kalone.cool@gmail.com", - "url": "https://github.com/Wscats" - }, - "galleryBanner": { - "color": "#58bc58", - "theme": "light" - }, - "categories": [ - "Programming Languages", - "Snippets" - ], - "scripts": { - "build": "vsce package" - }, - "contributes": { - "snippets": [ - { - "language": "html", - "path": "./html/snippets/javascript.json" - }, - { - "language": "html", - "path": "./html/javascript/javascript.json" - }, - { - "language": "html", - "path": "./html/javascript/typescript.json" - }, - - - { - "language": "blade", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "ejs", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "html", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "handlebars", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "latte", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "php", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "plaintext", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "razor", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "tpl", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "typescript", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "typescriptreact", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "javascriptreact", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "javascript", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "twig", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "vue", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "vue-html", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "django-html", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "jinja-html", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "erb", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "HTML (Eex)", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "volt", - "path": "./B5-Snippets/snippets/bootstrap.json" - }, - { - "language": "nunjucks", - "path": "./B5-Snippets/snippets/bootstrap.json" - } - ] - } -} \ No newline at end of file + "name": "html-snippets", + "displayName": "HTML/CSS/JavaScript Snippets", + "description": "HTML/CSS/JavaScript/Jade/Pug/Less/Sass/Stylus/ES6 Snippets Support", + "version": "1.0.6", + "publisher": "wscats", + "icon": "images/logo.png", + "engines": { + "vscode": "^1.40.0" + }, + "keywords": [ + "html", + "html5", + "css", + "css3", + "javascript", + "typescript", + "ES6", + "ES7", + "snippets" + ], + "author": { + "name": "Eno Yao", + "email": "kalone.cool@gmail.com", + "url": "https://github.com/Wscats" + }, + "galleryBanner": { + "color": "#58bc58", + "theme": "light" + }, + "categories": [ + "Programming Languages", + "Snippets" + ], + "scripts": { + "build": "vsce package" + }, + "contributes": { + "snippets": [ + { + "language": "html", + "path": "./html/snippets/javascript.json" + }, + { + "language": "html", + "path": "./html/javascript/javascript.json" + }, + { + "language": "html", + "path": "./html/javascript/typescript.json" + }, + { + "language": "blade", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "ejs", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "html", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "handlebars", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "latte", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "php", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "plaintext", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "razor", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "tpl", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "typescript", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "typescriptreact", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "javascriptreact", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "javascript", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "twig", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "vue", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "vue-html", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "django-html", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "jinja-html", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "erb", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "HTML (Eex)", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "volt", + "path": "./B5-Snippets/snippets/bootstrap.json" + }, + { + "language": "nunjucks", + "path": "./B5-Snippets/snippets/bootstrap.json" + } + ] + } +}