From 95cb7147ed59aa2cfb04e50ff401ddb8d9d873e8 Mon Sep 17 00:00:00 2001
From: DarkWiiPlayer <darkwiiplayer@hotmail.com>
Date: Thu, 30 Nov 2023 13:21:07 +0100
Subject: [PATCH] Restructure nvim lua files

---
 vim/lua/{on_lsp_attach.lua => lsp/attach.lua} |  0
 vim/lua/lsp/setup.lua                         | 20 +++++++++++++++++++
 vim/lua/{plugins.lua => pack/setup.lua}       |  9 ++++++---
 .../setup/neotree.lua}                        |  0
 vim/plugin/lsp.vim                            |  6 +-----
 vimrc                                         |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)
 rename vim/lua/{on_lsp_attach.lua => lsp/attach.lua} (100%)
 create mode 100644 vim/lua/lsp/setup.lua
 rename vim/lua/{plugins.lua => pack/setup.lua} (87%)
 rename vim/lua/{neo-tree-setup.lua => pack/setup/neotree.lua} (100%)

diff --git a/vim/lua/on_lsp_attach.lua b/vim/lua/lsp/attach.lua
similarity index 100%
rename from vim/lua/on_lsp_attach.lua
rename to vim/lua/lsp/attach.lua
diff --git a/vim/lua/lsp/setup.lua b/vim/lua/lsp/setup.lua
new file mode 100644
index 0000000..9069e00
--- /dev/null
+++ b/vim/lua/lsp/setup.lua
@@ -0,0 +1,20 @@
+local config = require 'lspconfig'
+
+config.lua_ls.setup {
+	on_attach = require 'lsp.attach'
+}
+config.zls.setup {
+	on_attach = require 'lsp.attach'
+}
+config.standardrb.setup {
+	on_attach = require 'lsp.attach'
+}
+config.clangd.setup {
+	on_attach = require 'lsp.attach'
+}
+config.solargraph.setup {
+	on_attach = require 'lsp.attach'
+}
+config.denols.setup {
+	on_attach = require 'lsp.attach'
+}
diff --git a/vim/lua/plugins.lua b/vim/lua/pack/setup.lua
similarity index 87%
rename from vim/lua/plugins.lua
rename to vim/lua/pack/setup.lua
index a431a83..f13ce07 100644
--- a/vim/lua/plugins.lua
+++ b/vim/lua/pack/setup.lua
@@ -1,7 +1,10 @@
 local function use(plugins)
 	return require('packer').startup(function(use)
 		for _, plugin in ipairs(plugins) do
-			use(plugin)
+			local success, message = pcall(use, plugin)
+			if not success then
+				print(message)
+			end
 		end
 	end)
 end
@@ -17,7 +20,7 @@ use {
 			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 			"MunifTanjim/nui.nvim",
 		};
-		config = require 'neo-tree-setup';
+		config = require 'pack.setup.neotree';
 	};
 	{ 'jinh0/eyeliner.nvim', config = function()
 		require('eyeliner').setup {
@@ -30,7 +33,7 @@ use {
 	'pigpigyyy/Yuescript-vim';
 	'vim-scripts/openscad.vim';
 	'ziglang/zig.vim';
-	-- Colour Schemes
+--	Colour Schemes
 	'AlessandroYorba/Alduin';
 	'AlessandroYorba/Sierra';
 	'DarkWiiPlayer/papercolor-theme';
diff --git a/vim/lua/neo-tree-setup.lua b/vim/lua/pack/setup/neotree.lua
similarity index 100%
rename from vim/lua/neo-tree-setup.lua
rename to vim/lua/pack/setup/neotree.lua
diff --git a/vim/plugin/lsp.vim b/vim/plugin/lsp.vim
index cfd0bef..9ae5369 100644
--- a/vim/plugin/lsp.vim
+++ b/vim/plugin/lsp.vim
@@ -1,5 +1 @@
-lua require('lspconfig').lua_ls.setup{ on_attach = require 'on_lsp_attach' }
-lua require('lspconfig').zls.setup{ on_attach = require 'on_lsp_attach' }
-lua require('lspconfig').standardrb.setup{ on_attach = require 'on_lsp_attach' }
-lua require('lspconfig').clangd.setup{ on_attach = require 'on_lsp_attach' }
-lua require('lspconfig').solargraph.setup{ on_attach = require 'on_lsp_attach' }
+lua require 'lsp.setup'
diff --git a/vimrc b/vimrc
index 36863ae..e400684 100644
--- a/vimrc
+++ b/vimrc
@@ -6,7 +6,7 @@ set runtimepath=$VIMRUNTIME,$HOME/.config/nvim,$HOME/.vim
 let &rtp=&rtp.','.expand('<sfile>:p:h').'/vim'
 
 if has("nvim")
-	lua pcall(require, "plugins")
+	lua require("pack/setup")
 end
 
 set nocompatible