Update config to mason, lsp lines, remove old plugins

2 files changed, 228 insertions, 225 deletions

diff --git a/lua/alpha/dap.lua b/lua/alpha/dap.lua
index 18c792e..78a907d 100644
--- a/lua/alpha/dap.lua
+++ b/lua/alpha/dap.lua
@@ -1,4 +1,4 @@
-local dap, dapui, dap_install, dap_go = require("dap"), require("dapui"), require("dap-install"), require("dap-go")
+local dap, dapui, dap_go = require("dap"), require("dapui"), require("dap-go")
 
 require("nvim-dap-virtual-text").setup()
 
@@ -30,22 +30,24 @@ dap_go.setup()
 
 vim.fn.sign_define("DapBreakpoint", { text = "ß", texthl = "", linehl = "", numhl = "" })
 
-dap_install.config("php", {
-	configurations = {
-		{
-			type = "php",
-			request = "launch",
-			name = "Listen for Xdebug",
-			port = 9003,
-			pathMappings = function()
-				local sail = vim.call("composer#query", "require-dev.laravel/sail")
-				if sail == "" then
-					return { ["/app"] = vim.fn.getcwd() }
-				end
-				return { ["/var/www/html"] = vim.fn.getcwd() }
-			end,
-		},
-	},
+dap.adapters.php = {
+	type = "executable",
+	command = "node",
+	args = { "php-debug-adapter" },
+}
+
+dap.configurations.php({
+	type = "php",
+	request = "launch",
+	name = "Listen for Xdebug",
+	port = 9003,
+	pathMappings = function()
+		local sail = vim.call("composer#query", "require-dev.laravel/sail")
+		if sail == "" then
+			return { ["/app"] = vim.fn.getcwd() }
+		end
+		return { ["/var/www/html"] = vim.fn.getcwd() }
+	end,
 })
 
 -- Events Listeners
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index e927f57..cf44fd3 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -2,212 +2,213 @@ vim.cmd([[packadd packer.nvim]])
 vim.cmd([[autocmd BufWritePost plugins.lua source <afile> | PackerCompile]])
 
 return require("packer").startup(function(use)
-	local local_use = function(first, second, opts)
-		opts = opts or {}
-
-		local plug_path, home
-		if second == nil then
-			plug_path = first
-			home = "adalessa"
-		else
-			plug_path = second
-			home = first
-		end
-
-		if vim.fn.isdirectory(vim.fn.expand("~/plugins/" .. plug_path)) == 1 then
-			opts[1] = "~/plugins/" .. plug_path
-		else
-			opts[1] = string.format("%s/%s", home, plug_path)
-		end
-
-		use(opts)
-	end
-
-	use("wbthomason/packer.nvim")
-	use("lewis6991/impatient.nvim")
-
-	use({
-		"ThePrimeagen/refactoring.nvim",
-		requires = {
-			{ "nvim-lua/plenary.nvim" },
-			{ "nvim-treesitter/nvim-treesitter" },
-		},
-	})
-
-	use({
-		"nvim-treesitter/nvim-treesitter",
-		run = ":TSUpdate",
-		requires = {
-			"nvim-treesitter/playground",
-			"nvim-treesitter/nvim-treesitter-refactor",
-			"nvim-treesitter/nvim-treesitter-textobjects",
-		},
-	})
-
-	-- optional
-	use({ "junegunn/fzf.vim" })
-	use({
-		"junegunn/fzf",
-		run = function()
-			vim.fn["fzf#install"]()
-		end,
-	})
-
-	use({
-		"ThePrimeagen/harpoon",
-		requires = {
-			"nvim-lua/plenary.nvim",
-			"nvim-lua/popup.nvim",
-		},
-	})
-
-	use({
-		"windwp/nvim-projectconfig",
-		config = function()
-			require("nvim-projectconfig").setup()
-		end,
-	})
-
-	-- Completition
-	use({
-		"hrsh7th/nvim-cmp",
-		requires = {
-			"hrsh7th/cmp-buffer",
-			"hrsh7th/cmp-path",
-			"hrsh7th/cmp-nvim-lua",
-			"hrsh7th/cmp-nvim-lsp",
-			"hrsh7th/cmp-cmdline",
-			"hrsh7th/cmp-git",
-			"saadparwaiz1/cmp_luasnip",
-			"onsails/lspkind-nvim",
-			"L3MON4D3/LuaSnip",
-			"windwp/nvim-autopairs",
-		},
-	})
-
-	-- LSP
-	use({
-		"neovim/nvim-lspconfig",
-		"williamboman/nvim-lsp-installer",
-		"hrsh7th/cmp-nvim-lsp-signature-help",
-		"jose-elias-alvarez/null-ls.nvim",
-	})
-
-	use({
-		"nvim-telescope/telescope.nvim",
-		requires = {
-			{ "nvim-lua/plenary.nvim" },
-			{ "nvim-lua/popup.nvim" },
-			{ "nvim-telescope/telescope-fzy-native.nvim" },
-			{ "kyazdani42/nvim-web-devicons" },
-			{ "nvim-telescope/telescope-file-browser.nvim" },
-			{ "nvim-telescope/telescope-dap.nvim" },
-			{ "nvim-telescope/telescope-ui-select.nvim" },
-			{ "nvim-telescope/telescope-fzf-native.nvim", run = "make" },
-		},
-	})
-
-	use({
-		"ThePrimeagen/git-worktree.nvim",
-		config = function()
-			require("git-worktree").setup({})
-		end,
-	})
-
-	use({
-		"norcalli/nvim-colorizer.lua",
-		config = function()
-			require("colorizer").setup({})
-		end,
-	})
-
-	use("feline-nvim/feline.nvim")
-
-	use({
-		"leoluz/nvim-dap-go",
-		requires = {
-			"theHamsta/nvim-dap-virtual-text",
-			"rcarriga/nvim-dap-ui",
-			"mfussenegger/nvim-dap",
-			{ "Pocco81/DAPInstall.nvim", branch = "dev" },
-			"leoluz/nvim-dap-go",
-		},
-	})
-
-	use({ "noahfrederick/vim-composer" })
-
-	use({
-		"folke/trouble.nvim",
-		requires = "kyazdani42/nvim-web-devicons",
-	})
-
-	use("vim-test/vim-test")
-	use({
-		"nvim-neotest/neotest",
-		requires = {
-			"nvim-lua/plenary.nvim",
-			"nvim-treesitter/nvim-treesitter",
-			"antoinemadec/FixCursorHold.nvim",
-			"nvim-neotest/neotest-go",
-			"nvim-neotest/neotest-plenary",
-			"nvim-neotest/neotest-vim-test",
-		},
-	})
-
-	use("rcarriga/nvim-notify")
-
-	use("EdenEast/nightfox.nvim")
-
-	use("Raimondi/delimitMate")
-	use("tpope/vim-surround")
-	use("tpope/vim-dotenv")
-	use("tpope/vim-fugitive")
-	use("tpope/vim-repeat")
-	use("tpope/vim-obsession")
-
-	-- usefull for unix functions
-	use("tpope/vim-eunuch")
-	use("tpope/vim-commentary")
-	use("tpope/vim-tbone")
-	use("tpope/vim-dispatch")
-	use("junegunn/vim-easy-align")
-
-	use("jwalton512/vim-blade")
-
-	use({
-		"lewis6991/gitsigns.nvim",
-		requires = {
-			"nvim-lua/plenary.nvim",
-		},
-	})
-
-	use({
-		"kristijanhusak/vim-dadbod-ui",
-		requires = {
-			"tpope/vim-dadbod",
-			"kristijanhusak/vim-dadbod-completion",
-			"tpope/vim-dotenv",
-		},
-	})
-
-	use({
-		"NTBBloodbath/rest.nvim",
-		requires = { "nvim-lua/plenary.nvim" },
-	})
-
-	use({ "vimwiki/vimwiki", opt = true, cmd = { "VimwikiIndex" } })
-
-	use({ "hkupty/iron.nvim" })
-
-	-- Local plugins can be included
-	local_use("telescope-projectionist.nvim")
-	local_use("telescope-laravel.nvim")
-	local_use("php-code-actions.nvim")
-
-	use("habamax/vim-godot")
-
-	use({
-		"anuvyklack/hydra.nvim",
-		requires = "anuvyklack/keymap-layer.nvim", -- needed only for pink hydras
-	})
+    local local_use = function(first, second, opts)
+        opts = opts or {}
+
+        local plug_path, home
+        if second == nil then
+            plug_path = first
+            home = "adalessa"
+        else
+            plug_path = second
+            home = first
+        end
+
+        if vim.fn.isdirectory(vim.fn.expand("~/plugins/" .. plug_path)) == 1 then
+            opts[1] = "~/plugins/" .. plug_path
+        else
+            opts[1] = string.format("%s/%s", home, plug_path)
+        end
+
+        use(opts)
+    end
+
+    use("wbthomason/packer.nvim")
+    use("lewis6991/impatient.nvim")
+
+    use({
+        "ThePrimeagen/refactoring.nvim",
+        requires = {
+            { "nvim-lua/plenary.nvim" },
+            { "nvim-treesitter/nvim-treesitter" },
+        },
+    })
+
+    use({
+        "nvim-treesitter/nvim-treesitter",
+        run = ":TSUpdate",
+        requires = {
+            "nvim-treesitter/playground",
+            "nvim-treesitter/nvim-treesitter-refactor",
+            "nvim-treesitter/nvim-treesitter-textobjects",
+        },
+    })
+
+    -- optional
+    use({ "junegunn/fzf.vim" })
+    use({
+        "junegunn/fzf",
+        run = function()
+            vim.fn["fzf#install"]()
+        end,
+    })
+
+    use({
+        "ThePrimeagen/harpoon",
+        requires = {
+            "nvim-lua/plenary.nvim",
+            "nvim-lua/popup.nvim",
+        },
+    })
+
+    use({
+        "windwp/nvim-projectconfig",
+        config = function()
+            require("nvim-projectconfig").setup()
+        end,
+    })
+
+    -- Completition
+    use({
+        "hrsh7th/nvim-cmp",
+        requires = {
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-nvim-lua",
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-cmdline",
+            "hrsh7th/cmp-git",
+            "saadparwaiz1/cmp_luasnip",
+            "onsails/lspkind-nvim",
+            "L3MON4D3/LuaSnip",
+            "windwp/nvim-autopairs",
+        },
+    })
+
+    use("https://git.sr.ht/~whynothugo/lsp_lines.nvim")
+
+    -- LSP
+    use({
+        "neovim/nvim-lspconfig",
+        "hrsh7th/cmp-nvim-lsp-signature-help",
+        "jose-elias-alvarez/null-ls.nvim",
+    })
+
+    use({ "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim" })
+
+    use({
+        "nvim-telescope/telescope.nvim",
+        requires = {
+            { "nvim-lua/plenary.nvim" },
+            { "nvim-lua/popup.nvim" },
+            { "nvim-telescope/telescope-fzy-native.nvim" },
+            { "kyazdani42/nvim-web-devicons" },
+            { "nvim-telescope/telescope-file-browser.nvim" },
+            { "nvim-telescope/telescope-dap.nvim" },
+            { "nvim-telescope/telescope-ui-select.nvim" },
+            { "nvim-telescope/telescope-fzf-native.nvim", run = "make" },
+        },
+    })
+
+    use({
+        "ThePrimeagen/git-worktree.nvim",
+        config = function()
+            require("git-worktree").setup({})
+        end,
+    })
+
+    use({
+        "norcalli/nvim-colorizer.lua",
+        config = function()
+            require("colorizer").setup({})
+        end,
+    })
+
+    use("feline-nvim/feline.nvim")
+
+    use({
+        "mfussenegger/nvim-dap",
+        requires = {
+            "theHamsta/nvim-dap-virtual-text",
+            "rcarriga/nvim-dap-ui",
+            "leoluz/nvim-dap-go",
+        },
+    })
+
+    use({ "noahfrederick/vim-composer" })
+
+    use({
+        "folke/trouble.nvim",
+        requires = "kyazdani42/nvim-web-devicons",
+    })
+
+    use("vim-test/vim-test")
+    use({
+        "nvim-neotest/neotest",
+        requires = {
+            "nvim-lua/plenary.nvim",
+            "nvim-treesitter/nvim-treesitter",
+            "antoinemadec/FixCursorHold.nvim",
+            "nvim-neotest/neotest-go",
+            "nvim-neotest/neotest-plenary",
+            "nvim-neotest/neotest-vim-test",
+        },
+    })
+
+    use("rcarriga/nvim-notify")
+
+    use("EdenEast/nightfox.nvim")
+
+    use("Raimondi/delimitMate")
+    use("tpope/vim-surround")
+    use("tpope/vim-dotenv")
+    use("tpope/vim-fugitive")
+    use("tpope/vim-repeat")
+    use("tpope/vim-obsession")
+
+    -- usefull for unix functions
+    use("tpope/vim-eunuch")
+    use("tpope/vim-commentary")
+    use("tpope/vim-tbone")
+    use("tpope/vim-dispatch")
+    use("junegunn/vim-easy-align")
+
+    use("jwalton512/vim-blade")
+
+    use({
+        "lewis6991/gitsigns.nvim",
+        requires = {
+            "nvim-lua/plenary.nvim",
+        },
+    })
+
+    use({
+        "kristijanhusak/vim-dadbod-ui",
+        requires = {
+            "tpope/vim-dadbod",
+            "kristijanhusak/vim-dadbod-completion",
+            "tpope/vim-dotenv",
+        },
+    })
+
+    use({
+        "NTBBloodbath/rest.nvim",
+        requires = { "nvim-lua/plenary.nvim" },
+    })
+
+    use({ "vimwiki/vimwiki", opt = true, cmd = { "VimwikiIndex" } })
+
+    use({ "hkupty/iron.nvim" })
+
+    -- Local plugins can be included
+    local_use("telescope-projectionist.nvim")
+    local_use("telescope-laravel.nvim")
+    local_use("php-code-actions.nvim")
+
+    use("habamax/vim-godot")
+
+    use({
+        "anuvyklack/hydra.nvim",
+        requires = "anuvyklack/keymap-layer.nvim", -- needed only for pink hydras
+    })
 end)