some accent stuff
This commit is contained in:
parent
af72f39c2e
commit
76396da7ba
2 changed files with 8 additions and 6 deletions
|
@ -5,16 +5,17 @@ let
|
||||||
cfg = config.modules.desktop.themes;
|
cfg = config.modules.desktop.themes;
|
||||||
accent = "pink";
|
accent = "pink";
|
||||||
variant = "mocha";
|
variant = "mocha";
|
||||||
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
|
colorScheme = inputs.nix-colors.colorSchemes.${"catppuccin-${variant}"};
|
||||||
|
pascalCase = s: (toUpper (substring 0 1 s)) + (toLower (substring 1 (stringLength s) s));
|
||||||
in {
|
in {
|
||||||
config = mkIf (cfg.active == "catppuccin") {
|
config = mkIf (cfg.active == "catppuccin") {
|
||||||
colorScheme = colorScheme;
|
colorScheme = colorScheme;
|
||||||
|
|
||||||
modules.desktop.themes = {
|
modules.desktop.themes = {
|
||||||
dark = true;
|
dark = variant != "latte";
|
||||||
|
|
||||||
gtkTheme = {
|
gtkTheme = {
|
||||||
name = "catppuccin-mocha-pink-compact+rimless"; # TODO: put accent in here
|
name = "catppuccin-${variant}-${accent}-compact+rimless";
|
||||||
package = pkgs.catppuccin-gtk.override {
|
package = pkgs.catppuccin-gtk.override {
|
||||||
variant = variant;
|
variant = variant;
|
||||||
accents = [ accent ];
|
accents = [ accent ];
|
||||||
|
@ -46,7 +47,7 @@ in {
|
||||||
editor = {
|
editor = {
|
||||||
vscode = {
|
vscode = {
|
||||||
colorTheme = {
|
colorTheme = {
|
||||||
name = "Catppuccin Mocha";
|
name = "Catppuccin ${pascalCase variant}";
|
||||||
extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
|
extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
|
||||||
accent = accent;
|
accent = accent;
|
||||||
boldKeywords = false;
|
boldKeywords = false;
|
||||||
|
@ -83,6 +84,7 @@ in {
|
||||||
|
|
||||||
waybar = builtins.concatStringsSep "\n" [
|
waybar = builtins.concatStringsSep "\n" [
|
||||||
"@import \"${inputs.waybar-catppuccin}/themes/${variant}.css\";"
|
"@import \"${inputs.waybar-catppuccin}/themes/${variant}.css\";"
|
||||||
|
"@define-color accent @${accent};"
|
||||||
(lib.readFile ./waybar.css)
|
(lib.readFile ./waybar.css)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ window#waybar {
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button.active {
|
#workspaces button.active {
|
||||||
background: @pink;
|
background: @accent;
|
||||||
color: @surface0;
|
color: @surface0;
|
||||||
}
|
}
|
||||||
#workspaces button:hover {
|
#workspaces button:hover {
|
||||||
|
@ -80,7 +80,7 @@ window#waybar {
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
#workspaces button.active:hover {
|
#workspaces button.active:hover {
|
||||||
background: @pink;
|
background: @accent;
|
||||||
color: @surface0;
|
color: @surface0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue