From dba4bd2d89450fac0295581f795ea9757921f695 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:56:54 +0200 Subject: [PATCH 01/17] treewide: declare end-of-life for deprecated options Fixes: 6858d08ed012 ("treewide: add soft deprecation dates (#506)") Link: https://github.com/danth/stylix/pull/514 --- modules/nixvim/nixvim.nix | 29 +++++++++++++----- stylix/palette.nix | 63 ++++++++++----------------------------- 2 files changed, 37 insertions(+), 55 deletions(-) diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix index dbc1da661..2c7c8a0ff 100644 --- a/modules/nixvim/nixvim.nix +++ b/modules/nixvim/nixvim.nix @@ -14,15 +14,28 @@ }; imports = [ - # Added: 2024-08-06 - (lib.mkRenamedOptionModule - [ "stylix" "targets" "nixvim" "transparent_bg" "main" ] - [ "stylix" "targets" "nixvim" "transparentBackground" "main" ]) + ( + lib.mkRenamedOptionModuleWith { + from = [ "stylix" "targets" "nixvim" "transparent_bg" "main" ]; + sinceRelease = 2411; + to = [ "stylix" "targets" "nixvim" "transparentBackground" "main" ]; + } + ) - # Added: 2024-08-06 - (lib.mkRenamedOptionModule - [ "stylix" "targets" "nixvim" "transparent_bg" "sign_column" ] - [ "stylix" "targets" "nixvim" "transparentBackground" "signColumn" ]) + ( + lib.mkRenamedOptionModuleWith { + from = [ "stylix" "targets" "nixvim" "transparent_bg" "sign_column" ]; + sinceRelease = 2411; + + to = [ + "stylix" + "targets" + "nixvim" + "transparentBackground" + "signColumn" + ]; + } + ) ]; config = lib.mkIf (config.stylix.enable && config.stylix.targets.nixvim.enable && (config.programs ? nixvim)) ( diff --git a/stylix/palette.nix b/stylix/palette.nix index a6ae3da13..2b5e748af 100644 --- a/stylix/palette.nix +++ b/stylix/palette.nix @@ -23,53 +23,22 @@ let in { # TODO link to doc on how to do instead imports = [ - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base00" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base01" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base02" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base03" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base04" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base05" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base06" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base07" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base08" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base09" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0A" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0B" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0C" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0D" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0E" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0F" ] "Using stylix.palette to override scheme is not supported anymore") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base00" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base01" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base02" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base03" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base04" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base05" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base06" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base07" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base08" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base09" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0A" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0B" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0C" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0D" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0E" ] "Using stylix.palette to override scheme is not supported since 23.05") + (lib.mkRemovedOptionModule [ "stylix" "palette" "base0F" ] "Using stylix.palette to override scheme is not supported since 23.05") ]; options.stylix = { From 4b15fdcc875dac45c37a7bc79d49a3e9a3062ac7 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:05:41 +0200 Subject: [PATCH 02/17] stylix: remove deprecated 'stylix.palette.' options at end-of-life BREAKING CHANGE: Remove the deprecated 'stylix.palette.' options. Link: https://github.com/danth/stylix/pull/514 --- stylix/palette.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/stylix/palette.nix b/stylix/palette.nix index 2b5e748af..7fe9600a5 100644 --- a/stylix/palette.nix +++ b/stylix/palette.nix @@ -21,26 +21,6 @@ let generatedScheme = lib.importJSON paletteJSON; in { - # TODO link to doc on how to do instead - imports = [ - (lib.mkRemovedOptionModule [ "stylix" "palette" "base00" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base01" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base02" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base03" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base04" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base05" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base06" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base07" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base08" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base09" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0A" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0B" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0C" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0D" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0E" ] "Using stylix.palette to override scheme is not supported since 23.05") - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0F" ] "Using stylix.palette to override scheme is not supported since 23.05") - ]; - options.stylix = { polarity = lib.mkOption { type = lib.types.enum [ "either" "light" "dark" ]; From 58b3a70b1d0f93d0edaf36790f24c85f0b0e4041 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:03:06 +0200 Subject: [PATCH 03/17] stylix: bump base16-helix input (#566) Link: https://github.com/danth/stylix/pull/566 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a8ab67b52..2eaa0644a 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1720809814, - "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { From 53bcceb4e46d0b3e8ae6434a7a6bcc3463092093 Mon Sep 17 00:00:00 2001 From: Jez Cope Date: Fri, 20 Sep 2024 11:31:31 +0100 Subject: [PATCH 04/17] wofi: specify font size unit as pt (#552) Link: danth#251 Link: danth#552 Tested-by: cgahr <26804763+cgahr@users.noreply.github.com> Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/wofi/hm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wofi/hm.nix b/modules/wofi/hm.nix index f8268fc15..a614935fe 100644 --- a/modules/wofi/hm.nix +++ b/modules/wofi/hm.nix @@ -13,7 +13,7 @@ in { programs.wofi.style = with colors; '' window { font-family: "${monospace.name}"; - font-size: ${toString sizes.popups}; + font-size: ${toString sizes.popups}pt; background-color: ${base00}; color: ${base05}; From d56d759fbadf2faf5258dfe1b7a94002c6206951 Mon Sep 17 00:00:00 2001 From: Zachary H <39349995+zackattackz@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:55:27 -0400 Subject: [PATCH 05/17] i3status-rust: init (#548) Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/i3status-rust/hm.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/i3status-rust/hm.nix diff --git a/modules/i3status-rust/hm.nix b/modules/i3status-rust/hm.nix new file mode 100644 index 000000000..47fbd727d --- /dev/null +++ b/modules/i3status-rust/hm.nix @@ -0,0 +1,22 @@ +{ config, lib, ... }: + +let + colors = config.lib.stylix.colors.withHashtag; +in +{ + # Merge this with your bar's theme's overrides with //config.lib.stylix.i3status-rust.bar + config.lib.stylix.i3status-rust.bar = with colors; { + idle_bg = base00; + idle_fg = base05; + info_bg = base09; + info_fg = base00; + good_bg = base01; + good_fg = base05; + warning_bg = base0A; + warning_fg = base00; + critical_bg = base08; + critical_fg = base00; + separator_bg = base00; + separator_fg = base05; + }; +} From eccb9f2d63f4582b1c1ffe97d806156147aeee5f Mon Sep 17 00:00:00 2001 From: William <31864305+baduhai@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:12:11 -0300 Subject: [PATCH 06/17] wezterm: support fancy_tab_bar (#564) By default, the fancy tabbar doesn't respect colorschemes, see https://github.com/wez/wezterm/issues/2615. But I've found that if you set the tabbar colors in the config.lua in addition to the colors/stylix.toml file, the fancy tabbar does respect the colors set. This change doesn't affect the retro tab theming, which I made sure to test. --- modules/wezterm/hm.nix | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/wezterm/hm.nix b/modules/wezterm/hm.nix index 230613e88..ab0deea5a 100644 --- a/modules/wezterm/hm.nix +++ b/modules/wezterm/hm.nix @@ -58,9 +58,6 @@ in { local stylix_base_config = wezterm.config_builder() local stylix_user_config = stylix_wrapped_config() stylix_base_config = { - -- Set due to the default fancy tabs not respecting colorschemes - -- See https://github.com/wez/wezterm/issues/2615 - use_fancy_tab_bar = false, color_scheme = "stylix", font = wezterm.font_with_fallback { "${monospace.name}", @@ -86,6 +83,32 @@ in { inactive_titlebar_fg = "${base05}", inactive_titlebar_border_bottom = "${base03}", }, + colors = { + tab_bar = { + background = "${base01}", + inactive_tab_edge = "${base01}", + active_tab = { + bg_color = "${base00}", + fg_color = "${base05}", + }, + inactive_tab = { + bg_color = "${base03}", + fg_color = "${base05}", + }, + inactive_tab_hover = { + bg_color = "${base05}", + fg_color = "${base00}", + }, + new_tab = { + bg_color = "${base03}", + fg_color = "${base05}", + }, + new_tab_hover = { + bg_color = "${base05}", + fg_color = "${base00}", + }, + }, + }, command_palette_bg_color = "${base01}", command_palette_fg_color = "${base05}", command_palette_font_size = ${builtins.toString sizes.popups}, From cf8b6e2d4e8aca8ef14b839a906ab5eb98b08561 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:52:56 +0200 Subject: [PATCH 07/17] stylix: rename `base16-foot`, `base16-tmux`, and `base16-kitty` inputs (#572) --- flake.lock | 104 +++++++++++++++++++++---------------------- flake.nix | 30 ++++++------- modules/foot/hm.nix | 2 +- modules/kitty/hm.nix | 2 +- modules/tmux/hm.nix | 2 +- stylix/templates.nix | 6 +-- 6 files changed, 73 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index 2eaa0644a..c46e75376 100644 --- a/flake.lock +++ b/flake.lock @@ -34,22 +34,6 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { @@ -66,38 +50,6 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -223,17 +175,17 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "systems": "systems" + "systems": "systems", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" } }, "systems": { @@ -250,6 +202,54 @@ "repo": "default", "type": "github" } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d79c0071d..f571fc61d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,26 +5,11 @@ url = "github:tomyun/base16-fish"; }; - base16-foot = { - flake = false; - url = "github:tinted-theming/base16-foot"; - }; - base16-helix = { flake = false; url = "github:tinted-theming/base16-helix"; }; - base16-tmux = { - flake = false; - url = "github:tinted-theming/base16-tmux"; - }; - - base16-kitty = { - flake = false; - url = "github:kdrag0n/base16-kitty"; - }; - base16-vim = { flake = false; url = "github:tinted-theming/base16-vim"; @@ -61,6 +46,21 @@ # Interface flake systems. systems.url = "github:nix-systems/default"; + + tinted-foot = { + flake = false; + url = "github:tinted-theming/tinted-foot"; + }; + + tinted-tmux = { + flake = false; + url = "github:tinted-theming/tinted-tmux"; + }; + + tinted-kitty = { + flake = false; + url = "github:tinted-theming/tinted-kitty"; + }; }; outputs = diff --git a/modules/foot/hm.nix b/modules/foot/hm.nix index d9e191dee..8fa04af43 100644 --- a/modules/foot/hm.nix +++ b/modules/foot/hm.nix @@ -4,7 +4,7 @@ let cfg = config.stylix.targets.foot; theme = config.lib.stylix.colors { - templateRepo = config.lib.stylix.templates.base16-foot; + templateRepo = config.lib.stylix.templates.tinted-foot; }; in { diff --git a/modules/kitty/hm.nix b/modules/kitty/hm.nix index 5c82e8d38..afd517682 100644 --- a/modules/kitty/hm.nix +++ b/modules/kitty/hm.nix @@ -3,7 +3,7 @@ let cfg = config.stylix.targets.kitty; theme = config.lib.stylix.colors { - templateRepo = config.lib.stylix.templates.base16-kitty; + templateRepo = config.lib.stylix.templates.tinted-kitty; target = if cfg.variant256Colors then "default-256" else "default"; }; in { diff --git a/modules/tmux/hm.nix b/modules/tmux/hm.nix index 16d839c87..1eca043ab 100644 --- a/modules/tmux/hm.nix +++ b/modules/tmux/hm.nix @@ -2,7 +2,7 @@ let theme = config.lib.stylix.colors { - templateRepo = config.lib.stylix.templates.base16-tmux; + templateRepo = config.lib.stylix.templates.tinted-tmux; }; in { diff --git a/stylix/templates.nix b/stylix/templates.nix index 8b8b9b159..a3457d0de 100644 --- a/stylix/templates.nix +++ b/stylix/templates.nix @@ -3,12 +3,12 @@ inputs: config.lib.stylix.templates = { inherit (inputs) base16-fish - base16-foot base16-helix - base16-kitty - base16-tmux base16-vim gnome-shell + tinted-foot + tinted-kitty + tinted-tmux ; }; } From 3190239337e420afe0d1d4d4b927388e2d29be22 Mon Sep 17 00:00:00 2001 From: Kilian Mio <86004375+Mikilio@users.noreply.github.com> Date: Thu, 26 Sep 2024 16:25:52 +0200 Subject: [PATCH 08/17] regreet: init (#568) --- modules/regreet/nixos.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/regreet/nixos.nix diff --git a/modules/regreet/nixos.nix b/modules/regreet/nixos.nix new file mode 100644 index 000000000..a9c76da35 --- /dev/null +++ b/modules/regreet/nixos.nix @@ -0,0 +1,33 @@ +{ + pkgs, + config, + lib, + ... +}: + +{ + options.stylix.targets.regreet.enable = config.lib.stylix.mkEnableTarget "ReGreet" true; + + config = + lib.mkIf + (config.stylix.enable && config.stylix.targets.regreet.enable && pkgs.stdenv.hostPlatform.isLinux) + { + programs.regreet = { + settings.background.path = config.stylix.image; + font = { + inherit (config.stylix.fonts.sansSerif) name package; + }; + cursorTheme = { + inherit (config.stylix.cursor) name package; + }; + theme = { + package = pkgs.adw-gtk3; + name = "adw-gtk3"; + }; + extraCss = config.lib.stylix.colors { + template = ./../gtk/gtk.mustache; + extension = "css"; + }; + }; + }; +} From e3eb7fdf8d129ff3676dfbc84ee1262322ca6fb4 Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Thu, 26 Sep 2024 15:57:23 +0100 Subject: [PATCH 09/17] vesktop: replace home.file with xdg.configFile (#575) Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/vesktop/hm.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/vesktop/hm.nix b/modules/vesktop/hm.nix index 81241a734..6ffdb68f8 100644 --- a/modules/vesktop/hm.nix +++ b/modules/vesktop/hm.nix @@ -9,8 +9,6 @@ in options.stylix.targets.vesktop.enable = config.lib.stylix.mkEnableTarget "Vesktop" true; config = lib.mkIf (config.stylix.enable && config.stylix.targets.vesktop.enable) { - home.file."${config.xdg.configHome}/vesktop/themes/stylix.theme.css" = { - source = themeFile; - }; + xdg.configFile."vesktop/themes/stylix.theme.css".source = themeFile; }; } From 1e9ec16a3739f275ec771434c2ad8cff9a54c42e Mon Sep 17 00:00:00 2001 From: diniamo <55629891+diniamo@users.noreply.github.com> Date: Sat, 28 Sep 2024 19:52:44 +0200 Subject: [PATCH 10/17] fuzzel: add missing colors (#578) Fixes: 952ba1c7567c ("Add support for Fuzzel :sparkles:") Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/fuzzel/hm.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/fuzzel/hm.nix b/modules/fuzzel/hm.nix index 62ce2d6b7..7fc835346 100644 --- a/modules/fuzzel/hm.nix +++ b/modules/fuzzel/hm.nix @@ -14,10 +14,14 @@ in { colors = { background = "${base00-hex}${opacity}"; text = "${base05-hex}ff"; + placeholder = "${base03-hex}ff"; + prompt = "${base05-hex}ff"; + input = "${base05-hex}ff"; match = "${base0A-hex}ff"; selection = "${base03-hex}ff"; selection-text = "${base05-hex}ff"; selection-match = "${base0A-hex}ff"; + counter = "${base06-hex}ff"; border = "${base0D-hex}ff"; }; From 0eea8bcb0f9c3c7638e7ee64f98ed9b4ec716830 Mon Sep 17 00:00:00 2001 From: bricked Date: Sun, 29 Sep 2024 18:36:58 +0000 Subject: [PATCH 11/17] spicetify: init (#574) Creates a theme for Spotify, when used in combination with https://github.com/Gerg-L/spicetify-nix --- modules/spicetify/hm.nix | 1 + modules/spicetify/nixos.nix | 1 + modules/spicetify/spicetify.nix | 43 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 modules/spicetify/hm.nix create mode 100644 modules/spicetify/nixos.nix create mode 100644 modules/spicetify/spicetify.nix diff --git a/modules/spicetify/hm.nix b/modules/spicetify/hm.nix new file mode 100644 index 000000000..0b3c9d456 --- /dev/null +++ b/modules/spicetify/hm.nix @@ -0,0 +1 @@ +import ./spicetify.nix diff --git a/modules/spicetify/nixos.nix b/modules/spicetify/nixos.nix new file mode 100644 index 000000000..0b3c9d456 --- /dev/null +++ b/modules/spicetify/nixos.nix @@ -0,0 +1 @@ +import ./spicetify.nix diff --git a/modules/spicetify/spicetify.nix b/modules/spicetify/spicetify.nix new file mode 100644 index 000000000..aa0110dbc --- /dev/null +++ b/modules/spicetify/spicetify.nix @@ -0,0 +1,43 @@ +{ config, options, lib, pkgs, ... }: + +{ + options.stylix.targets.spicetify.enable = + config.lib.stylix.mkEnableTarget "Spicetify" true; + + config = lib.mkIf (config.stylix.enable && config.stylix.targets.spicetify.enable && (config.programs?spicetify)) ( + lib.optionalAttrs (builtins.hasAttr "spicetify" options.programs) { + programs.spicetify = { + theme = { + name = "stylix"; + src = pkgs.writeTextFile { + name = "color.ini"; + destination = "/color.ini"; + text = with config.lib.stylix.colors; '' + [base] + text = ${base05} + subtext = ${base05} + main = ${base00} + main-elevated = ${base02} + highlight = ${base02} + highlight-elevated = ${base03} + sidebar = ${base01} + player = ${base05} + card = ${base04} + shadow = ${base00} + selected-row = ${base05} + button = ${base05} + button-active = ${base05} + button-disabled = ${base04} + tab-active = ${base02} + notification = ${base02} + notification-error = ${base08} + equalizer = ${base0B} + misc = ${base02} + ''; + }; + }; + colorScheme = "base"; + }; + } + ); +} From e7e97059776da7e34b739415a7bc8f80f606b803 Mon Sep 17 00:00:00 2001 From: soulsoiledit Date: Mon, 30 Sep 2024 14:07:55 -0500 Subject: [PATCH 12/17] spicetify: disable sidebar to resolve incompatiblity notification (#579) Disable sidebar configuration to resolve an incompatibility notification on startup. Fixes: 0eea8bcb0f9c ("spicetify: init (#574)") Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/spicetify/spicetify.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/spicetify/spicetify.nix b/modules/spicetify/spicetify.nix index aa0110dbc..2b73b4caf 100644 --- a/modules/spicetify/spicetify.nix +++ b/modules/spicetify/spicetify.nix @@ -35,6 +35,8 @@ misc = ${base02} ''; }; + # Sidebar configuration is incompatible with the default navigation bar + sidebarConfig = false; }; colorScheme = "base"; }; From 39e5435c1da9ce50fe36deaf58bd2b94dd4d8249 Mon Sep 17 00:00:00 2001 From: Soliprem <73885403+Soliprem@users.noreply.github.com> Date: Sun, 6 Oct 2024 21:18:43 +0200 Subject: [PATCH 13/17] fuzzel: remove dpi-aware = "no" (#584) --- modules/fuzzel/hm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/fuzzel/hm.nix b/modules/fuzzel/hm.nix index 7fc835346..6b4547cc1 100644 --- a/modules/fuzzel/hm.nix +++ b/modules/fuzzel/hm.nix @@ -27,7 +27,6 @@ in { main = { font = "${config.stylix.fonts.sansSerif.name}:size=${toString config.stylix.fonts.sizes.popups}"; - dpi-aware = "no"; }; }; } From 087198964d84fb6860596323bb6723277c346b8b Mon Sep 17 00:00:00 2001 From: Jan Olencki Date: Mon, 7 Oct 2024 16:43:17 +0200 Subject: [PATCH 14/17] bat: improve manpage coloring (#585) Improve the manpage coloring, addressing a known issue [1]. [1]: https://github.com/eth-p/bat-extras/blob/36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1/doc/batman.md#caveats Link: https://github.com/danth/stylix/pull/585 Approved-by: Daniel Thwaites Approved-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/bat/base16-stylix.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bat/base16-stylix.mustache b/modules/bat/base16-stylix.mustache index cdcd941f3..13591549d 100644 --- a/modules/bat/base16-stylix.mustache +++ b/modules/bat/base16-stylix.mustache @@ -134,7 +134,7 @@ name Classes scope - support.class, entity.name.class, entity.name.type.class + support.class, entity.name.class, entity.name.type.class, entity.name settings foreground @@ -299,7 +299,7 @@ name Headings scope - markup.heading punctuation.definition.heading, entity.name.section + markup.heading, punctuation.definition.heading, entity.name.section settings fontStyle From 63426a59e714c4389c5a8e559dee05a0087a3043 Mon Sep 17 00:00:00 2001 From: bricked Date: Mon, 7 Oct 2024 14:49:24 +0000 Subject: [PATCH 15/17] forge: init (#573) Link: https://github.com/danth/stylix/pull/573 Approved-by: Daniel Thwaites Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/forge/hm.nix | 13 +++ modules/forge/stylesheet.css.mustache | 140 ++++++++++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 modules/forge/hm.nix create mode 100644 modules/forge/stylesheet.css.mustache diff --git a/modules/forge/hm.nix b/modules/forge/hm.nix new file mode 100644 index 000000000..3c5cab506 --- /dev/null +++ b/modules/forge/hm.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: + +{ + options.stylix.targets.forge.enable = + config.lib.stylix.mkEnableTarget "Forge" true; + + config = lib.mkIf (config.stylix.enable && config.stylix.targets.forge.enable) { + xdg.configFile."forge/stylesheet/forge/stylesheet.css".source = config.lib.stylix.colors { + template = ./stylesheet.css.mustache; + extension = ".css"; + }; + }; +} diff --git a/modules/forge/stylesheet.css.mustache b/modules/forge/stylesheet.css.mustache new file mode 100644 index 000000000..25a9608d9 --- /dev/null +++ b/modules/forge/stylesheet.css.mustache @@ -0,0 +1,140 @@ +.tiled { + color: #{{base0D-hex}}; + opacity: 1; + border-width: 3px; +} + +.split { + color: #{{base0D-hex}}; + opacity: 1; + border-width: 3px; +} + +.stacked { + color: #{{base0D-hex}}; + opacity: 1; + border-width: 3px; +} + +.tabbed { + color: #{{base0D-hex}}; + opacity: 1; + border-width: 3px; +} + +.floated { + color: #{{base0D-hex}}; + border-width: 3px; + opacity: 1; +} + +.window-tiled-border { + border-width: 3px; + border-color: #{{base0D-hex}}; + border-style: solid; + border-radius: 14px; +} + +.window-split-border { + border-width: 3px; + border-color: #{{base0D-hex}}; + border-style: solid; + border-radius: 14px; +} + +.window-split-horizontal { + border-left-width: 0; + border-top-width: 0; + border-bottom-width: 0; +} + +.window-split-vertical { + border-left-width: 0; + border-top-width: 0; + border-right-width: 0; +} + +.window-stacked-border { + border-width: 3px; + border-color: #{{base0D-hex}}; + border-style: solid; + border-radius: 14px; +} + +.window-tabbed-border { + border-width: 3px; + border-color: #{{base0D-hex}}; + border-style: solid; + border-radius: 14px; +} + +.window-tabbed-bg { + border-radius: 8px; +} + +.window-tabbed-tab { + background-color: rgba(54, 47, 45, 1); + border-color: #{{base0D-hex}}9A; + border-width: 1px; + border-radius: 8px; + color: white; + margin: 1px; + box-shadow: 0 0 0 1px rgba(1px 0, 0, 0, 0.2); +} + +.window-tabbed-tab-active { + background-color: #{{base0D-hex}}; + color: black; + box-shadow: 0 0 0 1px rgba(1px 0, 0, 0, 0.2); +} + +.window-tabbed-tab-close { + padding: 3px; + margin: 4px; + border-radius: 16px; + width: 16px; + background-color: #{{base08-hex}}; +} + +.window-tabbed-tab-icon { + margin: 3px; +} + +.window-floated-border { + border-width: 3px; + border-color: #{{base0D-hex}}; + border-style: solid; + border-radius: 14px; +} + +.window-tilepreview-tiled { + border-width: 1px; + border-color: #{{base0D-hex}}4D; + border-style: solid; + border-radius: 14px; + background-color: #{{base0D-hex}}33; +} + +.window-tilepreview-stacked { + border-width: 1px; + border-color: #{{base0D-hex}}66; + border-style: solid; + border-radius: 14px; + background-color: #{{base0D-hex}}4D; +} + +.window-tilepreview-swap { + border-width: 1px; + border-color: #{{base0D-hex}}4D; + border-style: solid; + border-radius: 14px; + background-color: #{{base0D-hex}}4D; +} + +.window-tilepreview-tabbed { + border-width: 1px; + border-color: #{{base0D-hex}}4D; + border-style: solid; + border-radius: 14px; + background-color: #{{base0D-hex}}4D; +} From 5699ba97c60455ebafde0fd4e78ca0a2e5a58282 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:20:26 +0200 Subject: [PATCH 16/17] stylix: bump tinted-kitty input (#588) Closes: https://github.com/danth/stylix/issues/567 Link: https://github.com/danth/stylix/pull/588 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c46e75376..18d60b1c8 100644 --- a/flake.lock +++ b/flake.lock @@ -222,11 +222,11 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "lastModified": 1727867815, + "narHash": "sha256-cghdwzPyve13JFeW+Mpqy/sDswlJ4DTffY24R0R7r/U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "rev": "81b15cb9eb696247af857808d37122188423f73b", "type": "github" }, "original": { From f95022bb6e74f726a87975aec982a5aa9fad8691 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:58:00 +0200 Subject: [PATCH 17/17] stylix: downgrade and lock tinted-kitty input (#589) Downgrade and lock the tinted-kitty input to avoid upstream breaking changes. Considering that Stylix eventually re-implements tinted-kitty's functionality [1], it might be easiest to lock this input to avoid wasted maintenance effort. This downgrade revokes commit 5699ba97c604 ("stylix: bump tinted-kitty input (#588)"), which resolved the issue "bug: inconsistent color between terminals (foot & kitty)" [2] by pulling [3]. Since the desired commit [3] follows the commit introducing the breaking changes [4], it cannot be pulled without resolving these breaking changes. [1]: https://github.com/danth/stylix/issues/534 [2]: https://github.com/danth/stylix/issues/567 [3]: https://github.com/tinted-theming/tinted-kitty/commit/292c7175f7892b786277bfb785287a056ecb2ee5 [4]: https://github.com/tinted-theming/tinted-kitty/commit/9569d8a3e8dad5714174a015d955642641d295fb Link: https://github.com/danth/stylix/issues/571 Link: https://github.com/danth/stylix/pull/589 --- flake.lock | 7 ++++--- flake.nix | 10 +++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 18d60b1c8..3376449a0 100644 --- a/flake.lock +++ b/flake.lock @@ -222,16 +222,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1727867815, - "narHash": "sha256-cghdwzPyve13JFeW+Mpqy/sDswlJ4DTffY24R0R7r/U=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "81b15cb9eb696247af857808d37122188423f73b", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f571fc61d..66f9f6dc1 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,15 @@ tinted-kitty = { flake = false; - url = "github:tinted-theming/tinted-kitty"; + + # Lock the tinted-kitty input to prevent upstream breaking changes. + # + # Considering that Stylix eventually re-implements this input's + # functionality [1], it might be easiest to lock this input to avoid + # wasted maintenance effort. + # + # [1]: https://github.com/danth/stylix/issues/534 + url = "github:tinted-theming/tinted-kitty/eb39e141db14baef052893285df9f266df041ff8"; }; };