From f049c4d40b2b146199fcfa83b0a56b7d09a221c3 Mon Sep 17 00:00:00 2001
From: zackartz <zackmyers@lavabit.com>
Date: Wed, 20 Mar 2024 12:50:46 -0400
Subject: [PATCH] 249 current  2024-03-20 12:50:36  24.05.20240319.b06025f  
 6.8.0-zen1                          *

---
 .../vim/config/lua/core/options.lua           | 61 ++++++++++---------
 .../lua/plugins/lsp/mason-lspconfig.lua       | 18 ------
 .../vim/config/lua/plugins/lsp/mason.lua      | 17 ------
 .../vim/config/lua/plugins/lsp/null-ls.lua    | 44 ++++++-------
 4 files changed, 53 insertions(+), 87 deletions(-)
 delete mode 100644 modules/home-manager/vim/config/lua/plugins/lsp/mason-lspconfig.lua
 delete mode 100644 modules/home-manager/vim/config/lua/plugins/lsp/mason.lua

diff --git a/modules/home-manager/vim/config/lua/core/options.lua b/modules/home-manager/vim/config/lua/core/options.lua
index 3face24..fbae403 100644
--- a/modules/home-manager/vim/config/lua/core/options.lua
+++ b/modules/home-manager/vim/config/lua/core/options.lua
@@ -1,33 +1,34 @@
 return {
-  opt = {
-    fileencoding = "utf-8",
-    cmdheight = 0,
-    number = true,
-    relativenumber = true,
-    history = 100,
-    termguicolors = true,
-    filetype = "on",
-    cursorline = true,
-    foldenable = true,
-    foldlevel = 99,
-    foldlevelstart = 99,
-    ignorecase = true,
-    shiftwidth = 2,
-    showtabline = 0,
-    tabstop = 2,
-    expandtab = true,
-    wrap = false,
-    writebackup = false,
-    laststatus = 0,
-    updatetime = 200,
-    fillchars = "eob: ",
-    modeline = false,
-    conceallevel = 2,
-    mouse = "",
-  },
+	opt = {
+		fileencoding = "utf-8",
+		cmdheight = 0,
+		number = true,
+		relativenumber = true,
+		history = 100,
+		termguicolors = true,
+		filetype = "on",
+		cursorline = true,
+		foldenable = true,
+		foldlevel = 99,
+		foldlevelstart = 99,
+		ignorecase = true,
+		shiftwidth = 2,
+		showtabline = 0,
+		tabstop = 2,
+		expandtab = true,
+		wrap = false,
+		writebackup = false,
+		laststatus = 0,
+		updatetime = 200,
+		fillchars = "eob: ",
+		modeline = false,
+		conceallevel = 2,
+		mouse = "",
+		clipboard = "unnamedplus",
+	},
 
-  g = {
-    mapleader = " ",
-    highlighturl_enabled = true,
-  },
+	g = {
+		mapleader = " ",
+		highlighturl_enabled = true,
+	},
 }
diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/mason-lspconfig.lua b/modules/home-manager/vim/config/lua/plugins/lsp/mason-lspconfig.lua
deleted file mode 100644
index 5e6c346..0000000
--- a/modules/home-manager/vim/config/lua/plugins/lsp/mason-lspconfig.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- return {
---   "williamboman/mason-lspconfig.nvim",
---   dependencies = { "neovim/nvim-lspconfig" },
---   event = { "BufReadPost", "BufNewFile" },
---   opts = {
---     handlers = require("lsp.handlers"),
---     ensure_installed = {
---       "rust_analyzer",
---       "tsserver",
---       "lua_ls",
---       "bashls",
---       "cssls",
---       "tailwindcss",
---       "jsonls",
---     },
---   },
--- }
-return {}
diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/mason.lua b/modules/home-manager/vim/config/lua/plugins/lsp/mason.lua
deleted file mode 100644
index 583106e..0000000
--- a/modules/home-manager/vim/config/lua/plugins/lsp/mason.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- local icons = require("utils.icons").icons
---
--- return {
---   "williamboman/mason.nvim",
---   build = ":MasonUpdate",
---   opts = {
---     ui = {
---       border = "rounded",
---       icons = {
---         package_installed = icons.Check,
---         package_pending = icons.Dots,
---         package_uninstalled = icons.Install,
---       },
---     },
---   },
--- }
-return {}
diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua b/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua
index 9cd1002..e91f907 100644
--- a/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua
+++ b/modules/home-manager/vim/config/lua/plugins/lsp/null-ls.lua
@@ -1,25 +1,25 @@
 return {
-  "jose-elias-alvarez/null-ls.nvim",
-  event = { "BufReadPost", "BufNewFile" },
-  config = function()
-    local null_ls = require("null-ls")
+	"jose-elias-alvarez/null-ls.nvim",
+	event = { "BufReadPost", "BufNewFile" },
+	config = function()
+		local null_ls = require("null-ls")
 
-    null_ls.setup({
-      debug = false,
-      sources = {
-        null_ls.builtins.formatting.prettier,
-        null_ls.builtins.formatting.stylua,
-        null_ls.builtins.formatting.rustfmt.with({
-          extra_args = { "--edition=2021" },
-        }),
-        null_ls.builtins.formatting.shfmt.with({
-          filetypes = { "sh", "zsh" },
-          extra_args = { "--indent-type Spaces" },
-        }),
-        null_ls.builtins.formatting.clang_format.with({
-          extra_args = { "-style={IndentWidth: 4, AllowShortFunctionsOnASingleLine: Empty}" },
-        }),
-      },
-    })
-  end,
+		null_ls.setup({
+			debug = false,
+			sources = {
+				null_ls.builtins.formatting.prettierd,
+				null_ls.builtins.formatting.stylua,
+				null_ls.builtins.formatting.rustfmt.with({
+					extra_args = { "--edition=2021" },
+				}),
+				null_ls.builtins.formatting.shfmt.with({
+					filetypes = { "sh", "zsh" },
+					extra_args = { "--indent-type Spaces" },
+				}),
+				null_ls.builtins.formatting.clang_format.with({
+					extra_args = { "-style={IndentWidth: 4, AllowShortFunctionsOnASingleLine: Empty}" },
+				}),
+			},
+		})
+	end,
 }