From 06d93928d42a4bd5489befbee8d95c395ee56455 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sun, 18 Jan 2026 15:01:21 +0100 Subject: [PATCH 1/4] gtksourceview/template: align description with other themes (#2124) Align the description with the /modules/discord/common/theme-header.nix and /modules/vscode/package.json themes. Link: https://github.com/nix-community/stylix/pull/2124 Reviewed-by: bricked (cherry picked from commit 06684f00cfbee14da96fd4307b966884de272d3a) --- modules/gtksourceview/template.xml.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gtksourceview/template.xml.mustache b/modules/gtksourceview/template.xml.mustache index e8a4ed01..1c8fc226 100644 --- a/modules/gtksourceview/template.xml.mustache +++ b/modules/gtksourceview/template.xml.mustache @@ -2,7 +2,7 @@ Stylix - <_description>Theme configured as part of your NixOS configuration. + <_description>Theme configured via NixOS or Home Manager. From 63fa437f134cc1c99e8849c00432a0ca283cae6b Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sun, 11 Jan 2026 13:27:54 +0100 Subject: [PATCH 2/4] stylix/mk-target: add missing comma to function arguments Fixes: c4fa684471d9 ("stylix: add mkTarget function") (cherry picked from commit bbcaeec0a62ad5bd84f950e7c8834f7ab8a89033) --- stylix/mk-target.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylix/mk-target.nix b/stylix/mk-target.nix index 9b29f5b4..ecd1ab1f 100644 --- a/stylix/mk-target.nix +++ b/stylix/mk-target.nix @@ -17,7 +17,7 @@ follows: ```nix - { mkTarget, lib... }: + { mkTarget, lib, ... }: mkTarget { unconditionalConfig = lib.mkIf complexCondition { From a387b3ac6c032e23f9a4c21cd2dd54c32edfa849 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sat, 10 Jan 2026 21:05:39 +0100 Subject: [PATCH 3/4] stylix/mk-target: remove redundant unconditionalConfig argument Remove the redundant unconditionalConfig argument to simplify the interface, as it is a subset of the existing config argument: { mkTarget, ... }: mkTarget { - unconditionalConfig = + config = _: lib.mkIf complexCondition { home.packages = [ pkgs.hello ]; }; } (cherry picked from commit 75e660b6a07af6fc4d1d7aeff6f2f5ddaefc52e5) --- stylix/mk-target.nix | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/stylix/mk-target.nix b/stylix/mk-target.nix index ecd1ab1f..2edf705d 100644 --- a/stylix/mk-target.nix +++ b/stylix/mk-target.nix @@ -19,11 +19,6 @@ ```nix { mkTarget, lib, ... }: mkTarget { - unconditionalConfig = - lib.mkIf complexCondition { - home.packages = [ pkgs.hello ]; - }; - config = [ { programs.«name».theme.name = "stylix"; } @@ -125,11 +120,6 @@ : The target name used to generate options in the `stylix.targets.${name}` namespace. - `unconditionalConfig` (Attribute set or function or path) - : This argument mirrors the `config` argument but intentionally lacks - automatic safeguarding and should only be used for complex configurations - where `config` is unsuitable. - # Environment The function is provided alongside module arguments in any modules imported @@ -143,12 +133,6 @@ # of modules: # # { -# unconditionalConfig = -# { lib, pkgs }: -# lib.mkIf complexCondition { -# home.packages = [ pkgs.hello ]; -# }; -# # config = [ # { programs.example.theme.name = "stylix"; } # @@ -182,7 +166,6 @@ in imports ? [ ], name ? name', options ? [ ], - unconditionalConfig ? { }, }@args: let mkTargetConfig = config; @@ -341,10 +324,7 @@ let config.lib.stylix.mkEnableTargetWith enableArgs; config = lib.mkIf (config.stylix.enable && cfg.enable) ( - lib.mkMerge ( - lib.singleton (callModule false unconditionalConfig) - ++ map (callModule true) normalizedConfig - ) + lib.mkMerge (map (callModule true) normalizedConfig) ); }; in From 296aa01b461af5146612cd26cc115c1d3e5ed4ae Mon Sep 17 00:00:00 2001 From: Tim Kleinschmidt Date: Sun, 4 Jan 2026 21:45:56 +0100 Subject: [PATCH 4/4] opencode: brighten default text colors (#2100) Using base09 for diff hunk headers and base0A for markdown block quotes made neutral UI elements look urgent. Markdown code blocks also reused the default text color as a background, reducing contrast. Return these components to neutral backgrounds instead: keep diff hunk headers on base03, block quotes on base03/base01, and code blocks on base01 so warnings stay on base0A and urgency cues remain meaningful. Link: https://github.com/nix-community/stylix/pull/2100 Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Approved-by: NAHO <90870942+trueNAHO@users.noreply.github.com> Tested-by: Mirza Arnaut Approved-by: Mirza Arnaut (cherry picked from commit b135edbdd403896d1ef507934c045f716deb5609) --- modules/opencode/hm.nix | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/opencode/hm.nix b/modules/opencode/hm.nix index ce83cfe2..3d983e2f 100644 --- a/modules/opencode/hm.nix +++ b/modules/opencode/hm.nix @@ -12,7 +12,7 @@ mkTarget { themes.${theme} = { theme = { accent = { - dark = colors.withHashtag.base07; + dark = colors.withHashtag.base0F; light = colors.withHashtag.base07; }; background = { @@ -72,7 +72,7 @@ mkTarget { light = colors.withHashtag.base03; }; diffLineNumber = { - dark = colors.withHashtag.base02; + dark = colors.withHashtag.base03; light = colors.withHashtag.base04; }; diffRemoved = { @@ -97,26 +97,26 @@ mkTarget { }; markdownBlockQuote = { dark = colors.withHashtag.base03; - light = colors.withHashtag.base03; + light = colors.withHashtag.base01; }; markdownCode = { dark = colors.withHashtag.base0B; light = colors.withHashtag.base0B; }; markdownCodeBlock = { - dark = colors.withHashtag.base04; + dark = colors.withHashtag.base01; light = colors.withHashtag.base00; }; markdownEmph = { - dark = colors.withHashtag.base09; + dark = colors.withHashtag.base0A; light = colors.withHashtag.base09; }; markdownHeading = { - dark = colors.withHashtag.base0C; + dark = colors.withHashtag.base0E; light = colors.withHashtag.base0F; }; markdownHorizontalRule = { - dark = colors.withHashtag.base03; + dark = colors.withHashtag.base04; light = colors.withHashtag.base03; }; markdownImage = { @@ -124,7 +124,7 @@ mkTarget { light = colors.withHashtag.base0D; }; markdownImageText = { - dark = colors.withHashtag.base07; + dark = colors.withHashtag.base0C; light = colors.withHashtag.base07; }; markdownLink = { @@ -132,31 +132,31 @@ mkTarget { light = colors.withHashtag.base0D; }; markdownLinkText = { - dark = colors.withHashtag.base07; + dark = colors.withHashtag.base0C; light = colors.withHashtag.base07; }; markdownListEnumeration = { - dark = colors.withHashtag.base07; + dark = colors.withHashtag.base0C; light = colors.withHashtag.base07; }; markdownListItem = { - dark = colors.withHashtag.base0C; + dark = colors.withHashtag.base0D; light = colors.withHashtag.base0F; }; markdownStrong = { - dark = colors.withHashtag.base0A; + dark = colors.withHashtag.base09; light = colors.withHashtag.base0A; }; markdownText = { - dark = colors.withHashtag.base04; + dark = colors.withHashtag.base05; light = colors.withHashtag.base00; }; primary = { - dark = colors.withHashtag.base0C; + dark = colors.withHashtag.base0D; light = colors.withHashtag.base0F; }; secondary = { - dark = colors.withHashtag.base0D; + dark = colors.withHashtag.base0E; light = colors.withHashtag.base0D; }; success = { @@ -164,29 +164,29 @@ mkTarget { light = colors.withHashtag.base0B; }; syntaxComment = { - dark = colors.withHashtag.base03; + dark = colors.withHashtag.base04; light = colors.withHashtag.base03; }; syntaxFunction = { - dark = colors.withHashtag.base0C; + dark = colors.withHashtag.base0D; light = colors.withHashtag.base0C; }; syntaxKeyword = { - dark = colors.withHashtag.base0D; + dark = colors.withHashtag.base0E; light = colors.withHashtag.base0D; }; syntaxNumber = { - dark = colors.withHashtag.base0E; + dark = colors.withHashtag.base09; light = colors.withHashtag.base0E; }; syntaxOperator = { - dark = colors.withHashtag.base0D; + dark = colors.withHashtag.base0C; light = colors.withHashtag.base0D; }; syntaxPunctuation = { - dark = colors.withHashtag.base04; + dark = colors.withHashtag.base05; light = colors.withHashtag.base00; }; syntaxString = { @@ -194,7 +194,7 @@ mkTarget { light = colors.withHashtag.base0B; }; syntaxType = { - dark = colors.withHashtag.base07; + dark = colors.withHashtag.base0A; light = colors.withHashtag.base07; }; syntaxVariable = { @@ -202,16 +202,16 @@ mkTarget { light = colors.withHashtag.base07; }; text = { - dark = colors.withHashtag.base04; + dark = colors.withHashtag.base05; light = colors.withHashtag.base00; }; textMuted = { - dark = colors.withHashtag.base03; + dark = colors.withHashtag.base04; light = colors.withHashtag.base01; }; warning = { - dark = colors.withHashtag.base09; - light = colors.withHashtag.base09; + dark = colors.withHashtag.base0A; + light = colors.withHashtag.base0A; }; }; };