feat(neovim): go back to catppuccin.nvim :')

modules/home-manager/programs/neovim/colors/catppuccin-frappe-base16.lua

@@ -1,54 +0,0 @@
-local colors = {
-  base00 = "#303446", -- base
-  base01 = "#292c3c", -- mantle
-  base02 = "#414559", -- surface0
-  base03 = "#51576d", -- surface1
-  base04 = "#626880", -- surface2
-  base05 = "#c6d0f5", -- text
-  base06 = "#f2d5cf", -- rosewater
-  base07 = "#babbf1", -- lavender
-  base08 = "#e78284", -- red
-  base09 = "#ef9f76", -- peach
-  base0A = "#e5c890", -- yellow
-  base0B = "#a6d189", -- green
-  base0C = "#81c8be", -- teal
-  base0D = "#8caaee", -- blue
-  base0E = "#ca9ee6", -- mauve
-  base0F = "#eebebe", -- flamingo
-}
-
-require("mini.base16").setup({
-  palette = colors,
-})
-
-vim.g.colors_name = "catppuccin-frappe-base16"
-
-local function hl(highlight, options)
-  vim.api.nvim_set_hl(0, highlight, options)
-end
-
-local function fg(color)
-  return { fg = color, bg = nil, attr = nil, sp = nil }
-end
-
-----------------------------
--- Further customizations --
-----------------------------
-
--- General
-hl("Delimiter", fg(colors.base05))
-hl("Tag", fg(colors.base08))
-
--- Treesitter
-hl("@keyword.return", fg(colors.base0E))
-hl("@variable", fg(colors.base08))
-
--- Tags
-hl("@tag.attribute", fg(colors.base09))
-hl("@tag.delimiter", fg(colors.base05))
-
--- LSP Semantic Highlight
-hl("@lsp.mod.deprecated", fg(colors.base0F))
-hl("@lsp.type.parameter", fg(colors.base05))
-hl("@lsp.type.property", fg(colors.base05))
-hl("@lsp.type.variable", fg(colors.base08))

modules/home-manager/programs/neovim/default.nix

@@ -114,7 +114,5 @@ in
       config = config;
       pkgs = pkgs;
     };
-
-    xdg.configFile."nvim/colors/catppuccin-frappe-base16.lua".source = ./colors/catppuccin-frappe-base16.lua;
   };
 }

modules/home-manager/programs/neovim/lua/community.lua

@@ -6,15 +6,6 @@
 return {
   "AstroNvim/astrocommunity",
   { import = "astrocommunity.colorscheme.catppuccin" },
-  {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    opts = function(_, config)
-      config.flavour = "frappe"
-      config.transparent_background = true
-    end,
-  },
-  { import = "astrocommunity.colorscheme.mini-base16" },
 
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.editing-support.zen-mode-nvim" },

modules/home-manager/programs/neovim/lua/plugins/astroui.lua

@@ -9,7 +9,7 @@ return {
   ---@type AstroUIOpts
   opts = {
     -- change colorscheme
-    colorscheme = "catppuccin-frappe-base16",
+    colorscheme = "catppuccin-frappe",
     -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
     highlights = {
       init = { -- this table overrides highlights in all themes

modules/home-manager/programs/neovim/lua/plugins/user.lua

@@ -26,6 +26,60 @@ return {
     end,
   },
 
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,
+    ---@type CatppuccinOptions
+    opts = {
+      integrations = {
+        aerial = true,
+        alpha = true,
+        cmp = true,
+        dap = true,
+        dap_ui = true,
+        gitsigns = true,
+        illuminate = true,
+        indent_blankline = true,
+        markdown = true,
+        mason = true,
+        native_lsp = { enabled = true },
+        neotree = true,
+        notify = true,
+        semantic_tokens = true,
+        symbols_outline = true,
+        telescope = true,
+        treesitter = true,
+        ts_rainbow = false,
+        ufo = true,
+        which_key = true,
+        window_picker = true,
+        colorful_winsep = { enabled = true, color = "lavender" },
+      },
+    },
+    specs = {
+      {
+        "akinsho/bufferline.nvim",
+        optional = true,
+        opts = function(_, opts)
+          return require("astrocore").extend_tbl(opts, {
+            highlights = require("catppuccin.groups.integrations.bufferline").get(),
+          })
+        end,
+      },
+      {
+        "nvim-telescope/telescope.nvim",
+        optional = true,
+        opts = {
+          highlight = {
+            enable = true,
+            additional_vim_regex_highlighting = false,
+          },
+        },
+      },
+    },
+  },
+
   -- Makes most if not all groups have a transparent background.
   {
     "xiyaowong/transparent.nvim",