From 17b450419a18e3e97bcb5ab520aad9ec30b1d195 Mon Sep 17 00:00:00 2001 From: Matt McGinnis Date: Fri, 20 Dec 2024 10:56:32 -0500 Subject: [PATCH] feature: Update to Dracula color scheme --- init.lua | 2 +- lazy-lock.json | 18 ++++----- lua/core/colors.lua | 2 +- lua/core/plugin_config/init.lua | 1 - lua/core/plugin_config/theme.lua | 66 -------------------------------- lua/core/plugins.lua | 4 +- 6 files changed, 13 insertions(+), 80 deletions(-) delete mode 100644 lua/core/plugin_config/theme.lua diff --git a/init.lua b/init.lua index 78d4e5a..49e4d85 100644 --- a/init.lua +++ b/init.lua @@ -6,6 +6,6 @@ require("core.plugin_config") vim.o.background = "dark" -- or "light" for light mode -vim.cmd("colorscheme rose-pine-main") +vim.cmd("colorscheme dracula") ColorMyScheme() diff --git a/lazy-lock.json b/lazy-lock.json index 89d1f87..2ce06e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,25 +3,25 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" }, - "codecompanion.nvim": { "branch": "main", "commit": "e8d52e91bb6015e5e51a9407d390292359e1b047" }, + "codecompanion.nvim": { "branch": "main", "commit": "f20ebfbaf64a1c6d2a3268a80431df697a4d2bbe" }, + "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, - "nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-dap": { "branch": "master", "commit": "04ce47fc5a6ef2b717f33c320fc003091cebac40" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, - "nvim-lspconfig": { "branch": "master", "commit": "3cb6c05779459eb5fe9cddbb47675593594f0415" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-snippy": { "branch": "master", "commit": "86a0b645551ca83153a594097ee0267498abaae2" }, - "nvim-treesitter": { "branch": "master", "commit": "cfbbdd5effbde3d47d2d662e67cfcd62a93b783f" }, + "nvim-snippy": { "branch": "master", "commit": "becb4b94929207e61ae897417f0e957cd2ea3f1f" }, + "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-web-devicons": { "branch": "master", "commit": "8a8e0668b8ad6124813a44a626afdf850dd24874" }, + "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "render-markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, - "rose-pine": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" }, diff --git a/lua/core/colors.lua b/lua/core/colors.lua index 9d4c65e..0189600 100644 --- a/lua/core/colors.lua +++ b/lua/core/colors.lua @@ -1,5 +1,5 @@ function ColorMyScheme(color) - color = color or "rose-pine-main" + color = color or "dracula" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) diff --git a/lua/core/plugin_config/init.lua b/lua/core/plugin_config/init.lua index 03292e5..a74bd51 100644 --- a/lua/core/plugin_config/init.lua +++ b/lua/core/plugin_config/init.lua @@ -4,7 +4,6 @@ require("core.plugin_config.comment") require("core.plugin_config.dap") require("core.plugin_config.lsp") require("core.plugin_config.movement") -require("core.plugin_config.theme") require("core.plugin_config.toggle-term") require("core.plugin_config.treesitter") require("core.plugin_config.telescope") diff --git a/lua/core/plugin_config/theme.lua b/lua/core/plugin_config/theme.lua deleted file mode 100644 index 8276f83..0000000 --- a/lua/core/plugin_config/theme.lua +++ /dev/null @@ -1,66 +0,0 @@ -require("rose-pine").setup({ - variant = "auto", -- auto, main, moon, or dawn - dark_variant = "main", -- main, moon, or dawn - dim_inactive_windows = false, - extend_background_behind_borders = true, - - enable = { - terminal = true, - legacy_highlights = true, -- Improve compatibility for previous versions of Neovim - migrations = true, -- Handle deprecated options automatically - }, - - styles = { - bold = true, - italic = true, - transparency = true, - }, - - groups = { - border = "muted", - link = "iris", - panel = "surface", - - error = "love", - hint = "iris", - info = "foam", - note = "pine", - todo = "rose", - warn = "gold", - - git_add = "foam", - git_change = "rose", - git_delete = "love", - git_dirty = "rose", - git_ignore = "muted", - git_merge = "iris", - git_rename = "pine", - git_stage = "iris", - git_text = "rose", - git_untracked = "subtle", - - h1 = "iris", - h2 = "foam", - h3 = "rose", - h4 = "gold", - h5 = "pine", - h6 = "foam", - }, - - highlight_groups = { - -- Comment = { fg = "foam" }, - -- VertSplit = { fg = "muted", bg = "muted" }, - }, - - before_highlight = function(group, highlight, palette) - -- Disable all undercurls - -- if highlight.undercurl then - -- highlight.undercurl = false - -- end - -- - -- Change palette colour - -- if highlight.fg == palette.pine then - -- highlight.fg = palette.foam - -- end - end, -}) diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua index 37aa9bc..0074f7f 100644 --- a/lua/core/plugins.lua +++ b/lua/core/plugins.lua @@ -26,8 +26,8 @@ require("lazy").setup({ -- Commenting { "numToStr/Comment.nvim" }, - -- Rose-pine Color Theme - { "rose-pine/neovim", name = "rose-pine" }, + -- Dracula Color Schemes + { 'Mofiqul/dracula.nvim' }, -- Leap Motions { "ggandor/leap.nvim" },