diff --git a/lua/cosmic/core/navigation/mappings.lua b/lua/cosmic/core/navigation/mappings.lua index f08826c..20f6bcc 100644 --- a/lua/cosmic/core/navigation/mappings.lua +++ b/lua/cosmic/core/navigation/mappings.lua @@ -29,8 +29,8 @@ M.init = function() map('n', 'bn', ':bnext') -- tab navigation - map('n', 'tp', ':tprev') - map('n', 'tn', ':tnext') + map('n', 'tp', ':tabprevious') + map('n', 'tn', ':tabnext') end return M diff --git a/lua/cosmic/core/snippets/init.lua b/lua/cosmic/core/snippets/init.lua new file mode 100644 index 0000000..18a1105 --- /dev/null +++ b/lua/cosmic/core/snippets/init.lua @@ -0,0 +1,31 @@ +local ls = require('luasnip') +-- some shorthands... +--[[ local s = ls.snippet +local sn = ls.snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node ]] + +-- Every unspecified option will be set to the default. +ls.config.set_config({ + history = true, + -- Update more often, :h events for more info. + updateevents = 'TextChanged,TextChangedI', +}) + +ls.snippets = { + all = {}, + html = {}, +} + +-- enable html snippets in javascript/javascript(REACT) +ls.snippets.javascript = ls.snippets.html +ls.snippets.javascriptreact = ls.snippets.html +ls.snippets.typescriptreact = ls.snippets.html +require('luasnip/loaders/from_vscode').load({ include = { 'html' } }) + +-- You can also use lazy loading so you only get in memory snippets of languages you use + +require('luasnip/loaders/from_vscode').lazy_load() diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua index 2f115a9..639bd54 100644 --- a/lua/cosmic/pluginsInit.lua +++ b/lua/cosmic/pluginsInit.lua @@ -117,7 +117,14 @@ return packer.startup(function() use({ 'L3MON4D3/LuaSnip', - event = 'InsertEnter', + config = function() + require('cosmic.core.snippets') + end, + requires = { + { + 'rafamadriz/friendly-snippets', + }, + }, disable = vim.tbl_contains(user_plugins.disable, 'autocomplete'), }) @@ -133,7 +140,7 @@ return packer.startup(function() { 'hrsh7th/cmp-nvim-lua', after = 'cmp-buffer' }, { 'hrsh7th/cmp-path', after = 'cmp-nvim-lua' }, }, - after = 'LuaSnip', + event = 'InsertEnter', }) use({