From 5d3ed8b12ab5021d75d2cca81df0839ffd217cb3 Mon Sep 17 00:00:00 2001
From: Steven Crawford <steven@shelbybark.com>
Date: Thu, 5 Jun 2025 22:05:05 -0500
Subject: [PATCH] updates

---
 lua/shelbybark/lazy.lua                    | 15 ------
 lua/shelbybark/plugins/alpha.lua           | 14 +++---
 lua/shelbybark/plugins/colorscheme.lua     | 57 +++++++++++-----------
 lua/shelbybark/plugins/{ => lsp}/mason.lua |  0
 4 files changed, 35 insertions(+), 51 deletions(-)
 rename lua/shelbybark/plugins/{ => lsp}/mason.lua (100%)

diff --git a/lua/shelbybark/lazy.lua b/lua/shelbybark/lazy.lua
index ae434e5..7c0c10b 100644
--- a/lua/shelbybark/lazy.lua
+++ b/lua/shelbybark/lazy.lua
@@ -11,21 +11,6 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup("shelbybark.plugins")
-
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
 require("lazy").setup({ { import = "shelbybark.plugins" }, { import = "shelbybark.plugins.lsp" } }, {
   checker = {
     enabled = true,
diff --git a/lua/shelbybark/plugins/alpha.lua b/lua/shelbybark/plugins/alpha.lua
index 17d0484..58dfe99 100644
--- a/lua/shelbybark/plugins/alpha.lua
+++ b/lua/shelbybark/plugins/alpha.lua
@@ -34,13 +34,13 @@ return {
       " ╚════██║██╔══██║██╔══╝  ██║     ██╔══██╗  ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗██╔═██╗ ",
       " ███████║██║  ██║███████╗███████╗██████╔╝   ██║   ██████╔╝██║  ██║██║  ██║██║  ██╗",
       " ╚══════╝╚═╝  ╚═╝╚══════╝╚══════╝╚═════╝    ╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝",
-      "    ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗",
-      "    ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║",
-      "    ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║",    
-      "    ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║",    
-      "    ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║",    
-      "    ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝",    
-      "                                                      ",
+      "     ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗",
+      "     ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║",
+      "     ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║",    
+      "     ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║",    
+      "     ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║",    
+      "     ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝",    
+      "                                                       ",
         }
 
     -- Set menu
diff --git a/lua/shelbybark/plugins/colorscheme.lua b/lua/shelbybark/plugins/colorscheme.lua
index bd32167..aea9124 100644
--- a/lua/shelbybark/plugins/colorscheme.lua
+++ b/lua/shelbybark/plugins/colorscheme.lua
@@ -4,38 +4,18 @@ return {
     name = "catppuccin",
     priority = 1000,
     config = function()
-      require('catppuccin').setup {
+      require('catppuccin').setup ({
         flavour = "mocha", -- latte, frappe, macchiato, mocha
         custom_highlights = function(colors)
-            return {
-                LineNr = { fg = '#838DA0', bg = '#495060', },
-            }
-        end
-      }
+          return {
+            LineNr = { fg = '#838DA0', bg = '#495060' }
+          }
+        end,
+      })
       -- load the colorscheme here
-      -- vim.cmd([[colorscheme catppuccin]])
-      require('catppuccin').load()
-    end
-  }
-  -- {
-  --   "navarasu/onedark.nvim",
-  --   priority = 1000, -- make sure to load this before all the other start plugins
-  --   config = function()
-  --     require('onedark').setup {
-  --       style = 'deep',
-  --       -- Custom Highlights --
-  --       colors = {
-  --         line_bg = "#495060",    -- define a new color
-  --         line_fg = "#838DA0",    -- define a new color
-  --       }, -- Override default colors
-  --       highlights = {
-  --         ["LineNr"] = {fg = '$line_fg', bg = '$line_bg', fmt = 'none'},
-  --       }, -- Override highlight groups
-  --     }
-  --     -- Enable theme
-  --     require('onedark').load()
-  --   end
-  -- }
+      vim.cmd([[colorscheme catppuccin]])
+    end,
+  },
   -- {
   --   "folke/tokyonight.nvim",
   --   priority = 1000, -- make sure to load this before all the other start plugins
@@ -76,4 +56,23 @@ return {
   --     vim.cmd([[colorscheme tokyonight]])
   --   end,
   -- },
+  -- {
+  --   "navarasu/onedark.nvim",
+  --   priority = 1000, -- make sure to load this before all the other start plugins
+  --   config = function()
+  --     require('onedark').setup {
+  --       style = 'deep',
+  --       -- Custom Highlights --
+  --       colors = {
+  --         line_bg = "#495060",    -- define a new color
+  --         line_fg = "#838DA0",    -- define a new color
+  --       }, -- Override default colors
+  --       highlights = {
+  --         ["LineNr"] = {fg = '$line_fg', bg = '$line_bg', fmt = 'none'},
+  --       }, -- Override highlight groups
+  --     }
+  --     -- Enable theme
+  --     require('onedark').load()
+  --   end
+  -- }
 }
diff --git a/lua/shelbybark/plugins/mason.lua b/lua/shelbybark/plugins/lsp/mason.lua
similarity index 100%
rename from lua/shelbybark/plugins/mason.lua
rename to lua/shelbybark/plugins/lsp/mason.lua