From a79c2c248951b110326e5f31f304d523057b23a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 24 Apr 2024 20:46:49 +0200
Subject: [PATCH] feat: matugen stuff

---
 flake.lock                                    | 35 ++++++++++++++-----
 flake.nix                                     |  2 +-
 .../home-manager/desktops/hyprland/kitty.nix  |  2 +-
 modules/nixos/theming/kitty.conf              | 26 +++++++-------
 modules/nixos/theming/matugen.nix             | 10 ++----
 5 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5f7aaa7..b0c9088 100644
--- a/flake.lock
+++ b/flake.lock
@@ -135,7 +135,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1701680307,
@@ -153,7 +153,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -337,18 +337,20 @@
     },
     "matugen": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1711657889,
-        "narHash": "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc=",
-        "owner": "InioX",
+        "lastModified": 1713978374,
+        "narHash": "sha256-6hsDcW5Ke1429SFjRgDNhmaOhdxDLteMeHXdz0Petqo=",
+        "owner": "Theaninova",
         "repo": "matugen",
-        "rev": "566277529dadc2b149a8bd8b9859ea791ecdef26",
+        "rev": "c50741a6432ac5ed1719737fc96051d2da878057",
         "type": "github"
       },
       "original": {
-        "owner": "InioX",
+        "owner": "Theaninova",
+        "ref": "custom-color-support",
         "repo": "matugen",
         "type": "github"
       }
@@ -535,6 +537,21 @@
       }
     },
     "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -549,7 +566,7 @@
         "type": "github"
       }
     },
-    "systems_3": {
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
diff --git a/flake.nix b/flake.nix
index 4ceb9e7..2cddd11 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    matugen.url = "github:InioX/matugen";
+    matugen.url = "github:Theaninova/matugen/custom-color-support";
     ags.url = "github:Aylur/ags";
     nixvim = {
       url = "github:nix-community/nixvim";
diff --git a/modules/home-manager/desktops/hyprland/kitty.nix b/modules/home-manager/desktops/hyprland/kitty.nix
index 6f220e4..d09393b 100644
--- a/modules/home-manager/desktops/hyprland/kitty.nix
+++ b/modules/home-manager/desktops/hyprland/kitty.nix
@@ -8,7 +8,7 @@
     font_size 13
   '';
   settings = {
-    #background_opacity = "0.8";
+    background_opacity = "0.8";
     window_padding_width = 10;
   };
 }
diff --git a/modules/nixos/theming/kitty.conf b/modules/nixos/theming/kitty.conf
index ae96c85..1572245 100644
--- a/modules/nixos/theming/kitty.conf
+++ b/modules/nixos/theming/kitty.conf
@@ -9,20 +9,20 @@ cursor {{colors.on_surface.default.hex}}
 
 # normal
 color0 {{colors.surface.default.hex}}
-color1 {{harmonized_colors.red.hex}}
-color2 {{harmonized_colors.green.hex}}
-color3 {{harmonized_colors.yellow.hex}}
-color4 {{harmonized_colors.blue.hex}}
-color5 {{harmonized_colors.magenta.hex}}
-color6 {{harmonized_colors.cyan.hex}}
+color1  {{colors.red.default.hex}}
+color2 {{colors.green.default.hex}}
+color3 {{colors.yellow.default.hex}}
+color4 {{colors.blue.default.hex}}
+color5 {{colors.magenta.default.hex}}
+color6 {{colors.cyan.default.hex}}
 color7 {{colors.on_surface.default.hex}}
 
 # bright
-color8 {{colors.surface_variant.default.hex}}
-color9 {{harmonized_colors.bright_red.hex}}
-color10 {{harmonized_colors.bright_green.hex}}
-color11 {{harmonized_colors.bright_yellow.hex}}
-color12 {{harmonized_colors.bright_blue.hex}}
-color13 {{harmonized_colors.bright_magenta.hex}}
-color14 {{harmonized_colors.bright_cyan.hex}}
+color8 {{colors.outline_variant.default.hex}}
+color9  {{colors.red.default.hex}}
+color10 {{colors.green.default.hex}}
+color11 {{colors.yellow.default.hex}}
+color12 {{colors.blue.default.hex}}
+color13 {{colors.magenta.default.hex}}
+color14 {{colors.cyan.default.hex}}
 color15 {{colors.on_surface_variant.default.hex}}
diff --git a/modules/nixos/theming/matugen.nix b/modules/nixos/theming/matugen.nix
index 9869b19..8aab146 100644
--- a/modules/nixos/theming/matugen.nix
+++ b/modules/nixos/theming/matugen.nix
@@ -32,7 +32,7 @@ in
           reload_apps = true;
           reload_apps_list = {
             kitty = true;
-            gtk_theme = true;
+            gtk_theme = false;
             waybar = false;
             dunst = false;
           };
@@ -40,19 +40,13 @@ in
           set_wallpaper = true;
           wallpaper_tool = "Swww";
 
-          colors_to_harmonize = {
+          custom_colors = {
             red = "#ff0000";
             green = "#00ff00";
             yellow = "#ffff00";
             blue = "#0000ff";
             magenta = "#ff00ff";
             cyan = "#00ffff";
-            bright_red = "#ff9999";
-            bright_green = "#99ff99";
-            bright_yellow = "#ffff99";
-            bright_blue = "#9999ff";
-            bright_magenta = "#ff99ff";
-            bright_cyan = "#99ffff";
           };
         };