From 853f28ab0f0fd0d4c07f6fbe38c6abfca41cfd86 Mon Sep 17 00:00:00 2001
From: Mauro Locatelli <3275600+crivotz@users.noreply.github.com>
Date: Thu, 7 Nov 2024 11:24:49 +0100
Subject: [PATCH] Movede clorschemes, added snacks, split in modules

---
 lazy-lock.json                                |  31 +++--
 lua/config/colorschemes/cyberdream.lua        |   8 --
 lua/config/colorschemes/gruvbox_material.lua  |  35 ------
 lua/config/colorschemes/kanagawa.lua          |  25 ----
 lua/config/colorschemes/monokai_pro.lua       |  46 -------
 lua/config/colorschemes/rosepine.lua          |   4 -
 lua/config/colorschemes/tokyonight.lua        |  35 ------
 lua/config/lazy.lua                           |   1 +
 lua/config/mappings.lua                       |   3 -
 lua/plugins/colorschemes/ayu.lua              |  10 ++
 lua/plugins/colorschemes/cyberdream.lua       |  17 +++
 lua/plugins/colorschemes/github.lua           |  10 ++
 lua/plugins/colorschemes/gruvbox_material.lua |  44 +++++++
 lua/plugins/colorschemes/kanagawa.lua         |  34 +++++
 lua/plugins/colorschemes/monokai_pro.lua      |  54 ++++++++
 lua/plugins/colorschemes/okcolors.lua         |  11 ++
 lua/plugins/colorschemes/onedarkpro.lua       |  10 ++
 lua/plugins/colorschemes/rosepine.lua         |  13 ++
 lua/plugins/colorschemes/tokyonight.lua       |  44 +++++++
 lua/plugins/copilotchat.lua                   |  48 +++++++
 lua/plugins/init.lua                          | 119 ++----------------
 lua/plugins/nvim-lspconfig.lua                |   2 +-
 lua/plugins/nvim-ufo.lua                      |   1 +
 lua/plugins/snacks.lua                        |  52 ++++++++
 lua/plugins/toggleterm.lua                    |   1 +
 25 files changed, 375 insertions(+), 283 deletions(-)
 delete mode 100644 lua/config/colorschemes/cyberdream.lua
 delete mode 100644 lua/config/colorschemes/gruvbox_material.lua
 delete mode 100644 lua/config/colorschemes/kanagawa.lua
 delete mode 100644 lua/config/colorschemes/monokai_pro.lua
 delete mode 100644 lua/config/colorschemes/rosepine.lua
 delete mode 100644 lua/config/colorschemes/tokyonight.lua
 create mode 100644 lua/plugins/colorschemes/ayu.lua
 create mode 100644 lua/plugins/colorschemes/cyberdream.lua
 create mode 100644 lua/plugins/colorschemes/github.lua
 create mode 100644 lua/plugins/colorschemes/gruvbox_material.lua
 create mode 100644 lua/plugins/colorschemes/kanagawa.lua
 create mode 100644 lua/plugins/colorschemes/monokai_pro.lua
 create mode 100644 lua/plugins/colorschemes/okcolors.lua
 create mode 100644 lua/plugins/colorschemes/onedarkpro.lua
 create mode 100644 lua/plugins/colorschemes/rosepine.lua
 create mode 100644 lua/plugins/colorschemes/tokyonight.lua
 create mode 100644 lua/plugins/copilotchat.lua
 create mode 100644 lua/plugins/snacks.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index b3a7432..5211440 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,10 +1,8 @@
 {
-  "CopilotChat.nvim": { "branch": "canary", "commit": "12ac3974daea98cd41e7d483bdb11cc8b6305623" },
+  "CopilotChat.nvim": { "branch": "canary", "commit": "18d51754e9dc87d6b85f1e331c1fca0825384517" },
   "SmoothCursor.nvim": { "branch": "main", "commit": "12518b284e1e3f7c6c703b346815968e1620bee2" },
   "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
   "arrow.nvim": { "branch": "master", "commit": "5438c977e729a29d96bd54c8da3103154e80dbd1" },
-  "blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" },
-  "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -16,14 +14,15 @@
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
   "csv.vim": { "branch": "master", "commit": "bddfcbadd788ab11eb3dbba4550a38a412fe3705" },
+  "cyberdream.nvim": { "branch": "main", "commit": "7e6feb49d2ec47a742215754ec0ecc51eebba55a" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "c334ac73e031f0dc93d6d91f3658ee75b8be1d3b" },
+  "dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
   "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "formatter.nvim": { "branch": "master", "commit": "db71fdb31cee8ae33573b5cf1910e477360678b2" },
+  "formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
   "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
-  "grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" },
+  "grug-far.nvim": { "branch": "main", "commit": "26415d3cc2fef99ccefa019cbc3969f404a83e70" },
   "hardtime.nvim": { "branch": "main", "commit": "027d6f991927a71bd510a7673ae5bb404ca2a1c7" },
   "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
   "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" },
@@ -32,16 +31,16 @@
   "marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "noice.nvim": { "branch": "main", "commit": "5a78b42bec5e775f2db03bf93f6d1e0f3636306c" },
+  "noice.nvim": { "branch": "main", "commit": "73d38cc939db6553b87e5f72ff732447046bced1" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-dap": { "branch": "master", "commit": "8517126e9323e346f6a99b3b594c5a940b914dcd" },
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "e967e2ba13fd4ca731b41d0e5cc1ac2edcd6e25e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "52302604e3c667cfdf33aadf89088e96eb3c5da3" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-neoclip.lua": { "branch": "main", "commit": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
@@ -49,18 +48,17 @@
   "nvim-rip-substitute": { "branch": "main", "commit": "a75086a7ba884b54a724b1942821140677739329" },
   "nvim-spider": { "branch": "main", "commit": "b1c542a78522d59432a827f6ec2b28f9422c7e7f" },
   "nvim-toggleterm.lua": { "branch": "main", "commit": "5969229c0352ff1ed7f6e24aba9c6554e1842939" },
-  "nvim-treesitter": { "branch": "master", "commit": "dfd3207ed43a0c572c13acc02bf9d7dc270f4030" },
+  "nvim-treesitter": { "branch": "master", "commit": "0722f23886d7de2c702ca54a72d94d6171715cb7" },
   "nvim-ufo": { "branch": "main", "commit": "522d719d421fc42b95577d9624048d8348d326ea" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "oil-vcs-status": { "branch": "main", "commit": "729f65d5ac6f115df0b54ffd24a4f3f0e8834a47" },
   "oil.nvim": { "branch": "master", "commit": "52cc8a1fb35ea6ce1df536143add7ce7215c63c0" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" },
-  "statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" },
+  "snacks.nvim": { "branch": "main", "commit": "e8ea0910e0fdb020da06664ed9f5250e5d8fc43c" },
   "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" },
   "telescope-repo.nvim": { "branch": "master", "commit": "89b0c19b9f962d017bf466625d5056214efb1be9" },
@@ -68,8 +66,7 @@
   "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
   "tfm.nvim": { "branch": "main", "commit": "fb0de2c96bf303216ac5d91ce9bdb7f430030f8b" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "tokyonight.nvim": { "branch": "main", "commit": "52d67cc5d18c30f618897134620c64a11208fcae" },
-  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
+  "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
   "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
   "vim-bufsurf": { "branch": "master", "commit": "e6dbc7ad66c7e436e5eb20d304464e378bd7f28c" },
@@ -89,7 +86,7 @@
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" },
   "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
+  "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" },
   "zinit-vim-syntax": { "branch": "main", "commit": "109eea5ff87dc046b2bc9f5e9a765941936f30e0" }
 }
diff --git a/lua/config/colorschemes/cyberdream.lua b/lua/config/colorschemes/cyberdream.lua
deleted file mode 100644
index 4ffb86e..0000000
--- a/lua/config/colorschemes/cyberdream.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-require("cyberdream").setup({
-  transparent = true,
-  italic_comments = true,
-  -- hide_fillchars = true,
-  borderless_telescope = false,
-  terminal_colors = true,
-})
-vim.cmd("colorscheme cyberdream")
diff --git a/lua/config/colorschemes/gruvbox_material.lua b/lua/config/colorschemes/gruvbox_material.lua
deleted file mode 100644
index a419e50..0000000
--- a/lua/config/colorschemes/gruvbox_material.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-vim.g.gruvbox_material_background = "medium" -- hard, soft, medium
-vim.g.gruvbox_material_foreground = "material" -- original, mix, material
-vim.g.gruvbox_material_enable_italic = 1
-vim.g.gruvbox_material_sign_column_background = 'none'
-
-grpid = vim.api.nvim_create_augroup('custom_highlights_gruvboxmaterial', {})
-vim.api.nvim_create_autocmd('ColorScheme', {
-  group = grpid,
-  pattern = 'gruvbox-material',
-  command =
-  'hi NvimTreeNormal                     guibg=#181818 |' ..
-  'hi NvimTreeEndOfBuffer                guibg=#181818 |' ..
-  'hi NoiceCmdlinePopupBorderCmdline     guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePromptBorder              guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePromptNormal              guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePromptTitle               guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePromptPrefix              guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePromptCounter             guifg=#ea6962 guibg=#282828 |' ..
-  'hi TelescopePreviewTitle              guifg=#89b482 guibg=#282828 |' ..
-  'hi TelescopePreviewBorder             guifg=#89b482 guibg=#282828 |' ..
-  'hi TelescopeResultsTitle              guifg=#89b482 guibg=#282828 |' ..
-  'hi TelescopeResultsBorder             guifg=#89b482 guibg=#282828 |' ..
-  'hi TelescopeMatching                  guifg=#d8a657 guibg=#282828 |' ..
-  'hi TelescopeSelection                 guifg=#ffffff guibg=#32302f |' ..
-  'hi FloatBorder                        guifg=#ea6962 guibg=#282828 |' ..
-  'hi BqfPreviewBorder                   guifg=#ea6962 guibg=#282828 |' ..
-  'hi NormalFloat                        guibg=#282828 |' ..
-  'hi IndentBlanklineContextChar         guifg=#d3869b |' ..
-  'hi StatusColumnBorder                 guifg=#232323 |' ..
-  'hi StatusColumnBuffer                 guibg=#282828 |' ..
-  'hi CursorLineNr                       guifg=#d8a657 |' ..
-  'hi CodewindowBorder                   guifg=#ea6962 |' ..
-  'hi TabLine                            guibg=#282828 |'
-})
-vim.cmd'colorscheme gruvbox-material'
diff --git a/lua/config/colorschemes/kanagawa.lua b/lua/config/colorschemes/kanagawa.lua
deleted file mode 100644
index 1a6cd69..0000000
--- a/lua/config/colorschemes/kanagawa.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-require('kanagawa').setup({
-    compile = false,             -- enable compiling the colorscheme
-    undercurl = true,            -- enable undercurls
-    commentStyle = { italic = true },
-    functionStyle = {},
-    keywordStyle = { italic = true},
-    statementStyle = { bold = true },
-    typeStyle = {},
-    transparent = false,         -- do not set background color
-    dimInactive = false,         -- dim inactive window `:h hl-NormalNC`
-    terminalColors = true,       -- define vim.g.terminal_color_{0,17}
-    colors = {                   -- add/modify theme and palette colors
-        palette = {},
-        theme = { wave = {}, lotus = {}, dragon = {}, all = {} },
-    },
-    overrides = function(colors) -- add/modify highlights
-        return {}
-    end,
-  theme = "wave",              -- Load "wave" theme when 'background' option is not set
-  background = {               -- map the value of 'background' option to a theme
-    dark = "wave",           -- try "dragon" !
-    light = "lotus"
-  },
-})
-vim.cmd [[colorscheme kanagawa]]
diff --git a/lua/config/colorschemes/monokai_pro.lua b/lua/config/colorschemes/monokai_pro.lua
deleted file mode 100644
index 1dc1caa..0000000
--- a/lua/config/colorschemes/monokai_pro.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-require("monokai-pro").setup({
-  transparent_background = false,
-  terminal_colors = true,
-  devicons = true, -- highlight the icons of `nvim-web-devicons`
-  styles = {
-    comment = { italic = true },
-    keyword = { italic = true }, -- any other keyword
-    type = { italic = true }, -- (preferred) int, long, char, etc
-    storageclass = { italic = true }, -- static, register, volatile, etc
-    structure = { italic = true }, -- struct, union, enum, etc
-    parameter = { italic = true }, -- parameter pass in function
-    annotation = { italic = true },
-    tag_attribute = { italic = true }, -- attribute of tag in reactjs
-  },
-  filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
-  -- Enable this will disable filter option
-  day_night = {
-    enable = false, -- turn off by default
-    day_filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
-    night_filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum
-  },
-  inc_search = "background", -- underline | background
-  background_clear = {
-    "float_win",
-    -- "toggleterm",
-    "telescope",
-    "which-key",
-    "renamer",
-    "notify",
-    -- "nvim-tree",
-    "neo-tree",
-    -- "bufferline", -- better used if background of `neo-tree` or `nvim-tree` is cleared
-  },-- "float_win", "toggleterm", "telescope", "which-key", "renamer", "neo-tree", "nvim-tree", "bufferline"
-  plugins = {
-    bufferline = {
-      underline_selected = false,
-      underline_visible = false,
-    },
-    indent_blankline = {
-      context_highlight = "default", -- default | pro
-      context_start_underline = false,
-    },
-  },
-})
-
-vim.cmd [[colorscheme monokai-pro]]
diff --git a/lua/config/colorschemes/rosepine.lua b/lua/config/colorschemes/rosepine.lua
deleted file mode 100644
index 2626126..0000000
--- a/lua/config/colorschemes/rosepine.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("rose-pine").setup({
-  variant = "moon",
-})
-vim.cmd("colorscheme rose-pine")
diff --git a/lua/config/colorschemes/tokyonight.lua b/lua/config/colorschemes/tokyonight.lua
deleted file mode 100644
index 13dd962..0000000
--- a/lua/config/colorschemes/tokyonight.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-require("tokyonight").setup({
-  -- your configuration comes here
-  -- or leave it empty to use the default settings
-  style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
-  transparent = false, -- Enable this to disable setting the background color
-  terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim
-  styles = {
-    -- Style to be applied to different syntax groups
-    -- Value is any valid attr-list value for `:help nvim_set_hl`
-    comments = { italic = true },
-    keywords = { italic = true },
-    functions = {},
-    variables = {},
-    -- Background styles. Can be "dark", "transparent" or "normal"
-    sidebars = "dark", -- style for sidebars, see below
-    floats = "dark", -- style for floating windows
-  },
-  sidebars = { "qf", "help", "nvimtree" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
-  day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
-  hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
-  dim_inactive = false, -- dims inactive windows
-  lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
-
-  --- You can override specific color groups to use other groups or a hex color
-  --- function will be called with a ColorScheme table
-  ---@param colors ColorScheme
-  on_colors = function(colors) end,
-
-  --- You can override specific highlights to use other groups or a hex color
-  --- function will be called with a Highlights and ColorScheme table
-  ---@param highlights Highlights
-  ---@param colors ColorScheme
-  on_highlights = function(highlights, colors) end,
-})
-vim.cmd [[colorscheme tokyonight]]
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 8ad1d7e..769cb89 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -10,6 +10,7 @@ vim.g.maplocalleader = "\\\\"
 
 require("lazy").setup({
   spec = {
+    { import = "plugins.colorschemes.tokyonight" },
     { import = "plugins" },
   },
   defaults = {
diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua
index 29807f6..4c95d5c 100644
--- a/lua/config/mappings.lua
+++ b/lua/config/mappings.lua
@@ -5,9 +5,6 @@ vim.keymap.set('n', '<F4>', ':set list! list?<CR>', {noremap = false, silent = t
 vim.keymap.set('n', '<F8>', ':ZenMode<CR>', {noremap = false, silent = true})
 vim.keymap.set('n', '<leader>nm', ':Dispatch npm start<CR>', {noremap = false, silent = true})
 -- Buffers
-vim.keymap.set('n', '<leader>bd', ':BDelete this<CR>', {noremap = false, silent = true})
-vim.keymap.set('n', '<leader>bda', ':BDelete! all<CR>', {noremap = false, silent = true})
-vim.keymap.set('n', '<leader>bdh', ':BDelete! hidden<CR>', {noremap = false, silent = true})
 vim.keymap.set('n', '<leader>bn', ':BufSurfForward<CR>', {noremap = false, silent = true})
 vim.keymap.set('n', '<leader>bp', ':BufSurfBack<CR>', {noremap = false, silent = true})
 vim.keymap.set('n', '<leader>bl', ':BufSurfList<CR>', {noremap = false, silent = true})
diff --git a/lua/plugins/colorschemes/ayu.lua b/lua/plugins/colorschemes/ayu.lua
new file mode 100644
index 0000000..6b11c5d
--- /dev/null
+++ b/lua/plugins/colorschemes/ayu.lua
@@ -0,0 +1,10 @@
+return {
+  {
+    "Shatur/neovim-ayu",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd [[colorscheme ayu-dark]]
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/cyberdream.lua b/lua/plugins/colorschemes/cyberdream.lua
new file mode 100644
index 0000000..02d2402
--- /dev/null
+++ b/lua/plugins/colorschemes/cyberdream.lua
@@ -0,0 +1,17 @@
+return {
+  {
+    "scottmckendry/cyberdream.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require("cyberdream").setup({
+        transparent = true,
+        italic_comments = true,
+        -- hide_fillchars = true,
+        borderless_telescope = false,
+        terminal_colors = true,
+      })
+      vim.cmd("colorscheme cyberdream")
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/github.lua b/lua/plugins/colorschemes/github.lua
new file mode 100644
index 0000000..4e4baa3
--- /dev/null
+++ b/lua/plugins/colorschemes/github.lua
@@ -0,0 +1,10 @@
+return {
+  {
+    "projekt0n/github-nvim-theme",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd [[colorscheme github_dark_dimmed]]
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/gruvbox_material.lua b/lua/plugins/colorschemes/gruvbox_material.lua
new file mode 100644
index 0000000..48bebc2
--- /dev/null
+++ b/lua/plugins/colorschemes/gruvbox_material.lua
@@ -0,0 +1,44 @@
+return {
+  {
+    "sainnhe/gruvbox-material",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.g.gruvbox_material_background = "medium" -- hard, soft, medium
+      vim.g.gruvbox_material_foreground = "material" -- original, mix, material
+      vim.g.gruvbox_material_enable_italic = 1
+      vim.g.gruvbox_material_sign_column_background = 'none'
+
+      grpid = vim.api.nvim_create_augroup('custom_highlights_gruvboxmaterial', {})
+      vim.api.nvim_create_autocmd('ColorScheme', {
+        group = grpid,
+        pattern = 'gruvbox-material',
+        command =
+          'hi NvimTreeNormal                     guibg=#181818 |' ..
+          'hi NvimTreeEndOfBuffer                guibg=#181818 |' ..
+          'hi NoiceCmdlinePopupBorderCmdline     guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePromptBorder              guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePromptNormal              guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePromptTitle               guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePromptPrefix              guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePromptCounter             guifg=#ea6962 guibg=#282828 |' ..
+          'hi TelescopePreviewTitle              guifg=#89b482 guibg=#282828 |' ..
+          'hi TelescopePreviewBorder             guifg=#89b482 guibg=#282828 |' ..
+          'hi TelescopeResultsTitle              guifg=#89b482 guibg=#282828 |' ..
+          'hi TelescopeResultsBorder             guifg=#89b482 guibg=#282828 |' ..
+          'hi TelescopeMatching                  guifg=#d8a657 guibg=#282828 |' ..
+          'hi TelescopeSelection                 guifg=#ffffff guibg=#32302f |' ..
+          'hi FloatBorder                        guifg=#ea6962 guibg=#282828 |' ..
+          'hi BqfPreviewBorder                   guifg=#ea6962 guibg=#282828 |' ..
+          'hi NormalFloat                        guibg=#282828 |' ..
+          'hi IndentBlanklineContextChar         guifg=#d3869b |' ..
+          'hi StatusColumnBorder                 guifg=#232323 |' ..
+          'hi StatusColumnBuffer                 guibg=#282828 |' ..
+          'hi CursorLineNr                       guifg=#d8a657 |' ..
+          'hi CodewindowBorder                   guifg=#ea6962 |' ..
+          'hi TabLine                            guibg=#282828 |'
+      })
+      vim.cmd'colorscheme gruvbox-material'
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/kanagawa.lua b/lua/plugins/colorschemes/kanagawa.lua
new file mode 100644
index 0000000..9ff2fc2
--- /dev/null
+++ b/lua/plugins/colorschemes/kanagawa.lua
@@ -0,0 +1,34 @@
+return {
+  {
+    "rebelot/kanagawa.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require('kanagawa').setup({
+        compile = false,             -- enable compiling the colorscheme
+        undercurl = true,            -- enable undercurls
+        commentStyle = { italic = true },
+        functionStyle = {},
+        keywordStyle = { italic = true},
+        statementStyle = { bold = true },
+        typeStyle = {},
+        transparent = false,         -- do not set background color
+        dimInactive = false,         -- dim inactive window `:h hl-NormalNC`
+        terminalColors = true,       -- define vim.g.terminal_color_{0,17}
+        colors = {                   -- add/modify theme and palette colors
+          palette = {},
+          theme = { wave = {}, lotus = {}, dragon = {}, all = {} },
+        },
+        overrides = function(colors) -- add/modify highlights
+          return {}
+        end,
+        theme = "wave",              -- Load "wave" theme when 'background' option is not set
+        background = {               -- map the value of 'background' option to a theme
+          dark = "wave",           -- try "dragon" !
+          light = "lotus"
+        },
+      })
+      vim.cmd [[colorscheme kanagawa]]
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/monokai_pro.lua b/lua/plugins/colorschemes/monokai_pro.lua
new file mode 100644
index 0000000..0fd324d
--- /dev/null
+++ b/lua/plugins/colorschemes/monokai_pro.lua
@@ -0,0 +1,54 @@
+return {
+  {
+    "loctvl842/monokai-pro.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require("monokai-pro").setup({
+        transparent_background = false,
+        terminal_colors = true,
+        devicons = true, -- highlight the icons of `nvim-web-devicons`
+        styles = {
+          comment = { italic = true },
+          keyword = { italic = true }, -- any other keyword
+          type = { italic = true }, -- (preferred) int, long, char, etc
+          storageclass = { italic = true }, -- static, register, volatile, etc
+          structure = { italic = true }, -- struct, union, enum, etc
+          parameter = { italic = true }, -- parameter pass in function
+          annotation = { italic = true },
+          tag_attribute = { italic = true }, -- attribute of tag in reactjs
+        },
+        filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
+        -- Enable this will disable filter option
+        day_night = {
+          enable = false, -- turn off by default
+          day_filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
+          night_filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum
+        },
+        inc_search = "background", -- underline | background
+        background_clear = {
+          "float_win",
+          -- "toggleterm",
+          "telescope",
+          "which-key",
+          "renamer",
+          "notify",
+          -- "nvim-tree",
+          "neo-tree",
+          -- "bufferline", -- better used if background of `neo-tree` or `nvim-tree` is cleared
+        },-- "float_win", "toggleterm", "telescope", "which-key", "renamer", "neo-tree", "nvim-tree", "bufferline"
+        plugins = {
+          bufferline = {
+            underline_selected = false,
+            underline_visible = false,
+          },
+          indent_blankline = {
+            context_highlight = "default", -- default | pro
+            context_start_underline = false,
+          },
+        },
+      })
+      vim.cmd [[colorscheme monokai-pro]]
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/okcolors.lua b/lua/plugins/colorschemes/okcolors.lua
new file mode 100644
index 0000000..81a2d92
--- /dev/null
+++ b/lua/plugins/colorschemes/okcolors.lua
@@ -0,0 +1,11 @@
+return {
+  {
+    "e-q/okcolors.nvim", name = "okcolors",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd [[colorscheme okcolors-smooth]]
+    end,
+  }
+}
+
diff --git a/lua/plugins/colorschemes/onedarkpro.lua b/lua/plugins/colorschemes/onedarkpro.lua
new file mode 100644
index 0000000..3cfdffc
--- /dev/null
+++ b/lua/plugins/colorschemes/onedarkpro.lua
@@ -0,0 +1,10 @@
+return {
+  {
+    "olimorris/onedarkpro.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd [[colorscheme onedark]]
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/rosepine.lua b/lua/plugins/colorschemes/rosepine.lua
new file mode 100644
index 0000000..320ecf7
--- /dev/null
+++ b/lua/plugins/colorschemes/rosepine.lua
@@ -0,0 +1,13 @@
+return {
+  {
+    "rose-pine/neovim", name = "rose-pine",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require("rose-pine").setup({
+        variant = "moon",
+      })
+      vim.cmd("colorscheme rose-pine")
+    end,
+  }
+}
diff --git a/lua/plugins/colorschemes/tokyonight.lua b/lua/plugins/colorschemes/tokyonight.lua
new file mode 100644
index 0000000..8303416
--- /dev/null
+++ b/lua/plugins/colorschemes/tokyonight.lua
@@ -0,0 +1,44 @@
+return {
+  {
+    "folke/tokyonight.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require("tokyonight").setup({
+        -- your configuration comes here
+        -- or leave it empty to use the default settings
+        style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
+        transparent = false, -- Enable this to disable setting the background color
+        terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim
+        styles = {
+          -- Style to be applied to different syntax groups
+          -- Value is any valid attr-list value for `:help nvim_set_hl`
+          comments = { italic = true },
+          keywords = { italic = true },
+          functions = {},
+          variables = {},
+          -- Background styles. Can be "dark", "transparent" or "normal"
+          sidebars = "dark", -- style for sidebars, see below
+          floats = "dark", -- style for floating windows
+        },
+        sidebars = { "qf", "help", "nvimtree" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
+        day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
+        hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
+        dim_inactive = false, -- dims inactive windows
+        lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
+
+        --- You can override specific color groups to use other groups or a hex color
+        --- function will be called with a ColorScheme table
+        ---@param colors ColorScheme
+        on_colors = function(colors) end,
+
+        --- You can override specific highlights to use other groups or a hex color
+        --- function will be called with a Highlights and ColorScheme table
+        ---@param highlights Highlights
+        ---@param colors ColorScheme
+        on_highlights = function(highlights, colors) end,
+      })
+      vim.cmd[[colorscheme tokyonight]]
+    end,
+  }
+}
diff --git a/lua/plugins/copilotchat.lua b/lua/plugins/copilotchat.lua
new file mode 100644
index 0000000..e885c37
--- /dev/null
+++ b/lua/plugins/copilotchat.lua
@@ -0,0 +1,48 @@
+  return {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    lazy = false,
+    branch = "canary",
+    dependencies = {
+      { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
+      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
+    },
+    build = "make tiktoken", -- Only on MacOS or Linux
+    opts = {
+      debug = false, -- Enable debugging
+      model = "claude-3.5-sonnet",
+      question_header = '## User ', -- Header to use for user questions
+      answer_header = '## Copilot ', -- Header to use for AI answers
+      error_header = '## Error ', -- Header to use for errors
+    },
+    keys = {
+      { "<leader>c", ":CopilotChatToggle<CR>", desc = "Copilot toggle" },
+      {
+        "<leader>cs",
+        function()
+          local input = vim.fn.input("Quick Chat: ")
+          if input ~= "" then
+            require("CopilotChat").ask(input, { selection = require("CopilotChat.select").visual })
+          end
+        end,
+        desc = "CopilotChat - Quick chat selected",
+        mode = { "v" },
+      },
+      {
+        "<leader>cch",
+        function()
+          local actions = require("CopilotChat.actions")
+          require("CopilotChat.integrations.telescope").pick(actions.help_actions())
+        end,
+        desc = "CopilotChat - Help actions",
+      },
+  -- Show prompts actions with telescope
+      {
+        "<leader>ccp",
+        function()
+          local actions = require("CopilotChat.actions")
+          require("CopilotChat.integrations.telescope").pick(actions.prompt_actions())
+        end,
+        desc = "CopilotChat - Prompt actions",
+      },
+    },
+  }
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 268144a..9d4b6a5 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,34 +1,4 @@
 return {
-  --[[ COLORSCHEME ]]
-  {
-    "folke/tokyonight.nvim",
-    -- "rose-pine/neovim", name = "rose-pine",
-    -- "loctvl842/monokai-pro.nvim",
-    -- "rebelot/kanagawa.nvim",
-    -- "sainnhe/gruvbox-material",
-    -- "olimorris/onedarkpro.nvim",
-    -- "projekt0n/github-nvim-theme",
-    -- "Shatur/neovim-ayu",
-    -- "scottmckendry/cyberdream.nvim",
-    -- "e-q/okcolors.nvim", name = "okcolors",
-    -- enabled = false,
-    lazy = false,
-    priority = 1000,
-     config = function()
-       require('config.colorschemes.tokyonight')
-       -- require('config.colorschemes.rosepine')
-       -- require('config.colorschemes.monokai_pro')
-       -- require('config.colorschemes.kanagawa')
-       -- require('config.colorschemes.gruvbox_material')
-       -- require('config.colorschemes.cyberdream')
-       -- vim.cmd [[colorscheme onedark]]
-       -- vim.cmd [[colorscheme github_dark_dimmed]]
-       -- vim.cmd [[colorscheme ayu-dark]]
-       -- vim.cmd [[colorscheme okcolors-smooth]]
-     end,
-  },
-  --[[ END COLORSCHEME ]]
-  --[[ UI ]]
   {
     "nvim-lua/popup.nvim",
     lazy = false,
@@ -49,7 +19,6 @@ return {
     "onsails/lspkind-nvim",
     lazy = false,
   },
-  --[[ END UI ]]
   {
     "hrsh7th/nvim-cmp",
     priority = 1000,
@@ -86,16 +55,6 @@ return {
       }
     end,
   },
-  {
-    "luukvbaal/statuscol.nvim",
-    lazy = false,
-    config = function()
-      require("statuscol").setup({
-        separator = " ",
-        setopt = true,
-      })
-    end
-  },
   {
     "AckslD/nvim-neoclip.lua",
     config = function()
@@ -225,10 +184,6 @@ return {
     "chrisbra/csv.vim",
     event = 'VeryLazy',
   },
-  {
-    "kazhala/close-buffers.nvim",
-    event = 'VeryLazy',
-  },
   {
     "folke/twilight.nvim",
     event = 'VeryLazy',
@@ -281,12 +236,6 @@ return {
         "<cmd>lua require('grug-far').grug_far({ prefills = { search = vim.fn.expand('<cword>') } })<CR>",
         mode = { "n", "o", "x" },
       },
-      -- I use nvim-rip-substitute for file search and replace
-      -- {
-      --   "<leader>srf",
-      --   "<cmd>lua require('grug-far').grug_far({ prefills = { flags = vim.fn.expand('%') } })<CR>",
-      --   mode = { "n", "o", "x" },
-      -- },
     },
     config = function()
       require('grug-far').setup({
@@ -450,16 +399,16 @@ return {
       })
     end
   },
-  {
-    "FabijanZulj/blame.nvim",
-    lazy = false,
-    keys = {
-      { "<leader>gb", "<cmd>BlameToggle virtual<CR>", desc = "Git blame" },
-    },
-    config = function()
-      require("blame").setup()
-    end
-  },
+  -- {
+  --   "FabijanZulj/blame.nvim",
+  --   lazy = false,
+  --   keys = {
+  --     { "<leader>gb", "<cmd>BlameToggle virtual<CR>", desc = "Git blame" },
+  --   },
+  --   config = function()
+  --     require("blame").setup()
+  --   end
+  -- },
   {
     "chrisgrieser/nvim-rip-substitute",
     lazy = "VeryLazy",
@@ -472,52 +421,4 @@ return {
       },
     },
   },
-  {
-    "CopilotC-Nvim/CopilotChat.nvim",
-    lazy = false,
-    branch = "canary",
-    dependencies = {
-      { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
-      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
-    },
-    build = "make tiktoken", -- Only on MacOS or Linux
-    opts = {
-      debug = false, -- Enable debugging
-      model = "claude-3.5-sonnet",
-      question_header = '## User ', -- Header to use for user questions
-      answer_header = '## Copilot ', -- Header to use for AI answers
-      error_header = '## Error ', -- Header to use for errors
-    },
-    keys = {
-      { "<leader>c", ":CopilotChatToggle<CR>", desc = "Copilot toggle" },
-      {
-        "<leader>cs",
-        function()
-          local input = vim.fn.input("Quick Chat: ")
-          if input ~= "" then
-            require("CopilotChat").ask(input, { selection = require("CopilotChat.select").visual })
-          end
-        end,
-        desc = "CopilotChat - Quick chat selected",
-        mode = { "v" },
-      },
-      {
-        "<leader>cch",
-        function()
-          local actions = require("CopilotChat.actions")
-          require("CopilotChat.integrations.telescope").pick(actions.help_actions())
-        end,
-        desc = "CopilotChat - Help actions",
-      },
-  -- Show prompts actions with telescope
-      {
-        "<leader>ccp",
-        function()
-          local actions = require("CopilotChat.actions")
-          require("CopilotChat.integrations.telescope").pick(actions.prompt_actions())
-        end,
-        desc = "CopilotChat - Prompt actions",
-      },
-    },
-  },
 }
diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua
index 82699bd..ff86ca1 100644
--- a/lua/plugins/nvim-lspconfig.lua
+++ b/lua/plugins/nvim-lspconfig.lua
@@ -162,7 +162,7 @@ function M.config()
       })
     end,
   }
-  require("ufo").setup()
+  -- require("ufo").setup()
 end
 
 return M
diff --git a/lua/plugins/nvim-ufo.lua b/lua/plugins/nvim-ufo.lua
index 0c5c8bc..074f644 100644
--- a/lua/plugins/nvim-ufo.lua
+++ b/lua/plugins/nvim-ufo.lua
@@ -1,5 +1,6 @@
 return {
   'kevinhwang91/nvim-ufo',
+  enabled = false,
   dependencies = {
     'kevinhwang91/promise-async'
   },
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
new file mode 100644
index 0000000..93f5168
--- /dev/null
+++ b/lua/plugins/snacks.lua
@@ -0,0 +1,52 @@
+return {
+  "folke/snacks.nvim",
+  priority = 1000,
+  lazy = false,
+  opts = {
+    bigfile = { enabled = true },
+    bufdelete = { enabled = true },
+    debug = { enabled = false },
+    git = { enabled = true },
+    gitbrowse = { enabled = true },
+    lazygit = { enabled = true },
+    notify = { enabled = true },
+    notifier = {
+      enabled = true,
+      timeout = 3000,
+    },
+    quickfile = { enabled = true },
+    rename = { enabled = false },
+    statuscolumn = { enabled = true },
+    terminal = { enabled = true },
+    toggle = { enabled = true },
+    win = { enabled = true },
+    words = { enabled = true },
+    styles = {
+      notification = {
+        wo = { wrap = true } -- Wrap notifications
+      }
+    }
+  },
+  keys = {
+    { "<leader>un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" },
+    { "<leader>bd", function() Snacks.bufdelete() end, desc = "Delete Buffer" },
+    { "<leader>gg", function() Snacks.lazygit() end, desc = "Lazygit" },
+    { "<leader>gb", function() Snacks.git.blame_line() end, desc = "Git Blame Line" },
+    { "<leader>gB", function() Snacks.gitbrowse() end, desc = "Git Browse" },
+    { "<leader>gf", function() Snacks.lazygit.log_file() end, desc = "Lazygit Current File History" },
+    { "<leader>gl", function() Snacks.lazygit.log() end, desc = "Lazygit Log (cwd)" },
+    { "<leader>x",  function() Snacks.terminal({cmd = "lazydocker"}) end, desc = "Toggle Terminal" },
+    { "]]",         function() Snacks.words.jump(vim.v.count1) end, desc = "Next Reference" },
+    { "[[",         function() Snacks.words.jump(-vim.v.count1) end, desc = "Prev Reference" },
+  },
+  init = function()
+    vim.api.nvim_create_autocmd("User", {
+      pattern = "VeryLazy",
+      callback = function()
+        -- Create some toggle mappings
+        Snacks.toggle.treesitter():map("<leader>uT")
+        Snacks.toggle.option("background", { off = "light", on = "dark", name = "Dark Background" }):map("<leader>ub")
+      end,
+    })
+  end,
+}
diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua
index 7383ab8..e04f3d4 100644
--- a/lua/plugins/toggleterm.lua
+++ b/lua/plugins/toggleterm.lua
@@ -1,5 +1,6 @@
 return {
   "akinsho/nvim-toggleterm.lua",
+  enabled = false,
   keys = {
     { "<leader>x", desc = "Terminal" },
     { "<leader>gg", "<cmd>lua _lazygit_toggle()<CR>", desc = "Lazygit" },