From 06a45b954d58867760025e7fb8a8e1a5ba9ed208 Mon Sep 17 00:00:00 2001
From: amolinae06 <amolinaegames@gmail.com>
Date: Wed, 21 May 2025 00:43:18 -0600
Subject: [PATCH] cleanup

---
 .gitignore                    |  2 ++
 init.lua                      | 53 +----------------------------------
 lazy-lock.json                |  1 +
 lua/config/plugins/snacks.lua | 16 +++++++++++
 lua/plugins/snacks.lua        | 16 ++---------
 lua/plugins/themes.lua        | 14 +++++++++
 lua/plugins/ui.lua            |  8 ------
 7 files changed, 37 insertions(+), 73 deletions(-)
 create mode 100644 lua/config/plugins/snacks.lua
 create mode 100644 lua/plugins/themes.lua

diff --git a/.gitignore b/.gitignore
index 9bbbeea..e0cf46a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .luarc.json
+*.sug
+
diff --git a/init.lua b/init.lua
index 3262ec8..201f6eb 100644
--- a/init.lua
+++ b/init.lua
@@ -2,55 +2,4 @@ require("config.settings")
 require("config.lazy")
 require("config.mappings")
 
-vim.cmd.colorscheme("pywal16")
-
-local tn_colors = require("tokyonight.colors").setup({ style = "storm" })
-local syntax_overrides = {
-  { "Comment", tn_colors.comment, true },
-  { "Constant", tn_colors.orange },
-  { "String", tn_colors.green },
-  { "Character", tn_colors.green },
-  { "Number", tn_colors.orange },
-  { "Boolean", tn_colors.orange },
-  { "Float", tn_colors.orange },
-  { "Identifier", tn_colors.cyan },
-  { "Function", tn_colors.blue, true },
-  { "Statement", tn_colors.magenta },
-  { "Conditional", tn_colors.magenta },
-  { "Repeat", tn_colors.magenta },
-  { "Label", tn_colors.blue },
-  { "Operator", tn_colors.magenta },
-  { "Keyword", tn_colors.magenta },
-  { "Exception", tn_colors.magenta },
-  { "PreProc", tn_colors.blue },
-  { "Include", tn_colors.blue },
-  { "Define", tn_colors.blue },
-  { "Macro", tn_colors.blue },
-  { "Type", tn_colors.yellow },
-  { "StorageClass", tn_colors.yellow },
-  { "Structure", tn_colors.yellow },
-  { "Typedef", tn_colors.yellow },
-  { "Special", tn_colors.red },
-  { "Delimiter", tn_colors.fg },
-  { "SpecialComment", tn_colors.comment },
-  { "Debug", tn_colors.red },
-
-  { "DiagnosticError", tn_colors.error, true },
-  { "DiagnosticWarn", tn_colors.warning, true },
-  { "DiagnosticInfo", tn_colors.blue },
-  { "DiagnosticHint", tn_colors.hint },
-
-  { "DiagnosticUnderlineError", tn_colors.error, false, true },
-  { "DiagnosticUnderlineWarn", tn_colors.warning, false, true },
-  { "DiagnosticUnderlineInfo", tn_colors.blue, false, true },
-  { "DiagnosticUnderlineHint", tn_colors.hint, false, true },
-
-  { "DiagnosticVirtualTextError", tn_colors.error, false, false, nil },
-  { "DiagnosticVirtualTextWarn", tn_colors.warning, false, false, nil },
-  { "DiagnosticVirtualTextInfo", tn_colors.blue, false, false, nil },
-  { "DiagnosticVirtualTextHint", tn_colors.hint, false, false, nil }
-}
-
-for _, group in ipairs(syntax_overrides) do
-    vim.api.nvim_set_hl(0, group[1], { fg = group[2], bold = group[3] or false, italic = group[4] or false, bg = group[5] or nil })
-end
+vim.cmd.colorscheme("tokyonight")
diff --git a/lazy-lock.json b/lazy-lock.json
index 330f166..706a6ce 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -13,6 +13,7 @@
   "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "ce0e87c0be12e7c48296a7513e90430e3eac7f24" },
   "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" },
+  "moonfly": { "branch": "master", "commit": "e356d55cedb24a6c4251d83ce28e0e2010e99d2f" },
   "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" },
   "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
   "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
diff --git a/lua/config/plugins/snacks.lua b/lua/config/plugins/snacks.lua
new file mode 100644
index 0000000..9fcd8c6
--- /dev/null
+++ b/lua/config/plugins/snacks.lua
@@ -0,0 +1,16 @@
+return {
+  bigfile = { enabled = false },
+  dashboard = { enabled = true },
+  explorer = { enabled = false },
+  git = { enabled = true },
+  indent = { enabled = true },
+  input = { enabled = false },
+  notifier = { enabled = false },
+  quickfile = { enabled = false },
+  scope = { enabled = false },
+  scroll = { enabled = false },
+  statuscolumn = { enabled = false },
+  terminal = { enabled = true },
+  toggle = { enabled = true },
+  words = { enabled = false },
+}
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
index 078a8ae..2ce63c9 100644
--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@@ -4,18 +4,8 @@ return {
     priority = 1000,
     lazy = false,
     ---@type snacks.Config
-    opts = {
-      bigfile = { enabled = false },
-      dashboard = { enabled = true },
-      explorer = { enabled = false },
-      indent = { enabled = true },
-      input = { enabled = false },
-      notifier = { enabled = false },
-      quickfile = { enabled = false },
-      scope = { enabled = false },
-      scroll = { enabled = true },
-      statuscolumn = { enabled = false },
-      words = { enabled = false },
-    }
+    opts = function()
+      return require "config.plugins.snacks"
+    end,
   }
 }
diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua
new file mode 100644
index 0000000..d4c0c59
--- /dev/null
+++ b/lua/plugins/themes.lua
@@ -0,0 +1,14 @@
+return {
+  {
+    "amolinae06/pywal16.nvim",
+    opts = {},
+  },
+  {
+    "folke/tokyonight.nvim",
+    opts = {
+      style = "night",
+      transparent = false,
+      terminal_colors = true,
+    }
+  }
+}
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index 782f69b..7974f23 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -1,12 +1,4 @@
 return {
-  {
-    "amolinae06/pywal16.nvim",
-    opts = {},
-  },
-  {
-    "folke/tokyonight.nvim",
-    opts = {}
-  },
   {
     "norcalli/nvim-colorizer.lua",
     opts = { 'css'; 'javascript'; html = {mode = 'foreground';} },