switch to base16 project-wide
This commit is contained in:
parent
d3100b7d7f
commit
e1c716ef8c
GPG key ID:
00F325187C68651A
28 changed files with 847 additions and 810 deletions
|
|
@ -36,7 +36,7 @@
|
|||
gtk = {
|
||||
enable = true;
|
||||
|
||||
colorScheme = if config.userOptions.isDark then "dark" else "light";
|
||||
# colorScheme = if config.userOptions.isDark then "dark" else "light";
|
||||
|
||||
# theme = {
|
||||
# package = pkgs.kdePackages.breeze-gtk;
|
||||
|
|
@ -46,8 +46,14 @@
|
|||
# else "Breeze";
|
||||
# };
|
||||
|
||||
# iconTheme = {
|
||||
# name = if config.userOptions.isDark then "Colloid-Dark" else "Colloid-Light";
|
||||
# package = pkgs.colloid-icon-theme;
|
||||
# };
|
||||
|
||||
colorScheme = "dark";
|
||||
iconTheme = {
|
||||
name = if config.userOptions.isDark then "Colloid-Dark" else "Colloid-Light";
|
||||
name = "Colloid-Dark";
|
||||
package = pkgs.colloid-icon-theme;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,106 +1,98 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
colors = pkgs.catppuccin.hex.${config.catppuccin.flavor};
|
||||
|
||||
mkColorSection = name: value: "@define-color ${name} ${value};";
|
||||
|
||||
generateCSS = ''
|
||||
/* Catppuccin ${lib.toUpper (builtins.substring 0 1 config.catppuccin.flavor)}${
|
||||
builtins.substring 1 (-1) config.catppuccin.flavor
|
||||
} ${lib.toUpper (builtins.substring 0 1 config.catppuccin.accent)}${
|
||||
builtins.substring 1 (-1) config.catppuccin.accent
|
||||
} Palette */
|
||||
generateCSS = with config.scheme.withHashtag; ''
|
||||
/* Kova's Nixified GTK */
|
||||
|
||||
/* Base colors */
|
||||
${mkColorSection "window_bg_color" colors.base}
|
||||
${mkColorSection "window_fg_color" colors.text}
|
||||
${mkColorSection "window_bg_color" base00}
|
||||
${mkColorSection "window_fg_color" base05}
|
||||
|
||||
/* View styling */
|
||||
${mkColorSection "view_bg_color" colors.base}
|
||||
${mkColorSection "view_fg_color" colors.text}
|
||||
${mkColorSection "view_bg_color" base00}
|
||||
${mkColorSection "view_fg_color" base05}
|
||||
|
||||
/* Header bar */
|
||||
${mkColorSection "headerbar_bg_color" colors.mantle}
|
||||
${mkColorSection "headerbar_backdrop_color" colors.mantle}
|
||||
${mkColorSection "headerbar_fg_color" colors.text}
|
||||
${mkColorSection "headerbar_bg_color" base10}
|
||||
${mkColorSection "headerbar_backdrop_color" base10}
|
||||
${mkColorSection "headerbar_fg_color" base05}
|
||||
|
||||
/* Popovers and dialogs */
|
||||
${mkColorSection "popover_bg_color" colors.base}
|
||||
${mkColorSection "popover_fg_color" colors.text}
|
||||
${mkColorSection "popover_bg_color" base00}
|
||||
${mkColorSection "popover_fg_color" base05}
|
||||
@define-color dialog_bg_color @popover_bg_color;
|
||||
@define-color dialog_fg_color @popover_fg_color;
|
||||
|
||||
/* Cards and sidebars */
|
||||
${mkColorSection "card_bg_color" colors.mantle}
|
||||
${mkColorSection "card_fg_color" colors.text}
|
||||
${mkColorSection "sidebar_bg_color" colors.mantle}
|
||||
${mkColorSection "sidebar_fg_color" colors.text}
|
||||
${mkColorSection "card_bg_color" base10}
|
||||
${mkColorSection "card_fg_color" base05}
|
||||
${mkColorSection "sidebar_bg_color" base10}
|
||||
${mkColorSection "sidebar_fg_color" base05}
|
||||
@define-color sidebar_backdrop_color @sidebar_bg_color;
|
||||
${mkColorSection "sidebar_border_color" colors.surface0}
|
||||
${mkColorSection "sidebar_border_color" base01}
|
||||
@define-color secondary_sidebar_bg_color @sidebar_bg_color;
|
||||
@define-color secondary_sidebar_fg_color @sidebar_fg_color;
|
||||
@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
|
||||
@define-color secondary_sidebar_border_color @sidebar_border_color;
|
||||
|
||||
/* Catppuccin accent colors */
|
||||
${mkColorSection "blue_1" colors.blue}
|
||||
${mkColorSection "blue_2" colors.sapphire}
|
||||
${mkColorSection "blue_3" colors.sky}
|
||||
${mkColorSection "blue_4" colors.teal}
|
||||
${mkColorSection "blue_5" colors.lavender}
|
||||
${mkColorSection "blue_1" base0D}
|
||||
${mkColorSection "blue_2" base16}
|
||||
${mkColorSection "blue_3" base15}
|
||||
${mkColorSection "blue_4" base0C}
|
||||
${mkColorSection "blue_5" base07}
|
||||
|
||||
${mkColorSection "green_1" colors.green}
|
||||
${mkColorSection "green_2" colors.teal}
|
||||
${mkColorSection "green_3" colors.sky}
|
||||
${mkColorSection "green_4" colors.sapphire}
|
||||
${mkColorSection "green_5" colors.blue}
|
||||
${mkColorSection "green_1" base0B}
|
||||
${mkColorSection "green_2" base0C}
|
||||
${mkColorSection "green_3" base15}
|
||||
${mkColorSection "green_4" base16}
|
||||
${mkColorSection "green_5" base0D}
|
||||
|
||||
${mkColorSection "yellow_1" colors.yellow}
|
||||
${mkColorSection "yellow_2" colors.peach}
|
||||
${mkColorSection "yellow_3" colors.yellow}
|
||||
${mkColorSection "yellow_4" colors.red}
|
||||
${mkColorSection "yellow_5" colors.maroon}
|
||||
${mkColorSection "yellow_1" base0A}
|
||||
${mkColorSection "yellow_2" base09}
|
||||
${mkColorSection "yellow_3" base0A}
|
||||
${mkColorSection "yellow_4" base08}
|
||||
${mkColorSection "yellow_5" base12}
|
||||
|
||||
${mkColorSection "orange_1" colors.peach}
|
||||
${mkColorSection "orange_2" colors.red}
|
||||
${mkColorSection "orange_3" colors.maroon}
|
||||
${mkColorSection "orange_4" colors.yellow}
|
||||
${mkColorSection "orange_5" colors.green}
|
||||
${mkColorSection "orange_1" base09}
|
||||
${mkColorSection "orange_2" base08}
|
||||
${mkColorSection "orange_3" base12}
|
||||
${mkColorSection "orange_4" base0A}
|
||||
${mkColorSection "orange_5" base0B}
|
||||
|
||||
${mkColorSection "red_1" colors.red}
|
||||
${mkColorSection "red_2" colors.maroon}
|
||||
${mkColorSection "red_3" colors.pink}
|
||||
${mkColorSection "red_4" colors.flamingo}
|
||||
${mkColorSection "red_5" colors.rosewater}
|
||||
${mkColorSection "red_1" base08}
|
||||
${mkColorSection "red_2" base12}
|
||||
${mkColorSection "red_3" base17}
|
||||
${mkColorSection "red_4" base0F}
|
||||
${mkColorSection "red_5" base13}
|
||||
|
||||
${mkColorSection "purple_1" colors.mauve}
|
||||
${mkColorSection "purple_2" colors.lavender}
|
||||
${mkColorSection "purple_3" colors.pink}
|
||||
${mkColorSection "purple_4" colors.flamingo}
|
||||
${mkColorSection "purple_5" colors.rosewater}
|
||||
${mkColorSection "purple_1" base0E}
|
||||
${mkColorSection "purple_2" base07}
|
||||
${mkColorSection "purple_3" base17}
|
||||
${mkColorSection "purple_4" base0F}
|
||||
${mkColorSection "purple_5" base13}
|
||||
|
||||
${mkColorSection "brown_1" colors.surface2}
|
||||
${mkColorSection "brown_2" colors.overlay0}
|
||||
${mkColorSection "brown_3" colors.overlay1}
|
||||
${mkColorSection "brown_4" colors.overlay2}
|
||||
${mkColorSection "brown_5" colors.subtext1}
|
||||
${mkColorSection "brown_1" base02}
|
||||
${mkColorSection "brown_2" base03}
|
||||
${mkColorSection "brown_3" base03}
|
||||
${mkColorSection "brown_4" base03}
|
||||
${mkColorSection "brown_5" base04}
|
||||
|
||||
${mkColorSection "light_1" colors.text}
|
||||
${mkColorSection "light_2" colors.subtext0}
|
||||
${mkColorSection "light_3" colors.subtext1}
|
||||
${mkColorSection "light_4" colors.blue}
|
||||
${mkColorSection "light_5" colors.overlay0}
|
||||
${mkColorSection "light_1" base05}
|
||||
${mkColorSection "light_2" base04}
|
||||
${mkColorSection "light_3" base04}
|
||||
${mkColorSection "light_4" base0D}
|
||||
${mkColorSection "light_5" base03}
|
||||
|
||||
${mkColorSection "dark_1" colors.surface0}
|
||||
${mkColorSection "dark_2" colors.surface1}
|
||||
${mkColorSection "dark_3" colors.surface2}
|
||||
${mkColorSection "dark_4" colors.mantle}
|
||||
${mkColorSection "dark_5" colors.crust}
|
||||
${mkColorSection "dark_1" base01}
|
||||
${mkColorSection "dark_2" base02}
|
||||
${mkColorSection "dark_3" base02}
|
||||
${mkColorSection "dark_4" base10}
|
||||
${mkColorSection "dark_5" base11}
|
||||
|
||||
/* Custom rules */
|
||||
toast {
|
||||
|
|
@ -118,7 +110,7 @@ let
|
|||
}
|
||||
|
||||
/* Accent */
|
||||
${mkColorSection "accent_bg_color" colors.${config.catppuccin.accent}}
|
||||
${mkColorSection "accent_bg_color" base09}
|
||||
@define-color accent_fg_color @window_bg_color;
|
||||
'';
|
||||
in
|
||||
|
|
|
|||
|
|
@ -34,82 +34,82 @@
|
|||
};
|
||||
|
||||
ColorScheme =
|
||||
with config.scheme;
|
||||
let
|
||||
c = pkgs.catppuccin.bare.${config.catppuccin.flavor};
|
||||
accent = c.${config.catppuccin.accent};
|
||||
accent = base09;
|
||||
mkColors = roles: builtins.concatStringsSep ", " (map (r: "#ff${r}") roles);
|
||||
in
|
||||
{
|
||||
active_colors = mkColors [
|
||||
c.text
|
||||
c.surface0
|
||||
c.surface1
|
||||
c.surface0
|
||||
c.base
|
||||
c.mantle
|
||||
c.text
|
||||
c.text
|
||||
c.text
|
||||
c.base
|
||||
c.mantle
|
||||
c.crust
|
||||
base05
|
||||
base01
|
||||
base02
|
||||
base01
|
||||
base00
|
||||
base10
|
||||
base05
|
||||
base05
|
||||
base05
|
||||
base00
|
||||
base10
|
||||
base11
|
||||
accent
|
||||
c.base
|
||||
base00
|
||||
accent
|
||||
c.mauve
|
||||
c.mantle
|
||||
base0E
|
||||
base10
|
||||
"000000"
|
||||
c.base
|
||||
c.text
|
||||
c.overlay0
|
||||
base00
|
||||
base05
|
||||
base03
|
||||
accent
|
||||
];
|
||||
disabled_colors = mkColors [
|
||||
c.overlay0
|
||||
c.surface0
|
||||
c.surface1
|
||||
c.surface0
|
||||
c.overlay0
|
||||
c.mantle
|
||||
c.overlay0
|
||||
c.text
|
||||
c.overlay0
|
||||
c.surface0
|
||||
c.surface0
|
||||
c.mantle
|
||||
c.overlay1
|
||||
c.text
|
||||
base03
|
||||
base01
|
||||
base02
|
||||
base01
|
||||
base03
|
||||
base10
|
||||
base03
|
||||
base05
|
||||
base03
|
||||
base01
|
||||
base01
|
||||
base10
|
||||
base03
|
||||
base05
|
||||
"0000ff"
|
||||
"ff00ff"
|
||||
c.surface0
|
||||
base01
|
||||
"000000"
|
||||
c.surface0
|
||||
c.base
|
||||
base01
|
||||
base00
|
||||
"80000000"
|
||||
c.overlay1
|
||||
base03
|
||||
];
|
||||
inactive_colors = mkColors [
|
||||
c.text
|
||||
c.surface0
|
||||
c.surface1
|
||||
c.surface0
|
||||
c.base
|
||||
c.mantle
|
||||
c.text
|
||||
c.text
|
||||
c.text
|
||||
c.base
|
||||
c.mantle
|
||||
c.crust
|
||||
base05
|
||||
base01
|
||||
base02
|
||||
base01
|
||||
base00
|
||||
base10
|
||||
base05
|
||||
base05
|
||||
base05
|
||||
base00
|
||||
base10
|
||||
base11
|
||||
accent
|
||||
c.base
|
||||
base00
|
||||
accent
|
||||
c.mauve
|
||||
c.mantle
|
||||
base0E
|
||||
base10
|
||||
"000000"
|
||||
c.base
|
||||
c.text
|
||||
c.overlay0
|
||||
base00
|
||||
base05
|
||||
base03
|
||||
accent
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue