From 4c08dd9171baac0f864925034058665f02308e21 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Thu, 6 Mar 2025 22:38:08 +1100
Subject: [PATCH] user/catppuccin: add a palette attribute

---
 flake.lock                  | 17 +++++++++++++++++
 flake.nix                   |  1 +
 modules/user/catppuccin.nix | 13 +++++++++++--
 modules/user/kitty.nix      |  8 ++------
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index eb41764..25d93a2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,6 +69,22 @@
         "type": "github"
       }
     },
+    "catppuccin-palette": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730938296,
+        "narHash": "sha256-8AZVLJq5fKbMd/YFbqwgpHB7p4iTPTIMmC39R+3ZZ80=",
+        "owner": "catppuccin",
+        "repo": "palette",
+        "rev": "b85d36adec22631684ae64ced0a5cdd15462de3b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "palette",
+        "type": "github"
+      }
+    },
     "catppuccin-v1_1": {
       "locked": {
         "lastModified": 1734055249,
@@ -865,6 +881,7 @@
         "aagl": "aagl",
         "agenix": "agenix",
         "catppuccin": "catppuccin",
+        "catppuccin-palette": "catppuccin-palette",
         "discord-tokyonight": "discord-tokyonight",
         "discover": "discover",
         "fast-syntax-highlighting": "fast-syntax-highlighting",
diff --git a/flake.nix b/flake.nix
index fa17cc1..14e2cbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,7 @@
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e";
     catppuccin.inputs.nixpkgs.follows = "nixpkgs";
+    catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; };
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon";
     home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix
index e99b0d7..1311421 100644
--- a/modules/user/catppuccin.nix
+++ b/modules/user/catppuccin.nix
@@ -1,9 +1,18 @@
-{ inputs, ... }: {
+{ config, inputs, lib, ... }: {
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
   ];
 
-  catppuccin = {
+  options.catppuccin.colors = lib.mkOption {
+    type = lib.types.attrs;
+    default = (builtins.fromJSON (builtins.readFile "${inputs.catppuccin-palette}/palette.json"))."${config.catppuccin.flavor}".colors;
+  };
+  options.catppuccin.hexcolors = lib.mkOption {
+    type = lib.types.attrs;
+    default = builtins.mapAttrs (name: value: value.hex) config.catppuccin.colors;
+  };
+
+  config.catppuccin = {
     accent = "maroon";
     flavor = "mocha";
     kitty.enable = true;
diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix
index 893e74c..1ae7970 100644
--- a/modules/user/kitty.nix
+++ b/modules/user/kitty.nix
@@ -9,12 +9,8 @@
     settings = {
       font_features = "-ss01 +ss19";
       enable_audio_bell = false;
-      color5 = "#cba6f7";
-      color13 = "#cba6f7";
+      color5 = config.catppuccin.hexcolors.mauve;
+      color13 = config.catppuccin.hexcolors.mauve;
     };
-    # extraConfig = builtins.readFile (builtins.fetchurl {
-    #   url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf";
-    #   sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6";
-    # });
   };
 }