From 614ae1232084d38ee00d4f3401d8d76f180321e5 Mon Sep 17 00:00:00 2001
From: Lucas Sta Maria <lucas@priime.dev>
Date: Sun, 11 Sep 2022 23:27:01 -0400
Subject: [PATCH] fix: improve latex workflow

Signed-off-by: Lucas Sta Maria <lucas@priime.dev>
---
 .config/nvim/init.lua        |  1 +
 .config/nvim/lua/lsp.lua     | 22 +++++++++++++++++++---
 .config/nvim/lua/plugins.lua | 15 +++++++++++++--
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 7fcd4d1..a2b9258 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -35,4 +35,5 @@ require("plugins")
 require("mappings")
 require("treesitter")
 require("completion")
+require("snippets")
 require("lsp")
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index f2a13ba..318781d 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -1,11 +1,12 @@
 local lspconfig = require("lspconfig")
 local saga = require("lspsaga")
 local cmp = require("cmp")
+local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
 
 cmp.setup({
     snippet = {
       expand = function(args)
-        require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+          vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
       end,
     },
     window = {
@@ -17,11 +18,16 @@ cmp.setup({
       ['<C-f>'] = cmp.mapping.scroll_docs(4),
       ['<C-Space>'] = cmp.mapping.complete(),
       ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+      ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+      ["<Tab>"] = cmp.mapping(
+        function(fallback)
+          cmp_ultisnips_mappings.expand_or_jump_forwards(fallback)
+        end
+      ),
     }),
     sources = cmp.config.sources({
       { name = 'nvim_lsp' },
-      { name = 'luasnip' }, -- For luasnip users.
+      { name = 'ultisnips' }, -- For ultisnips users.
     }, {
       { name = 'buffer' },
     })
@@ -136,4 +142,14 @@ lspconfig.ocamllsp.setup {
     capabilities = capabilities,
 }
 
+lspconfig.pylsp.setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+
+lspconfig.sumneko_lua.setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
+
 saga.init_lsp_saga()
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 4858907..904d23b 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -32,17 +32,28 @@ packer.startup(function()
     use("hrsh7th/nvim-cmp")
     use{"glepnir/lspsaga.nvim",branch="main"}
     use("github/copilot.vim")
-    use("L3MON4D3/LuaSnip")
-    
+    use("SirVer/ultisnips")
+    use("quangnguyen30192/cmp-nvim-ultisnips")
+
     -- misc
     use("davidgranstrom/nvim-markdown-preview")
     use("folke/todo-comments.nvim")
+    use("lervag/vimtex")
 
     if packer_bootstrap then
       require('packer').sync()
     end
 end)
 
+-- vimtex
+vim.cmd("let g:vimtex_compiler_progname = 'nvr'")
+require("nvim-treesitter.configs").setup {
+    ignore_install = { "latex" },
+    highlight = {
+        disable = {"latex"},
+    }
+}
+
 -- fidget
 require("fidget").setup {}