From 1dac572aad574e9974ebdbfa86a01f9051d28dbb Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux-stg@nickel.eu>
Date: Tue, 12 Apr 2022 15:48:22 +0200
Subject: [PATCH] Quality of live changes

---
 nvim/nvim/config/nvim.ln/init.lua             |  1 +
 nvim/nvim/config/nvim.ln/lua/dispatch.lua     | 11 +++++----
 nvim/nvim/config/nvim.ln/lua/lsp/cmp.lua      | 24 +++++++++----------
 nvim/nvim/config/nvim.ln/lua/lsp/metals.lua   |  6 +++--
 nvim/nvim/config/nvim.ln/lua/settings.lua     |  6 +++++
 nvim/nvim/config/nvim.ln/lua/windows/tree.lua |  2 ++
 .../config/nvim.ln/lua/windows/which-key.lua  |  2 ++
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/nvim/nvim/config/nvim.ln/init.lua b/nvim/nvim/config/nvim.ln/init.lua
index bf1ab54..57ed170 100644
--- a/nvim/nvim/config/nvim.ln/init.lua
+++ b/nvim/nvim/config/nvim.ln/init.lua
@@ -11,4 +11,5 @@ require "dap-config"
 require "tests"
 require "documentation"
 require "build"
+require "dispatch"
 
diff --git a/nvim/nvim/config/nvim.ln/lua/dispatch.lua b/nvim/nvim/config/nvim.ln/lua/dispatch.lua
index de73f2b..2010dae 100644
--- a/nvim/nvim/config/nvim.ln/lua/dispatch.lua
+++ b/nvim/nvim/config/nvim.ln/lua/dispatch.lua
@@ -4,10 +4,13 @@ vim.g["dispatch_no_maps"] = 1
 
 local wk = require("which-key")
 wk.register({
-	b = { "<cmd>lua require('build').build()<cr>", "Build project" },
-	r = { "<cmd>lua require('build').run()<cr>", "Run project" },
-	s = { "<cmd>lua require('build').select_proj()<cr>", "Select project" },
-	d = { "<cmd>lua require('build').debug()<cr>", "Debug project" },
+	b = {
+		name = "Build",
+		b = { "<cmd>lua require('build').build()<cr>", "Build project" },
+		r = { "<cmd>lua require('build').run()<cr>", "Run project" },
+		s = { "<cmd>lua require('build').select_proj()<cr>", "Select project" },
+		d = { "<cmd>lua require('build').debug()<cr>", "Debug project" },
+	}
 }, {
 	prefix = "<leader>",
 })
diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/cmp.lua b/nvim/nvim/config/nvim.ln/lua/lsp/cmp.lua
index 7468b85..ea2313e 100644
--- a/nvim/nvim/config/nvim.ln/lua/lsp/cmp.lua
+++ b/nvim/nvim/config/nvim.ln/lua/lsp/cmp.lua
@@ -47,17 +47,17 @@ cmp.setup({
 			require('luasnip').lsp_expand(args.body)
 		end,
 	},
-	enabled = function()
-		-- disable completion in comments
-		local context = require 'cmp.config.context'
-		-- keep command mode completion enabled when cursor is in a comment
-		if vim.api.nvim_get_mode().mode == 'c' then
-			return true
-		else
-			return not context.in_treesitter_capture("comment")
-				and not context.in_syntax_group("Comment")
-		end
-	end,
+	-- enabled = function()
+	-- 	-- disable completion in comments
+	-- 	local context = require 'cmp.config.context'
+	-- 	-- keep command mode completion enabled when cursor is in a comment
+	-- 	if vim.api.nvim_get_mode().mode == 'c' then
+	-- 		return true
+	-- 	else
+	-- 		return not context.in_treesitter_capture("comment")
+	-- 			and not context.in_syntax_group("Comment")
+	-- 	end
+	-- end,
 	mapping = {
 		["<Up>"] = cmp.mapping.select_prev_item(),
 		["<Down>"] = cmp.mapping.select_next_item(),
@@ -95,7 +95,7 @@ cmp.setup({
 	sources = {
 		{ name = "nvim_lsp" },
 		{ name = 'luasnip' },
-		{ name = "buffer" },
+		-- { name = "buffer" },
 		{ name = "path" },
 	},
 	formatting = {
diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua b/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua
index 5bfd1cf..10c13ab 100644
--- a/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua
+++ b/nvim/nvim/config/nvim.ln/lua/lsp/metals.lua
@@ -14,11 +14,13 @@ vim.cmd [[
 ]]
 
 metals_config = metals.bare_config()
-
--- Example of settings
 metals_config.settings = {
 	showImplicitArguments = true,
+	showInferredType = true,
+	showImplicitConversionsAndClasses = true,
 }
+-- metals_config.init_options.statusBarProvider = "on"
+
 metals_config.on_attach = function(client, bufnr)
 	metals.setup_dap()
 	require "lsp.handlers".on_attach(client, bufnr)
diff --git a/nvim/nvim/config/nvim.ln/lua/settings.lua b/nvim/nvim/config/nvim.ln/lua/settings.lua
index 3d829e6..fc109bf 100644
--- a/nvim/nvim/config/nvim.ln/lua/settings.lua
+++ b/nvim/nvim/config/nvim.ln/lua/settings.lua
@@ -72,6 +72,12 @@ keymap("x", "<leader>y", '"+y', opts)
 keymap("n", "<leader>Y", '"+Y', opts)
 keymap("x", "<leader>Y", '"+Y', opts)
 
+keymap("n", "<leader>p", '"+p', opts)
+keymap("x", "<leader>p", '"+p', opts)
+keymap("n", "<leader>P", '"+P', opts)
+keymap("x", "<leader>P", '"+P', opts)
+
+
 keymap("t", "<C-W>", "<C-\\><C-N><C-W>", opts)
 
 vim.cmd [[
diff --git a/nvim/nvim/config/nvim.ln/lua/windows/tree.lua b/nvim/nvim/config/nvim.ln/lua/windows/tree.lua
index deafa05..8868633 100644
--- a/nvim/nvim/config/nvim.ln/lua/windows/tree.lua
+++ b/nvim/nvim/config/nvim.ln/lua/windows/tree.lua
@@ -33,6 +33,8 @@ nvim_tree.setup {
 				{ key = "<CR>", action = "edit_in_place" },
 				{ key = "h", action = "close_node" },
 				{ key = "<Left>", action = "close_node" },
+				{ key = "t", action = "tabnew" },
+				{ key = "<C-t>", action = "" },
 			},
 		},
 	},
diff --git a/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua b/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua
index cde46fa..8c0b877 100644
--- a/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua
+++ b/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua
@@ -33,6 +33,8 @@ wk.register({
 wk.register({
 	y = { "Yank to system clipboard" },
 	Y = { "Yank line to system clipboard" },
+	p = { "Past from system clipboard" },
+	P = { "Past line from system clipboard" },
 }, {
 	prefix = "<leader>"
 })