From ec79482e0acdc2dec802f42ff5bf529006f99c05 Mon Sep 17 00:00:00 2001 From: wires Date: Sat, 8 Mar 2025 14:18:17 -0500 Subject: [PATCH] switch theme again this time to my weird dracula-catppuccin hybrid --- lazy-lock.json | 1 + lua/config.lua | 4 +--- lua/lualine/themes/dracula.lua | 44 ++++++++++++++++++++++++++++++++++ lua/plugins/alpha/theme.lua | 10 ++++---- lua/plugins/catppuccin.lua | 33 ------------------------- lua/plugins/dracula.lua | 16 +++++++++++++ 6 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 lua/lualine/themes/dracula.lua delete mode 100644 lua/plugins/catppuccin.lua create mode 100644 lua/plugins/dracula.lua diff --git a/lazy-lock.json b/lazy-lock.json index cf98ca3..1110bb7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,6 +10,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cosmic-ui": { "branch": "main", "commit": "ab7de388576eaac02ce7bc2389e55b8e207aad12" }, + "dracula.nvim": { "branch": "main", "commit": "96c9d19ce81b26053055ad6f688277d655b3f7d2" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, diff --git a/lua/config.lua b/lua/config.lua index 35af294..48e949c 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -1,8 +1,6 @@ local config = { border = 'none', - colorscheme = 'catppuccin', - add_plugins = {}, - plugins = {}, + colorscheme = 'dracula', lsp = { inlay_hint = false, format_timeout = 500, diff --git a/lua/lualine/themes/dracula.lua b/lua/lualine/themes/dracula.lua new file mode 100644 index 0000000..5c61566 --- /dev/null +++ b/lua/lualine/themes/dracula.lua @@ -0,0 +1,44 @@ +local colors = { + gray = '#181825', + lightgray = '#313244', + orange = '#ffb86c', + purple = '#bd93f9', + red = '#ff5555', + yellow = '#f1fa8c', + green = '#50fa7b', + white = '#cdd6f4', + black = '#282a36', +} + +return { + normal = { + a = { bg = colors.purple, fg = colors.black, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, + insert = { + a = { bg = colors.green, fg = colors.black, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, + visual = { + a = { bg = colors.yellow, fg = colors.black, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, + replace = { + a = { bg = colors.red, fg = colors.black, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, + command = { + a = { bg = colors.orange, fg = colors.black, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, + inactive = { + a = { bg = colors.gray, fg = colors.white, gui = 'bold' }, + b = { bg = colors.lightgray, fg = colors.white }, + c = { bg = colors.gray, fg = colors.white }, + }, +} diff --git a/lua/plugins/alpha/theme.lua b/lua/plugins/alpha/theme.lua index 41fc934..43b6d64 100644 --- a/lua/plugins/alpha/theme.lua +++ b/lua/plugins/alpha/theme.lua @@ -23,7 +23,7 @@ local default_header = { }, opts = { position = 'center', - hl = 'Type', + hl = 'Define', -- wrap = "overflow"; }, } @@ -52,7 +52,7 @@ local function button(sc, txt, keybind, keybind_opts) cursor = 3, width = 50, align_shortcut = 'right', - hl_shortcut = 'Keyword', + hl_shortcut = 'Type', } if keybind then keybind_opts = if_nil(keybind_opts, { noremap = true, silent = true, nowait = true }) @@ -75,9 +75,9 @@ end local buttons = { type = 'group', val = { - button('SPC f f', '󰈞 Find file'), - button('SPC f s', ' Find word'), - button('SPC s l', ' Open last session'), + button('SPC f f', '󰈞 find file'), + button('SPC f s', ' live grep'), + button('SPC s l', ' open last session'), }, opts = { spacing = 1, diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua deleted file mode 100644 index 4acbc13..0000000 --- a/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,33 +0,0 @@ -local config = { - flavour = 'mocha', - integrations = { - fidget = true, - which_key = true, - lsp_trouble = true, - telescope = { - enabled = true, - }, - }, - color_overrides = { - mocha = { - base = '#11111b', - mantle = '#181825', - crust = '#11111b', - }, - }, - custom_highlights = function(_) - return { - CursorLine = { bg = '#1e1e2e' }, - } - end, -} - -return { - { -- color scheme - 'catppuccin/nvim', - lazy = false, - config = function() - require('catppuccin').setup(config) - end, - }, -} diff --git a/lua/plugins/dracula.lua b/lua/plugins/dracula.lua new file mode 100644 index 0000000..4f9a442 --- /dev/null +++ b/lua/plugins/dracula.lua @@ -0,0 +1,16 @@ +return { + 'Mofiqul/dracula.nvim', + opts = { + colors = { + bg = '#11111b', + fg = '#cdd6f4', + menu = '#11111b', + selection = '#45475a', + comment = '#9399b2', + }, + overrides = { + CursorLine = { bg = '#1e1e2e' }, + LineNr = { fg = '#45475a' }, + }, + }, +}