AM

ediw8311xht · Nov 15, 2024 · fd5d517 · fd5d517
1 parent 77379ff
commit fd5d517
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/nvim/lua/base.lua b/nvim/lua/base.lua
@@ -13,7 +13,6 @@ local gitsigns          = require('gitsigns')
 local marks             = require('marks')
 local lspstatus         = require('lsp-status')
 local cmp_capabilities  = require('cmp_nvim_lsp').default_capabilities()
--- local texlab            = require('texlab')
 
 -- texlab.setup({})
 -- local luasnip_latex_snips = require('luasnip_latex_snippets')
@@ -128,12 +127,14 @@ cmp.setup({
     ['<C-n>'] = cmp.mapping.select_next_item(),
     ['<C-d>'] = cmp.mapping.scroll_docs(-4),
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-y>'] = cmp.mapping.complete(),
+    ['<C-y>'] = cmp.mapping.confirm( { select = true} ),
+    ['<C-S-y>'] = cmp.mapping.complete(),
     ['<C-e>'] = cmp.mapping.close(),
   },
   sources = cmp.config.sources({
     { name = 'nvim_lsp' },
     { name = 'luasnip' },
+    { name = 'vimtex' },
     -- { name = "latex_symbols" },
     -- { name = "dictionary", keyword_length = 2, },
   }, {
@@ -143,13 +144,13 @@ cmp.setup({
     { name = 'dotenv'},
   })
 })
-cmp.setup.filetype("tex", {
-    enabled = true,
-    sources = {
-      { name = "nvim_lsp"      },
-      { name = "latex_symbols" },
-    },
-})
+-- cmp.setup.filetype("tex", {
+--     enabled = true,
+--     sources = {
+--       { name = "nvim_lsp"      },
+--       { name = "latex_symbols" },
+--     },
+-- })
 
 -- cmp_dictionary.setup({
 --   paths = { "/usr/share/dict/words" },
@@ -300,7 +301,9 @@ lspconfig.pyright.setup({
 lspconfig.ccls.setup({
   filetypes = {"c", "cpp"},
 })
-lspconfig.texlab.setup({})
+-- lspconfig.texlab.setup({
+--   capabilities = cmp_capabilities,
+-- })
 -- lspconfig.sourcekit.setup({})
 -- lspconfig.elixirls.setup{
 --   credo = { enable = false },

diff --git a/nvim/plugins.vim b/nvim/plugins.vim
@@ -8,7 +8,6 @@ let g:my_plugins = {
 \    "cmp luasnip":                 [ 'saadparwaiz1',       'cmp_luasnip'                 ],
 \    "cmp path":                    [ 'hrsh7th',            'cmp-path'                    ],
 \    'cmp plain english':           [ 'uga-rosa',           'cmp-dictionary'              ],
-\    'latex cmp':                   [ 'kdheepak',           'cmp-latex-symbols'           ],
 \    "devicons":                    [ 'nvim-tree',          'nvim-web-devicons'           ],
 \    "elixir":                      [ 'elixir-tools',       'elixir-tools.nvim'           ],
 \    "elixirfiledetect":            [ 'elixir-editors',     'vim-elixir'                  ],
@@ -40,9 +39,11 @@ let g:my_plugins = {
 \    "vimwiki":                     [ 'vimwiki',            'vimwiki'                     ],
 \    'luarocks for nvim':           [ 'theHamsta',          'nvim_rocks',                 {'do': 'pipx install hererocks && python3 -mhererocks . -j2.1.0-beta3 -r3.0.0 && cp nvim_rocks.lua lua'}],
 \    'vim latex':                   [ 'lervag',             'vimtex'                      ],
-\    'latex lsp':                   [ 'latex-lsp',          'texlab'                      ],
+\    'vim latex snips for vimtex':  [ 'micangl',            'cmp-vimtex'                  ],
 \}
+"\    'latex lsp':                   [ 'latex-lsp',          'texlab'                      ],
 "\    'vim latex snippest':          [ 'evesdropper',        'luasnip-latex-snippets.nvim' ],
+"\    'latex cmp':                   [ 'kdheepak',           'cmp-latex-symbols'           ],
 
 "vim closetag":      [ 'alneotermvan',      'vim-closetag'                ],
 "match up":          [ 'andymass',          'vim-matchup'                 ],