Mejorar y actualizar config de git

git/config

@@ -71,12 +71,14 @@
 [merge]
 	log = true
   tool = nvimerge
+	conflictstyle = diff3
 
 [mergetool "nvimerge"]
-  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
+  cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
 
 [mergetool]
   prompt = false
+	keepBackup = false
 
 [diff]
   colorMoved = default
@@ -86,7 +88,7 @@
 	submodule = log
 
 [difftool "nvimdiff"]
-  cmd = nvim -d $LOCAL $REMOTE
+  cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
   trustexitcode = true
 
 [commit]

git/gitignore

@@ -28,6 +28,7 @@ __pycache__
 ._*
 .Spotlight-V100
 .Trashes
+packer_compiled.lua
 ehthumbs.db
 Thumbs.db
 desktop.ini

nvim/after/ftplugin/lua.lua

@@ -1,4 +0,0 @@
--- lua configs
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4
-vim.opt.tabstop = 4

nvim/after/ftplugin/tex.lua

@@ -1,11 +0,0 @@
-vim.g.tex_flavor = 'latex'
-vim.g.tex_comment_nospell = 1
-vim.wo.conceallevel = 2
-
--- SPELL
-vim.opt_local.spell = true
-vim.bo.spelllang = 'en_us'
-vim.keymap.set('i', '<M-l>', '<C-g>u<Esc>[s1z=`]a<C-g>u', { buffer = true, desc = 'Fix Last Miss-Spelling' })
-
-vim.keymap.set('n', '<M-b>', '<Cmd>TexlabBuild<CR>', { buffer = true, desc = 'Compile LaTeX' })
-vim.keymap.set('n', '<M-v>', '<Cmd>TexlabForward<CR>', { buffer = true, desc = 'View PDF' })

nvim/after/plugin/fugitive.vim

@@ -1,4 +0,0 @@
-augroup Profugo
-  autocmd!
-  autocmd BufReadPost fugitive:///*//2/*,fugitive:///*//3/* setlocal nomodifiable readonly
-augroup END

nvim/lua/configs/gitsigns.lua

@@ -1,32 +1,54 @@
 require("gitsigns").setup({
-	signcolumn = true,
-	current_line_blame_opts = { delay = 2000, virt_text_pos = "right_align" },
-	signs = {
-		add = { hl = "GitSignsAdd", text = "│", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
-		change = { hl = "GitSignsChange", text = "│", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
-		delete = { hl = "GitSignsDelete", text = "┆", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-		topdelete = { hl = "GitSignsDelete", text = "┬", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-		changedelete = {
-			hl = "GitSignsChange",
-			text = "┴",
-			numhl = "GitSignsChangeNr",
-			linehl = "GitSignsChangeLn",
-		},
-	},
-	update_debounce = 200,
-	keymaps = {
-		noremap = true,
-		["n <leader>}g"] = { expr = true, "&diff ? '}c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'" },
-		["n <leader>{g"] = { expr = true, "&diff ? '{c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'" },
-	},
+  signcolumn = true,
+  current_line_blame_opts = { delay = 2000, virt_text_pos = "right_align" },
+  signs = {
+    add = { text = "│" },
+    change = { text = "│" },
+    delete = { text = "┆" },
+    topdelete = { text = "┬" },
+    changedelete = { text = "┴" },
+  },
+  update_debounce = 200,
+  on_attach = function(bufnr)
+    local gs = package.loaded.gitsigns
+
+    local function map(mode, l, r, opts)
+      opts = opts or {}
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
+
+    -- Navigation
+    map('n', '}c', function()
+      if vim.wo.diff then return '}c' end
+      vim.schedule(function() gs.next_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    map('n', '{c', function()
+      if vim.wo.diff then return '{c' end
+      vim.schedule(function() gs.prev_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    -- Actions
+    map({'n', 'v'}, '<leader>gs', ':Gitsigns stage_hunk<CR>')
+    map({'n', 'v'}, '<leader>gr', ':Gitsigns reset_hunk<CR>')
+    map('n', '<leader>gS', gs.stage_buffer)
+    map('n', '<leader>gu', gs.undo_stage_hunk)
+    map('n', '<leader>gr', gs.reset_buffer)
+    map('n', '<leader>gp', gs.preview_hunk)
+    map('n', '<leader>gb', function() gs.blame_line{full=true} end)
+    map('n', '<leader>tb', gs.toggle_current_line_blame)
+    map('n', '<leader>gd', gs.diffthis)
+    map('n', '<leader>gD', function() gs.diffthis('~') end)
+    map('n', '<leader>td', gs.toggle_deleted)
+
+    -- Text object
+    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+  end
 })
-
-vim.g.fugitive_summary_format = "%an\t%s"
-
-vim.keymap.set("n", "<Leader>tt", ":Gitsigns toggle_signs<CR>")
-vim.keymap.set("n", "<Leader>tb", ":Gitsigns toggle_current_line_blame<CR>")
-vim.keymap.set("n", "<Leader>ff", ":G<CR>")
-vim.keymap.set("n", "<Leader>fc", ":GCheckout<CR>")
-vim.keymap.set("n", "<Leader>fd", ":Gvdiffsplit!<CR>")
-vim.keymap.set("n", "<Leader>fh", ":diffget //2<CR>")
-vim.keymap.set("n", "<Leader>fl", ":diffget //3<CR>")
+vim.keymap.set("n", "gh", ":diffget //2<CR>")
+vim.keymap.set("n", "gl", ":diffget //3<CR>")
+vim.keymap.set({ "n", "x" }, "g}", ":diffput<CR>")
+vim.keymap.set({ "n", "x" }, "{g", ":diffget<CR>")

nvim/lua/configs/telescope.lua

@@ -129,7 +129,7 @@ vim.keymap.set("n", "<F12>", "<cmd>Telescope diagnostics bufnr=0<CR>", { desc =
 vim.keymap.set("n", "<leader>P", function()
   builtin.commands()
 end, { desc = "Command Pallete" })
-vim.keymap.set("n", "<leader>fg", function()
+vim.keymap.set("n", "<leader>gg", function()
   builtin.live_grep({ previewer = false })
 end, { desc = "Live Grep" })
 

nvim/lua/plugins.lua

@@ -7,7 +7,9 @@ end
 
 vim.api.nvim_create_augroup("packer_user_config", { clear = true })
 vim.api.nvim_create_autocmd("BufWritePost", {
-  command = "source <afile> | PackerCompile profile=true",
+callback = function()
+vim.cmd("source <afile> | PackerCompile profile=true")
+end,
   pattern = "plugins.lua",
   group = "packer_user_config",
   desc = "Compile whenever plugins.lua is updated",
@@ -64,7 +66,6 @@ return packer.startup(function(use)
       require("configs.gitsigns")
     end,
   })
-  use({ "tpope/vim-fugitive", cmd = { "Git", "Gdiff", "Gblame", "Glog", "Git mergetool" } })
   use({ "neovim/nvim-lspconfig", after = "nvim-treesitter" })
   use("folke/lua-dev.nvim")
   use({ "ray-x/lsp_signature.nvim", after = "nvim-lspconfig" })

nvim/plugin/autocmds.lua

@@ -9,7 +9,9 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 
 vim.api.nvim_create_augroup("init_nvim", { clear = true })
 vim.api.nvim_create_autocmd("BufEnter", {
-  command = "silent! lcd %:p:h",
+  callback = function()
+    vim.cmd("silent! lcd %:p:h")
+  end,
   group = "init_nvim",
   desc = "change the working directory",
 })
@@ -78,7 +80,7 @@ vim.api.nvim_create_autocmd("BufEnter", {
     vim.wo.statusline = "%= %{b:term_title} %="
     vim.wo.number = true
     vim.wo.signcolumn = "no"
-		vim.cmd("startinsert")
+    vim.cmd("startinsert")
   end,
   group = "Terms",
   pattern = "term:\\/\\/*",
@@ -87,7 +89,7 @@ vim.api.nvim_create_autocmd("BufLeave", {
   callback = function()
     vim.wo.number = true
     vim.wo.signcolumn = "auto:9"
-		vim.cmd("stopinsert")
+    vim.cmd("stopinsert")
   end,
   group = "Terms",
   pattern = "term:\\/\\/*",