From 4a332b71a7282206280761ba3221359759effaa4 Mon Sep 17 00:00:00 2001
From: Amanda Graven <amanda.graven@subaio.com>
Date: Wed, 3 Apr 2024 15:45:26 +0200
Subject: [PATCH] gitlab.nvim, fix autopairs, markdown and dap-ui

---
 init.lua | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/init.lua b/init.lua
index f03ed15..4567482 100644
--- a/init.lua
+++ b/init.lua
@@ -287,7 +287,6 @@ require('lazy').setup({
 	'rhysd/vim-crystal',
 	'bakpakin/fennel.vim',
 	'mboughaba/i3config.vim',
-	'plasticboy/vim-markdown',
 	'mracos/mermaid.vim',
 	'lifepillar/pgsql.vim',
 	'ajouellette/sway-vim-syntax',
@@ -297,6 +296,7 @@ require('lazy').setup({
 	{'LunarWatcher/auto-pairs', init = function()
 		vim.g.AutoPairsMultilineClose = 0
 		vim.g.AutoPairsMapBS = 1
+		vim.g.AutoPairsMapCR = 1
 		vim.g.AutoPairsCompatibleMaps = 1
 		vim.g.AutoPairsShortcutToggleMultilineClose = ''
 	end},
@@ -420,6 +420,7 @@ require('lazy').setup({
 		'hrsh7th/cmp-cmdline',
 		'dcampos/nvim-snippy',
 		'dcampos/cmp-snippy',
+		'LunarWatcher/auto-pairs'
 	}, config = function()
 		local cmp = require'cmp'
 		local cmp_dap = require'cmp_dap'
@@ -879,7 +880,10 @@ require('lazy').setup({
 			}
 		}
 	end},
-	{'rcarriga/nvim-dap-ui', dependencies = {'mfussenegger/nvim-dap'}, config = function()
+	{'rcarriga/nvim-dap-ui', dependencies = {
+		'mfussenegger/nvim-dap',
+		'nvim-neotest/nvim-nio'
+	}, config = function()
 		local dapui, dap = require'dapui', require'dap'
 		dapui.setup()
 		-- Hooks for opening the debugger ui automatically
@@ -893,7 +897,7 @@ require('lazy').setup({
 			dapui.close {}
 		end
 		require'which-key'.register {
-			['<Leader>dd'] = {require'dapui'.toggle, 'Toggle'}
+			['<Leader>dd'] = {dapui.toggle, 'Toggle'}
 		}
 	end},
 	{'theHamsta/nvim-dap-virtual-text', dependencies = {'mfussenegger/nvim-dap'}, opts =  {
@@ -937,6 +941,30 @@ require('lazy').setup({
 		{'<Leader>g', '<Cmd>vert Git<CR>', desc = 'Git status'},
 		{'<Leader>G', '<Cmd>tab Git<CR>', desc = 'Git status (tab)'},
 	}},
+	{'harrisoncramer/gitlab.nvim', dependencies = {
+		'MunifTanjim/nui.nvim',
+		'nvim-lua/plenary.nvim',
+		'sindrets/diffview.nvim',
+	}, build = function()
+		require'gitlab.server'.build(true)
+	end, opts = {
+		discussion_tree = {
+			position = 'bottom',
+		},
+	}, config = function(plugin, opts)
+		local gitlab = require('gitlab')
+		gitlab.setup(opts)
+		require'which-key'.register {
+			['<Leader>a'] = {
+				name = '+gitlab',
+				r = {gitlab.review, 'Review'},
+				s = {gitlab.summary, 'Summary'},
+				A = {gitlab.approve, 'Approve'},
+				x = {gitlab.open_in_browser, 'Open in browser'},
+				c = {gitlab.create_comment, 'Comment'},
+			}
+		}
+	end},
 	{'lewis6991/gitsigns.nvim', opts = {
 		on_attach = function()
 			local gitsigns = require'gitsigns'