switch theme again

this time to my weird dracula-catppuccin hybrid

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" },

lua/config.lua

@@ -1,8 +1,6 @@
 local config = {
   border = 'none',
-  colorscheme = 'catppuccin',
+  colorscheme = 'dracula',
-  add_plugins = {},
-  plugins = {},
   lsp = {
     inlay_hint = false,
     format_timeout = 500,

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 },
+  },
+}

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 f', '󰈞  find file'),
-    button('SPC f s', '  Find word'),
+    button('SPC f s', '  live grep'),
-    button('SPC s l', '  Open last session'),
+    button('SPC s l', '  open last session'),
   },
   opts = {
     spacing = 1,

lua/plugins/catppuccin.lua

@@ -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,
-  },
-}

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' },
+    },
+  },
+}

lua/plugins/fugitive.lua

@@ -1,4 +1,10 @@
 return {
   'tpope/vim-fugitive',
   cmd = 'Git',
+  init = function()
+    local u = require('utils')
+    local map = u.set_keymap
+
+    map('n', '<leader>vg', ':vert Git<cr>', { desc = 'Git status' })
+  end,
 }

lua/plugins/telescope/config.lua

@@ -1,5 +1,4 @@
 local actions = require('telescope.actions')
-local config = require('config')
 local icons = require('utils.icons')
 local u = require('utils')
 
@@ -15,6 +14,7 @@ local default_mappings = {
   },
 }
 
+--[[ mewo ]]
 local opts_cursor = {
   initial_mode = 'normal',
   sorting_strategy = 'ascending',
@@ -47,7 +47,7 @@ local opts_flex = {
   },
 }
 
-require('telescope').setup(u.merge({
+require('telescope').setup({
   defaults = {
     selection_caret = icons.folder.arrow_closed,
     file_ignore_patterns = {
@@ -69,10 +69,10 @@ require('telescope').setup(u.merge({
   },
   extensions = {
     fzf = {
-      fuzzy = true,                   -- false will only do exact matching
+      fuzzy = true, -- false will only do exact matching
       override_generic_sorter = true, -- override the generic sorter
-      override_file_sorter = true,    -- override the file sorter
+      override_file_sorter = true, -- override the file sorter
-      case_mode = 'smart_case',       -- or "ignore_case" or "respect_case"
+      case_mode = 'smart_case', -- or "ignore_case" or "respect_case"
       -- the default case_mode is "smart_case"
     },
   },
@@ -131,6 +131,6 @@ require('telescope').setup(u.merge({
       mappings = default_mappings,
     }),
   },
-}, config.plugins.telescope or {}))
+})
 
 require('telescope').load_extension('fzf')

lua/plugins/telescope/init.lua

@@ -24,7 +24,6 @@ return {
 
     -- git navigation
     map('n', '<leader>vc', ':Telescope git_commits<cr>', { desc = 'Git commits' })
-    map('n', '<leader>vg', ':Telescope git_status<cr>', { desc = 'Git status' })
 
     config.lsp.add_on_attach_mapping(function(_, bufnr)
       local buf_map = u.create_buf_map(bufnr)