1 files changed, 36 insertions, 17 deletions
diff --git a/nix/themes/catppuccin/mocha.nix b/nix/themes/catppuccin/mocha.nix
index aee42b6..84cb6ef 100644
--- a/nix/themes/catppuccin/mocha.nix
+++ b/nix/themes/catppuccin/mocha.nix
@@ -1,21 +1,40 @@
-{
+rec {
 	name = "Catppuccin Mocha";
 	author = "https://github.com/catppuccin/catppuccin";
 
-	base00 = "1e1e2e"; # base
-	base01 = "181825"; # mantle
-	base02 = "313244"; # surface0
-	base03 = "45475a"; # surface1
-	base04 = "585b70"; # surface2
-	base05 = "cdd6f4"; # text
-	base06 = "f5e0dc"; # rosewater
-	base07 = "b4befe"; # lavender
-	base08 = "f38ba8"; # red
-	base09 = "fab387"; # peach
-	base0A = "f9e2af"; # yellow
-	base0B = "a6e3a1"; # green
-	base0C = "94e2d5"; # teal
-	base0D = "89b4fa"; # blue
-	base0E = "cba6f7"; # mauve
-	base0F = "f2cdcd"; # flamingo
+	fg = "cdd6f4";
+	bg = "1e1e2e";
+
+	surface.fg = fg;
+	surface.bg = "313244";
+
+	hover.fg = fg;
+	hover.bg = "6c7086";
+
+	primary = normal.blue;
+	success = normal.green;
+	warning = normal.yellow;
+	error = normal.red;
+
+	normal = {
+		black = "45475a";
+		red = "f38ba8";
+		green = "a6e3a1";
+		yellow = "f9e2af";
+		blue = "89b4fa";
+		magenta = "ca9ee6";
+		cyan = "94e2d5";
+		white = "bac2de";
+	};
+
+	bright = {
+		black = "585b70";
+		red = "f38ba8";
+		green = "a6e3a1";
+		yellow = "f9e2af";
+		blue = "89b4fa";
+		magenta = "ca9ee6";
+		cyan = "94e2d5";
+		white = "a6adc8";
+	};
 }