feat: sick theming

modules/home-manager/programs/nixvim/custom-highlights.lua

@@ -1,65 +0,0 @@
-function(colors)
-  return {
-    CmpItemKindCopilot = { fg = colors.teal },
-    CmpItemKindNpm = { fg = colors.maroon },
-
-    -- IntelliJ Theme
-    Constant = { fg = colors.mauve },
-    Character = { link = "Keyword" },
-    Number = { fg = colors.sapphire },
-    Boolean = { link = "Keyword" },
-    Identifier = { fg = colors.text },
-    Function = { fg = colors.blue },
-    Statement = { fg = colors.text },
-    Conditional = { link = "Keyword" },
-    Repeat = { link = "Keyword" },
-    Label = { link = "Keyword" },
-    Operator = { fg = colors.text },
-    Keyword = { fg = colors.peach },
-    Exception = { link = "Keyword" },
-    Include = { link = "Keyword" },
-    Structure = { fg = colors.yellow },
-    Type = { fg = colors.teal },
-
-    SpellBad = { sp = colors.green, style = { "underdotted" } },
-    SpellCap = { sp = colors.green, style = { "underdotted" } },
-    SpellLocal = { sp = colors.green, style = { "underdotted" } },
-    SpellRare = { sp = colors.green, style = { "underdotted" } },
-
-    ["@constructor"] = { link = "Keyword" },
-    ["@constructor.typescript"] = { link = "@constructor" },
-    ["@parameter"] = { link = "Identifier" },
-
-    ["@tag"] = { link = "Structure" },
-    ["@tag.delimiter"] = { link = "Structure" },
-    ["@tag.attribute"] = { fg = colors.mauve, style = { "italic" } },     -- Constant
-
-    ["@keyword.function"] = { link = "Keyword" },
-    ["@keyword.operator"] = { link = "Keyword" },
-    ["@keyword.return"] = { link = "Keyword" },
-    ["@keyword.export"] = { link = "Keyword" },
-
-    ["@punctuation.special"] = { link = "Operator" },
-    ["@conditional.ternary"] = { link = "Operator" },
-
-    ["@type.builtin"] = { link = "Keyword" },
-    ["@variable.builtin"] = { link = "Keyword" },
-    ["@lsp.typemod.class.defaultLibrary"] = { fg = colors.yellow, style = { "bold" } },       -- Structure
-    ["@lsp.typemod.variable.defaultLibrary"] = { fg = colors.mauve, style = { "bold" } },     -- Constant
-    ["@lsp.typemod.function.defaultLibrary"] = { fg = colors.blue, style = { "bold" } },      -- Function
-
-    ["@variable"] = { link = "Constant" },
-    ["@field"] = { link = "Constant" },
-    ["@label.json"] = { link = "Constant" },
-    ["@label.jsonc"] = { link = "Constant" },
-    ["@property"] = { link = "Constant" },
-    ["@property.typescript"] = { link = "@property" },
-    ["@lsp.type.property"] = { link = "Constant" },
-    ["@lsp.type.interface"] = { link = "Structure" },
-    ["@lsp.type.namespace"] = { link = "Structure" },
-    ["@attribute.typescript"] = { link = "Structure" },
-
-    ["@lsp.mod.local"] = { fg = colors.text },
-    ["@lsp.mod.readonly"] = { style = { "italic" } },
-  }
-end

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

@@ -2,7 +2,7 @@
 let
   darkman = pkgs.vimUtils.buildVimPlugin {
     name = "darkman";
-    src = pkgs.buildGoModule rec {
+    src = pkgs.buildGoModule {
       pname = "darkman.nvim";
       version = "0.0.1";
       vendorHash = "sha256-HpyKzvKVN9hVRxxca4sdWRo91H32Ha9gxitr7Qg5MY8=";
@@ -81,36 +81,11 @@ in
     providers.wl-copy.enable = true;
   };
 
-  extraConfigVim = ''
-    if !exists("g:neovide")
-      hi Normal guibg=NONE ctermbg=NONE
-    endif
-    set noshowmode
-  '';
-
   extraConfigLua = builtins.readFile ./extra-config.lua;
 
-  colorschemes.catppuccin = {
-    enable = true;
-    settings = {
-      term_colors = true;
-      transparent_background = true;
-      background = {
-        dark = "frappe";
-        light = "latte";
-      };
-      integrations.native_lsp.underlines = {
-        errors = [ "undercurl" ];
-        warnings = [ "undercurl" ];
-      };
-      custom_highlights = builtins.readFile ./custom-highlights.lua;
-    };
-  };
-
   plugins = {
     lualine = {
       enable = true;
-      theme = "catppuccin";
       globalstatus = true;
       sectionSeparators = {
         left = "";

modules/home-manager/programs/nixvim/extra-config.lua

@@ -4,15 +4,6 @@ require("rest-nvim").setup({})
 require("actions-preview").setup({})
 
 if vim.g.neovide then
-	vim.api.nvim_create_autocmd("ColorScheme", {
-		pattern = "*",
-		callback = function()
-			local flavour = require("catppuccin").options.background[vim.o.background]
-			local palette = require("catppuccin.palettes").get_palette(flavour)
-			vim.cmd("hi Normal guibg=" .. palette.base)
-			vim.cmd("set pumblend=100")
-		end,
-	})
 	-- no idea why this is needed
 	vim.opt.linespace = -1
 end