From fa34b02c8c63754c5246a56eeec95aae25b3f28a Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Wed, 7 Sep 2022 22:26:26 +0200
Subject: [PATCH] update nvim/vim and add fugitive

---
 files/nvim/.config/nvim/lua/mappings.lua      |  7 +++---
 files/nvim/.config/nvim/lua/plugins/init.lua  |  2 ++
 .../.config/nvim/snippets/snippets/latex.json | 24 +++++++++++--------
 files/vim/.vimrc                              |  6 ++++-
 presets/notes.tex                             |  1 +
 presets/presentations.tex                     |  1 +
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/files/nvim/.config/nvim/lua/mappings.lua b/files/nvim/.config/nvim/lua/mappings.lua
index 9e98715..af2e1ca 100644
--- a/files/nvim/.config/nvim/lua/mappings.lua
+++ b/files/nvim/.config/nvim/lua/mappings.lua
@@ -24,9 +24,8 @@ telescope.setup({
   }
 })
 map("n", "<C-f>", "<cmd> Telescope find_files<CR>", default_opts)                   -- Show files
-map("n", "<C-g>", "<cmd> Telescope live_grep<CR>", default_opts)                    -- Grep through current directory
+map("n", "<C-s>", "<cmd> Telescope live_grep<CR>", default_opts)                    -- Grep through current directory
 map("n", "<C-k>", "<cmd> Telescope keymaps<CR>", default_opts)                      -- Show all keys
-map("n", "<C-s>", "<cmd> Telescope current_buffer_fuzzy_find<CR>", default_opts)    -- Grep through current file
 
 -- Telescope + LSP
 map("n", "<leader>la", "<cmd> lua vim.lsp.buf.code_action()<CR>", default_opts)   -- Apply LSP code action
@@ -56,12 +55,12 @@ wk.register({
 
 -- git
 map("n", "<leader>gs", "<cmd> Neogit<CR>", default_opts)
-map("n", "<leader>gb", "<cmd> Gitsigns toggle_current_line_blame<CR>", default_opts)
+map("n", "<leader>gb", "<cmd> Git blame<CR>", default_opts)
 wk.register({
   ["<leader>"] = {
     g = {
       s = { "Status" },
-      b = { "Blame line" },
+      b = { "Blame" },
     }
   }
 })
diff --git a/files/nvim/.config/nvim/lua/plugins/init.lua b/files/nvim/.config/nvim/lua/plugins/init.lua
index 01d6488..0f7fa10 100644
--- a/files/nvim/.config/nvim/lua/plugins/init.lua
+++ b/files/nvim/.config/nvim/lua/plugins/init.lua
@@ -123,6 +123,8 @@ return require('packer').startup(function(use)
     config = function() require('plugins.neogit-conf') end,
   }
 
+  use 'tpope/vim-fugitive'
+
   -- git signs at left side (+ blame line)
   use {
     'lewis6991/gitsigns.nvim',
diff --git a/files/nvim/.config/nvim/snippets/snippets/latex.json b/files/nvim/.config/nvim/snippets/snippets/latex.json
index 2f8cd4f..ce97360 100644
--- a/files/nvim/.config/nvim/snippets/snippets/latex.json
+++ b/files/nvim/.config/nvim/snippets/snippets/latex.json
@@ -41,11 +41,15 @@
       "\\maketitle",
       "\\newpage",
       "\\begin{frame}",
-      "    \\frametitle{Inhaltsübersicht}",
-      "    \\tableofcontents[hideallsubsections]",
+      "  \\frametitle{Inhaltsübersicht}",
+      "  \\tableofcontents[hideallsubsections]",
       "\\end{frame}",
       "\\newpage",
       "",
+      "\\section{$3}",
+      "\\begin{frame}",
+      "\\end{frame}",
+      "",
       "\\end{document}"
     ],
     "description": "Preset to create new presentation"
@@ -54,10 +58,10 @@
     "prefix": "wrapfigure",
     "body": [
       "\\begin{wrapfigure}{${1:l or r}}{0.4\\textwidth}",
-      "    \\centering",
-      "    \\includegraphics[width=0.2\\textwidth]{figures/$2}",
-      "    \\caption{$3}",
-      "    \\label{fig:$4}",
+      "\t\\centering",
+      "\t\\includegraphics[width=0.2\\textwidth]{figures/$2}",
+      "\t\\caption{$3}",
+      "\t\\label{fig:$4}",
       "\\end{wrapfigure}"
     ],
     "description": "Wrap figure in text context"
@@ -96,10 +100,10 @@
     "prefix": "columns",
     "body": [
       "\\begin{columns}",
-      "    \\begin{column}{0.5\\textwidth}",
-      "    \\end{column}",
-      "    \\begin{column}{0.5\\textwidth}",
-      "    \\end{column}",
+      "\t\\begin{column}{0.5\\textwidth}",
+      "\t\\end{column}",
+      "\t\\begin{column}{0.5\\textwidth}",
+      "\t\\end{column}",
       "\\end{columns}"
     ],
     "description": "Create columns env in a slide"
diff --git a/files/vim/.vimrc b/files/vim/.vimrc
index 7196650..e9d64ad 100644
--- a/files/vim/.vimrc
+++ b/files/vim/.vimrc
@@ -16,7 +16,7 @@ call plug#begin()
 Plug 'tpope/vim-sleuth'                 " heuristic file indendation
 Plug 'jiangmiao/auto-pairs'             " pair completion
 Plug 'ctrlpvim/ctrlp.vim'               " file finder
-Plug 'djoshea/vim-autoread'             " auto reload file, when changed on disk
+Plug 'tpope/vim-fugitive'               " git wrapper
 
 Plug 'sainnhe/everforest'               " color scheme
 Plug 'vim-airline/vim-airline'          " a nicer status line
@@ -94,3 +94,7 @@ let g:netrw_banner = 0    " Remove useless banner at the top of netrw
 map <C-f> :CtrlP<CR>
 " C-/ to hide search results
 map <C-_> :noh<CR>
+" git
+map <leader>gs :Git status<CR>
+map <leader>gb :Git blame<CR>
+map <C-s> :Git grep 
diff --git a/presets/notes.tex b/presets/notes.tex
index ea7e94f..68787aa 100644
--- a/presets/notes.tex
+++ b/presets/notes.tex
@@ -33,6 +33,7 @@
 
 %%% define own enumeration styles
 % use custom labels with `\begin{enumerate}[label=$\bullet$]`
+% \arabic*) or \roman*)
 \usepackage{enumerate}
 \usepackage{enumitem}
 \setlist{nosep}
diff --git a/presets/presentations.tex b/presets/presentations.tex
index 17c701d..5b11f1f 100644
--- a/presets/presentations.tex
+++ b/presets/presentations.tex
@@ -26,6 +26,7 @@
 
 %%% define own enumeration styles
 % use custom labels with `\begin{enumerate}[label=$\bullet$]`
+% \arabic*) or \roman*)
 \usepackage{enumerate}
 \usepackage{enumitem}
 \setlist{nosep}