From 8f43f9e5595213db5aadaf89d5d221ed10050a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kmie=C4=87?= <KmcR@viessmann.com>
Date: Wed, 22 Dec 2021 00:08:22 +0100
Subject: [PATCH] Nvim: update cmp and some plugins

---
 .config/nvim/after/plugin/nvim-cmp.rc.vim   | 12 +++++++-----
 .config/nvim/after/plugin/treesitter.rc.vim |  6 ++++++
 .config/nvim/init.vim                       | 12 ++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.config/nvim/after/plugin/nvim-cmp.rc.vim b/.config/nvim/after/plugin/nvim-cmp.rc.vim
index 2294d0f..ee476d2 100644
--- a/.config/nvim/after/plugin/nvim-cmp.rc.vim
+++ b/.config/nvim/after/plugin/nvim-cmp.rc.vim
@@ -34,6 +34,8 @@ cmp.setup({
         { name = 'ultisnips' },
 
         { name = 'calc' },
+
+        { name = 'cmp_git' },
     }, {
         { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 },
     }),
@@ -49,11 +51,11 @@ cmp.setup.cmdline('/', {
 })
 
 cmp.setup.cmdline(':', {
-    sources = cmp.config.sources({
-        { name = 'path' }
-    }, {
-        { name = 'cmdline' }
-    })
+    sources = {
+      { name = 'cmdline' }
+    }
 })
 
+require("cmp_git").setup()
+
 EOF
diff --git a/.config/nvim/after/plugin/treesitter.rc.vim b/.config/nvim/after/plugin/treesitter.rc.vim
index 08d980e..bda8df3 100644
--- a/.config/nvim/after/plugin/treesitter.rc.vim
+++ b/.config/nvim/after/plugin/treesitter.rc.vim
@@ -4,6 +4,9 @@ require'nvim-treesitter.configs'.setup {
   highlight = {
     enable = true,
   },
+  indentation = {
+    enable = true,
+  },
   ensure_installed = {
     "bash",
     "c",
@@ -14,4 +17,7 @@ require'nvim-treesitter.configs'.setup {
     "rust",
   }
 }
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+
 EOF
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index d4ed7e9..5cc6349 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -22,14 +22,17 @@ Plug 'derekwyatt/vim-fswitch'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'vim-test/vim-test'
 Plug 'lukas-reineke/indent-blankline.nvim'
+Plug 'liuchengxu/vista.vim'
 " }}}
 
 " Completion {{{
+Plug 'hrsh7th/nvim-cmp'
 Plug 'hrsh7th/cmp-nvim-lsp'
 Plug 'hrsh7th/cmp-buffer'
 Plug 'hrsh7th/cmp-path'
+Plug 'hrsh7th/cmp-cmdline'
 Plug 'hrsh7th/cmp-calc'
-Plug 'hrsh7th/nvim-cmp'
+Plug 'petertriho/cmp-git'
 Plug 'quangnguyen30192/cmp-nvim-ultisnips'
 " }}}
 
@@ -40,11 +43,11 @@ Plug 'nvim-lua/popup.nvim'
 Plug 'nvim-lua/plenary.nvim'
 "Plug 'nvim-telescope/telescope.nvim'
 "Plug 'fhill2/telescope-ultisnips.nvim'
-Plug 'liuchengxu/vista.vim'
 Plug 'inside/vim-search-pulse'
 Plug 'wellle/targets.vim'
 Plug 'voldikss/vim-floaterm'
 Plug 'kevinhwang91/nvim-hlslens'
+Plug 'camspiers/lens.vim'
 " }}}
 
 " Git integration {{{
@@ -65,7 +68,7 @@ Plug 'chrisbra/csv.vim'
 " }}}
 
 " Other plugins (external tools, etc) {{{
-Plug 'MortenStabenau/matlab-vim'
+"Plug 'MortenStabenau/matlab-vim'
 Plug 'junegunn/goyo.vim'
 Plug 'lukas-reineke/virt-column.nvim'
 Plug 'jez/vim-superman' "vman application
@@ -149,7 +152,8 @@ endif
 set undodir=~/.cache/nvim/undo/
 set undofile
 
-let mapleader = "\\"
+"let mapleader = "\\"
+let mapleader = ' '
 
 inoremap jj <ESC>
 inoremap jk <ESC>