Merge branch 'main' into development

nvim/lua/plugins/lualine.lua

@@ -7,7 +7,7 @@ local function get_schema()
 end
 
 vim.pack.add({
-    'https://github.com/nvim-tree/nvim-web-devicons',
+    -- 'https://github.com/nvim-tree/nvim-web-devicons',
     'https://github.com/nvim-lualine/lualine.nvim'
 })
 

nvim/lua/plugins/luasnip.lua

@@ -1,5 +1,5 @@
 vim.pack.add({
-    'https://github.com/saadparwaiz1/cmp_luasnip',
+    -- 'https://github.com/saadparwaiz1/cmp_luasnip',
     'https://github.com/rafamadriz/friendly-snippets',
     'https://github.com/L3MON4D3/LuaSnip'
 })
@@ -13,7 +13,7 @@ local function luasnip_dependency_update()
     -- Verify the lib exists, (re)run the make install target
     if vim.uv.fs_stat(artifact) then
         vim.notify('Building LuaSnip jsregexp dependency...', vim.log.levels.INFO)
-        vim.system({ 'make', 'install_jsregexp' }, { cwd = luasnip_root }, function (out)
+        vim.system({ 'make', 'install_jsregexp' }, { cwd = luasnip_root }, function(out)
             vim.schedule(function()
                 if out.code == 0 then
                     vim.notify('LuaSnip jsregexp built successfully!', vim.log.levels.INFO)
@@ -38,7 +38,10 @@ require('luasnip').setup {
     enable_autosnippets = true,
 }
 
--- local types = require('luasnip.util.types')
-
 require('luasnip.loaders.from_vscode').lazy_load()
 require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" })
+
+-- TODO: Figure out keymappings that make sense
+vim.keymap.set({ 'i' }, '<C-k>', function() require('luasnip').expand() end, { silent = true })
+vim.keymap.set({ 'i', 's' }, '<C-l>', function() require('luasnip').jump(1) end, { silent = true })
+vim.keymap.set({ 'i', 's' }, '<C-j>', function() require('luasnip').jump(-1) end, { silent = true })

nvim/lua/plugins/telekasten.lua

@@ -20,6 +20,8 @@ require('telekasten').setup({
     plug_into_calendar    = false,
 })
 
+vim.treesitter.language.register('markdown', 'telekasten')
+
 -- Color for telekasten syntax
 vim.api.nvim_set_hl(0, 'tkLink', { ctermfg = 72, cterm = { bold = true, underdouble = true }, fg = '#689d6a', bold = true, underdouble = true })
 vim.api.nvim_set_hl(0, 'tkBrackets', { ctermfg = 'gray', fg = 'gray' })