From 161ac02b818e4e1df4b1d611349421b263b11b50 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Fri, 8 Jul 2022 11:31:51 -0700
Subject: [PATCH] cleanup neovim config

---
 .config/nvim/lua/user/gps.lua                 | 34 -------------------
 .config/nvim/lua/user/lsp/init.lua            | 21 ------------
 .config/nvim/lua/user/lsp/installer.lua       | 13 -------
 .config/nvim/lua/user/lsp/mason.lua           |  1 +
 .config/nvim/lua/user/lsp/nlsp.lua            | 12 -------
 .../nvim/lua/user/lsp/settings/jsonls.json    |  1 -
 .config/nvim/lua/user/lsp/settings/jsonls.lua | 18 ++++++++++
 .../lua/user/lsp/settings/sumneko_lua.json    |  3 --
 .../lua/user/lsp/settings/sumneko_lua.lua     |  8 +++--
 .config/nvim/lua/user/lsp/settings/volar.json |  3 --
 10 files changed, 24 insertions(+), 90 deletions(-)
 delete mode 100644 .config/nvim/lua/user/gps.lua
 delete mode 100644 .config/nvim/lua/user/lsp/installer.lua
 delete mode 100644 .config/nvim/lua/user/lsp/nlsp.lua
 delete mode 100644 .config/nvim/lua/user/lsp/settings/jsonls.json
 create mode 100644 .config/nvim/lua/user/lsp/settings/jsonls.lua
 delete mode 100644 .config/nvim/lua/user/lsp/settings/sumneko_lua.json
 delete mode 100644 .config/nvim/lua/user/lsp/settings/volar.json

diff --git a/.config/nvim/lua/user/gps.lua b/.config/nvim/lua/user/gps.lua
deleted file mode 100644
index 98190b2..0000000
--- a/.config/nvim/lua/user/gps.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local status_ok, gps = pcall(require, "nvim-gps")
-if not status_ok then
-	return
-end
-
-gps.setup({
-	disable_icons = false, -- Setting it to true will disable all icons
-	icons = {
-		["class-name"] = " ", -- Classes and class-like objects
-		["function-name"] = " ", -- Functions
-		["method-name"] = " ", -- Methods (functions inside class-like objects)
-		["container-name"] = "⛶ ", -- Containers (example: lua tables)
-		["tag-name"] = "炙 ", -- Tags (example: html tags)
-		["mapping-name"] = " ",
-		["sequence-name"] = " ",
-		["null-name"] = "[] ",
-		["boolean-name"] = "ﰰﰴ ",
-		["integer-name"] = "# ",
-		["float-name"] = " ",
-		["string-name"] = " ",
-		["array-name"] = " ",
-		["object-name"] = " ",
-		["number-name"] = "# ",
-		["table-name"] = " ",
-		["date-name"] = " ",
-		["date-time-name"] = " ",
-		["inline-table-name"] = " ",
-		["time-name"] = " ",
-		["module-name"] = " ",
-	},
-	separator = " > ",
-	depth = 0,
-	depth_limit_indicator = "..",
-})
diff --git a/.config/nvim/lua/user/lsp/init.lua b/.config/nvim/lua/user/lsp/init.lua
index aedcb0f..16fd3d1 100644
--- a/.config/nvim/lua/user/lsp/init.lua
+++ b/.config/nvim/lua/user/lsp/init.lua
@@ -1,24 +1,3 @@
-local status_ok, lspconfig = pcall(require, "lspconfig")
-if not status_ok then
-	return
-end
-
-local schemastore_status_ok, schemastore = pcall(require, "schemastore")
-if not schemastore_status_ok then
-	return
-end
-
-lspconfig.jsonls.setup({
-	on_attach = require("user.lsp.handlers").on_attach,
-	capabilities = require("user.lsp.handlers").capabilities,
-	settings = {
-		json = {
-			schemas = require("schemastore").json.schemas(),
-			validate = { enable = true },
-		},
-	},
-})
-
 require("user.lsp.handlers").setup()
 require("user.lsp.mason")
 require("user.lsp.nullls")
diff --git a/.config/nvim/lua/user/lsp/installer.lua b/.config/nvim/lua/user/lsp/installer.lua
deleted file mode 100644
index 055f935..0000000
--- a/.config/nvim/lua/user/lsp/installer.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
-if not status_ok then
-	return
-end
-
-lsp_installer.on_server_ready(function(server)
-	local opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
-	}
-
-	server:setup(opts)
-end)
diff --git a/.config/nvim/lua/user/lsp/mason.lua b/.config/nvim/lua/user/lsp/mason.lua
index e1d51ef..64c0259 100644
--- a/.config/nvim/lua/user/lsp/mason.lua
+++ b/.config/nvim/lua/user/lsp/mason.lua
@@ -16,3 +16,4 @@ lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_c
 })
 
 require("user.lsp.settings.sumneko_lua")
+require("user.lsp.settings.jsonls")
diff --git a/.config/nvim/lua/user/lsp/nlsp.lua b/.config/nvim/lua/user/lsp/nlsp.lua
deleted file mode 100644
index 78aa50b..0000000
--- a/.config/nvim/lua/user/lsp/nlsp.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local nlsp_status_ok, nlspsettings = pcall(require, "nlspsettings")
-if not nlsp_status_ok then
-	return
-end
-
-nlspsettings.setup({
-	config_home = vim.fn.stdpath("config") .. "/lua/user/lsp/settings",
-	local_settings_dir = ".nlsp-settings",
-	local_settings_root_markers = { ".git" },
-	append_default_schemas = true,
-	loader = "json",
-})
diff --git a/.config/nvim/lua/user/lsp/settings/jsonls.json b/.config/nvim/lua/user/lsp/settings/jsonls.json
deleted file mode 100644
index 0967ef4..0000000
--- a/.config/nvim/lua/user/lsp/settings/jsonls.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/.config/nvim/lua/user/lsp/settings/jsonls.lua b/.config/nvim/lua/user/lsp/settings/jsonls.lua
new file mode 100644
index 0000000..29140f4
--- /dev/null
+++ b/.config/nvim/lua/user/lsp/settings/jsonls.lua
@@ -0,0 +1,18 @@
+local status_ok, lspconfig = pcall(require, "lspconfig")
+if not status_ok then
+	return
+end
+
+local schemastore_status_ok, schemastore = pcall(require, "schemastore")
+if not schemastore_status_ok then
+	return
+end
+
+lspconfig.jsonls.setup({
+	settings = {
+		json = {
+			schemas = schemastore.json.schemas(),
+			validate = { enable = true },
+		},
+	},
+})
diff --git a/.config/nvim/lua/user/lsp/settings/sumneko_lua.json b/.config/nvim/lua/user/lsp/settings/sumneko_lua.json
deleted file mode 100644
index 68be2cb..0000000
--- a/.config/nvim/lua/user/lsp/settings/sumneko_lua.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"Lua.diagnostics.globals": ["vim"]
-}
diff --git a/.config/nvim/lua/user/lsp/settings/sumneko_lua.lua b/.config/nvim/lua/user/lsp/settings/sumneko_lua.lua
index e2547c9..67eccf6 100644
--- a/.config/nvim/lua/user/lsp/settings/sumneko_lua.lua
+++ b/.config/nvim/lua/user/lsp/settings/sumneko_lua.lua
@@ -1,9 +1,11 @@
 local lspconfig = require("lspconfig")
 
 lspconfig.sumneko_lua.setup({
-	Lua = {
-		diagnostics = {
-			globals = { 'vim' },
+	settings = {
+		Lua = {
+			diagnostics = {
+				globals = { "vim" },
+			},
 		},
 	},
 })
diff --git a/.config/nvim/lua/user/lsp/settings/volar.json b/.config/nvim/lua/user/lsp/settings/volar.json
deleted file mode 100644
index dc08669..0000000
--- a/.config/nvim/lua/user/lsp/settings/volar.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"volar.takeOverMode.enabled": true
-}