Merge branch 'master' of https://github.com/Baipyrus/nvim-config

lua/custom/plugins/fugitive.lua

@@ -0,0 +1,16 @@
+-- Switch in fugitive.vim status window with the current one
+vim.keymap.set('n', '<leader>gs', '<cmd>Gedit :<cr>', { desc = '[G]it [S]tatus' })
+-- Fetch all changes
+vim.keymap.set('n', '<leader>gF', '<cmd>Git fetch<cr>', { desc = '[G]it [F]etch' })
+-- Push changes
+vim.keymap.set('n', '<leader>gP', '<cmd>Git push<cr>', { desc = '[G]it [P]ush' })
+-- Pull changes
+vim.keymap.set('n', '<leader>gp', '<cmd>Git pull<cr>', { desc = '[G]it [P]ull' })
+
+return {
+  -- Git related plugins
+  'tpope/vim-fugitive',
+  dependencies = {
+    'tpope/vim-rhubarb',
+  },
+}

lua/keymaps.lua

@@ -40,9 +40,6 @@ vim.keymap.set('v', '<leader>pny', '"_dP', { desc = '[P]aste [N]o [Y]ank' })
 -- Populate CMD to prepare for change directory
 vim.keymap.set('n', '<leader>cd', ':cd ', { desc = 'Prepare CMD for [C]hange [D]irectory' })
 
--- Switch in fugitive.vim status window with the current one
-vim.keymap.set('n', '<leader>gs', '<cmd>Gedit :<cr>', { desc = '[G]it [S]tatus' })
-
 -- Delete current buffer without closing window
 vim.keymap.set('n', '<leader>bd', '<cmd>bp<bar>sp<bar>bn<bar>bd<cr>', { desc = '[B]uffer [D]elete' })
 -- Switch to between buffers

lua/kickstart/plugins/debug.lua

@@ -1,6 +1,9 @@
 return {
   'mfussenegger/nvim-dap',
   dependencies = {
+    -- Async IO library
+    'nvim-neotest/nvim-nio',
+
     -- Creates a beautiful debugger UI
     'rcarriga/nvim-dap-ui',
 
@@ -16,12 +19,8 @@ return {
     local dapui = require 'dapui'
 
     require('mason-nvim-dap').setup {
-      automatic_setup = false,
+      automatic_setup = true,
       handlers = {},
-      -- Installed language debuggers
-      ensure_installed = {
-        'node-debug2-adapter',
-      },
     }
 
     -- Basic debugging keymaps, feel free to change to your liking!

lua/lazy-plugins.lua

@@ -19,13 +19,19 @@ require('lazy').setup({
   -- Practice games
   'ThePrimeagen/vim-be-good',
 
-  -- Git related plugins
-  'tpope/vim-fugitive',
-  'tpope/vim-rhubarb',
-
   -- Processing-Java
   'sophacles/vim-processing',
 
+  -- Git graph viewer
+  {
+    'rbong/vim-flog',
+    lazy = true,
+    cmd = { 'Flog', 'Flogsplit', 'Floggit' },
+    dependencies = {
+      'tpope/vim-fugitive',
+    },
+  },
+
   -- Markdown preview plugin
   {
     'iamcco/markdown-preview.nvim',