From 2cf5964f558d310fa9b6fe34bcd930545120ee6d Mon Sep 17 00:00:00 2001
From: Zeremonienmeister Berber Aab <git@zmberber.com>
Date: Tue, 18 Nov 2025 15:45:33 +0100
Subject: [PATCH 1/2] xresources:  align with Tinted Theming template

Closes: https://github.com/nix-community/stylix/issues/1979
Link: https://github.com/tinted-theming/tinted-xresources/blob/e76cd58c968ccac8e031eafdbffd1d42d493a096/templates/base16.mustache
---
 modules/xresources/hm.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/xresources/hm.nix b/modules/xresources/hm.nix
index b8ae62d7..3a9fafb8 100644
--- a/modules/xresources/hm.nix
+++ b/modules/xresources/hm.nix
@@ -29,14 +29,20 @@ mkTarget {
           "*color5" = base0E;
           "*color6" = base0C;
           "*color7" = base05;
-          "*color8" = base03;
-          "*color9" = base09;
-          "*color10" = base01;
-          "*color11" = base02;
-          "*color12" = base04;
-          "*color13" = base06;
-          "*color14" = base0F;
+          "*color8" = base02;
+          "*color9" = base08;
+          "*color10" = base0B;
+          "*color11" = base0A;
+          "*color12" = base0D;
+          "*color13" = base0E;
+          "*color14" = base0C;
           "*color15" = base07;
+          "*color16" = base09;
+          "*color17" = base0F;
+          "*color18" = base01;
+          "*color19" = base02;
+          "*color20" = base04;
+          "*color21" = base06;
         };
       }
     )

From c3f66a0d6bfa9d18ac490be29ff1f8e1fba6c123 Mon Sep 17 00:00:00 2001
From: Zeremonienmeister Berber Aab <git@zmberber.com>
Date: Tue, 18 Nov 2025 20:44:55 +0100
Subject: [PATCH 2/2] xresources: add berber to maintainers

---
 generated/all-maintainers.nix | 6 ++++++
 modules/xresources/meta.nix   | 3 ++-
 stylix/maintainers.nix        | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/generated/all-maintainers.nix b/generated/all-maintainers.nix
index 93606cec..9b097610 100644
--- a/generated/all-maintainers.nix
+++ b/generated/all-maintainers.nix
@@ -239,4 +239,10 @@
     githubId = 41439633;
     name = "Vidhan Bhatt";
   };
+  zmberber = {
+    email = "git@zmberber.com";
+    github = "zmberber";
+    githubId = 29400525;
+    name = "Zeremonienmeister Berber Aab";
+  };
 }
diff --git a/modules/xresources/meta.nix b/modules/xresources/meta.nix
index 5031e37b..7058fd00 100644
--- a/modules/xresources/meta.nix
+++ b/modules/xresources/meta.nix
@@ -1,5 +1,6 @@
+{ lib, ... }:
 {
   name = "Xresources file";
   homepage = "https://www.x.org/wiki";
-  maintainers = [ ];
+  maintainers = [ lib.maintainers.berber ];
 }
diff --git a/stylix/maintainers.nix b/stylix/maintainers.nix
index 7972420a..67d0ac70 100644
--- a/stylix/maintainers.nix
+++ b/stylix/maintainers.nix
@@ -7,6 +7,12 @@
 # [1]: https://github.com/NixOS/nixpkgs/blob/1da63e6cc622a0cb6fd5b86d49923e4eb1e33b70/maintainers/maintainer-list.nix
 {
   # keep-sorted start case=no numeric=no block=yes
+  berber = {
+    email = "git@zmberber.com";
+    name = "Zeremonienmeister Berber Aab";
+    github = "zmberber";
+    githubId = 29400525;
+  };
   butzist = {
     email = "adam@szalkowski.de";
     name = "Adam M. Szalkowski";