From b4708e41c0b74df95f537ae2f6e78d3ef6daabf5 Mon Sep 17 00:00:00 2001 From: twoneis Date: Mon, 19 Aug 2024 16:21:32 +0200 Subject: [PATCH] colors in alacritty follow theme option --- modules/apps/alacritty.conf.nix | 226 +++++++------------------------- modules/apps/programs.nix | 2 +- 2 files changed, 48 insertions(+), 180 deletions(-) diff --git a/modules/apps/alacritty.conf.nix b/modules/apps/alacritty.conf.nix index ec44163..b4f4ff0 100644 --- a/modules/apps/alacritty.conf.nix +++ b/modules/apps/alacritty.conf.nix @@ -1,38 +1,40 @@ -{ +{ config, ... }: let + inherit (config) theme; +in { # Rose Pine colors = { primary = { - foreground = "#e0def4"; - background = "#191724"; - dim_foreground = "#908caa"; - bright_foreground = "#e0def4"; + foreground = theme.text; + background = theme.base; + dim_foreground = theme.subtle; + bright_foreground = theme.text; }; cursor = { - text = "#e0def4"; - cursor = "#524f67"; + text = theme.text; + cursor = theme.highlight-high; }; vi_mode_cursor = { - text = "#e0def4"; - cursor = "#524f67"; + text = theme.text; + cursor = theme.highlight-high; }; search = { matches = { - foreground = "#908caa"; - background = "#26233a"; + foreground = theme.subtle; + background = theme.overlay; }; focused_match = { - foreground = "#191724"; - background = "#ebbcba"; + foreground = theme.base; + background = theme.rose; }; }; hints = { start = { - foreground = "#908caa"; - background = "#1f1d2e"; + foreground = theme.subtle; + background = theme.surface; }; end = { - foreground = "#6e6a86"; - background = "#1f1d2e"; + foreground = theme.muted; + background = theme.surface; }; }; line_indicator = { @@ -40,178 +42,44 @@ background = "None"; }; footer_bar = { - foreground = "#e0def4"; - background = "#1f1d2e"; + foreground = theme.text; + background = theme.surface; }; selection = { - text = "#e0def4"; - background = "#1f1d2e"; + text = theme.text; + background = theme.surface; }; normal = { - black = "#26233a"; - red = "#eb6f92"; - green = "#31748f"; - yellow = "#f6c177"; - blue = "#9ccfd8"; - magenta = "#c4a7e7"; - cyan = "#ebbcba"; - white = "#e0def4"; + black = theme.overlay; + red = theme.love; + green = theme.pine; + yellow = theme.gold; + blue = theme.foam; + magenta = theme.iris; + cyan = theme.rose; + white = theme.text; }; bright = { - black = "#6e6a86"; - red = "#eb6f92"; - green = "#31748f"; - yellow = "#f6c177"; - blue = "#9ccfd8"; - magenta = "#c4a7e7"; - cyan = "#ebbcba"; - white = "#e0def4"; + black = theme.muted; + red = theme.love; + green = theme.pine; + yellow = theme.gold; + blue = theme.foam; + magenta = theme.iris; + cyan = theme.rose; + white = theme.text; }; dim = { - black = "#6e6a86"; - red = "#eb6f92"; - green = "#31748f"; - yellow = "#f6c177"; - blue = "#9ccfd8"; - magenta = "#c4a7e7"; - cyan = "#ebbcba"; - white = "#e0def4"; + black = theme.muted; + red = theme.love; + green = theme.pine; + yellow = theme.gold; + blue = theme.foam; + magenta = theme.iris; + cyan = theme.rose; + white = theme.text; }; }; - # Rose Pine (old) - # colors = { - # primary = { - # background = "0x191724"; - # foreground = "0xe0def4"; - # }; - # cursor = { - # text = "0xe0def4"; - # cursor = "0x524f67"; - # }; - # vi_mode_cursor = { - # text = "0xe0def4"; - # cursor = "0x524f67"; - # }; - # line_indicator = { - # foreground = "None"; - # background = "None"; - # }; - # selection = { - # text = "0xe0def4"; - # background = "0x403d52"; - # }; - # normal = { - # black = "0x26233a"; - # red = "0xeb6f92"; - # green = "0x31748f"; - # yellow = "0xf6c177"; - # blue = "0x9ccfd8"; - # magenta = "0xc4a7e7"; - # cyan = "0xebbcba"; - # white = "0xe0def4"; - # }; - # bright = { - # black = "0x6e6a86"; - # red = "0xeb6f92"; - # green = "0x31748f"; - # yellow = "0xf6c177"; - # blue = "0x9ccfd8"; - # magenta = "0xc4a7e7"; - # cyan = "0xebbcba"; - # white = "0xe0def4"; - # }; - # hints = { - # start = { - # foreground = "#908caa"; - # background = "#1f1d2e"; - # }; - # end = { - # foreground = "#6e6a86"; - # background = "#1f1d2e"; - # }; - # }; - # }; - - # # Rose Pine Dawn - # colors = { - # primary = { - # foreground = "#575279"; - # background = "#faf4ed"; - # dim_foreground = "#797593"; - # bright_foreground = "#575279"; - # }; - # cursor = { - # text = "#575279"; - # cursor = "#cecacd"; - # }; - # vi_mode_cursor = { - # text = "#575279"; - # cursor = "#cecacd"; - # }; - # search = { - # matches = { - # foreground = "#797593"; - # background = "#f2e9e1"; - # }; - # focused_match = { - # foreground = "#faf4ed"; - # background = "#d7827e"; - # }; - # }; - # hints = { - # start = { - # foreground = "#797593"; - # background = "#fffaf3"; - # }; - # end = { - # foreground = "#9893a5"; - # background = "#fffaf3"; - # }; - # }; - # line_indicator = { - # foreground = "None"; - # background = "None"; - # }; - # footer_bar = { - # foreground = "#575279"; - # background = "#fffaf3"; - # }; - # selection = { - # text = "#575279"; - # background = "#dfdad9"; - # }; - # normal = { - # black = "#f2e9e1"; - # red = "#b4637a"; - # green = "#286983"; - # yellow = "#ea9d34"; - # blue = "#56949f"; - # magenta = "#907aa9"; - # cyan = "#d7827e"; - # white = "#575279"; - # }; - # bright = { - # black = "#9893a5"; - # red = "#b4637a"; - # green = "#286983"; - # yellow = "#ea9d34"; - # blue = "#56949f"; - # magenta = "#907aa9"; - # cyan = "#d7827e"; - # white = "#575279"; - # }; - # dim = { - # black = "#9893a5"; - # red = "#b4637a"; - # green = "#286983"; - # yellow = "#ea9d34"; - # blue = "#56949f"; - # magenta = "#907aa9"; - # cyan = "#d7827e"; - # white = "#575279"; - # }; - # }; - window.decorations = "None"; } diff --git a/modules/apps/programs.nix b/modules/apps/programs.nix index c7cc542..034f63a 100644 --- a/modules/apps/programs.nix +++ b/modules/apps/programs.nix @@ -47,7 +47,7 @@ in { programs.alacritty = { enable = true; - settings = import ./alacritty.conf.nix; + settings = import ./alacritty.conf.nix { config = config; }; }; }; };