Use custom base16-modus-vivendi-tinted theme

Update some stylix colour uses to the mnemonic name version (where
possible)

Add a mustache template for waybar and use for style.css

Switch firefox to use sweet theme by default
This commit is contained in:
Evie Litherland-Smith 2024-02-08 17:32:21 +00:00
parent 9f251a944e
commit c9de371801
8 changed files with 132 additions and 27 deletions

View file

@ -145,21 +145,14 @@
console.enable = true; console.enable = true;
fish.enable = true; fish.enable = true;
}; };
image = ./wallpapers/space.png; image = ./wallpapers/sweet/Sweet-space.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; base16Scheme = ./schemes/modus-vivendi-tinted.yaml;
override = {
scheme = "Catppuccin Mocha, using fg and bg colours from emacs modus-vivdendi-tinted";
base00 = "0d0e1c";
base01 = "1d2235";
base04 = "c6daff";
base05 = "ffffff";
};
polarity = "dark"; polarity = "dark";
opacity = { opacity = {
applications = 0.8; applications = 0.85;
desktop = 0.8; desktop = 0.85;
popups = 0.5; popups = 0.85;
terminal = 0.8; terminal = 0.85;
}; };
fonts = rec { fonts = rec {
sizes = { sizes = {

View file

@ -123,18 +123,18 @@
smart_resizing = false; smart_resizing = false;
drop_at_cursor = true; drop_at_cursor = true;
}; };
general = { general = with config.lib.stylix.colors; {
"col.active_border" = "rgb(b4befe)"; "col.active_border" = "rgb(${magenta})";
"col.inactive_border" = "rgb(313244)"; "col.inactive_border" = "rgb(${base03})";
gaps_in = 5; gaps_in = 5;
gaps_out = 10; gaps_out = 10;
border_size = 1; border_size = 1;
cursor_inactive_timeout = 5; cursor_inactive_timeout = 5;
layout = "master"; layout = "master";
}; };
decoration = { decoration = with config.lib.stylix.colors; {
rounding = 10; rounding = 10;
"col.shadow" = "rgba(0d0e1c99)"; "col.shadow" = "rgba(0d${base00})";
drop_shadow = "yes"; drop_shadow = "yes";
shadow_ignore_window = true; shadow_ignore_window = true;
shadow_range = 4; shadow_range = 4;

View file

@ -1,4 +1,7 @@
$env.config = { $env.config = {
show_banner: false, show_banner: false,
edit_mode: emacs, edit_mode: emacs,
table: {
mode: compact,
},
} }

View file

@ -38,7 +38,7 @@
bg2 = mkLiteral "rgba (${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, 80%)"; bg2 = mkLiteral "rgba (${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, 80%)";
fg = mkLiteral withHashtag.base05; fg = mkLiteral withHashtag.base05;
fg2 = mkLiteral withHashtag.base04; fg2 = mkLiteral withHashtag.base04;
border = mkLiteral withHashtag.base07; border = mkLiteral withHashtag.magenta;
blue = mkLiteral withHashtag.blue; blue = mkLiteral withHashtag.blue;
in { in {
"*" = { "*" = {

View file

@ -0,0 +1,107 @@
/*
*
* Base16 {{scheme-name}}
* Author: {{scheme-author}}
*
*/
@define-color base00 #{{base00-hex}};
@define-color base01 #{{base01-hex}};
@define-color base02 #{{base02-hex}};
@define-color base03 #{{base03-hex}};
@define-color base04 #{{base04-hex}};
@define-color base05 #{{base05-hex}};
@define-color base06 #{{base06-hex}};
@define-color base07 #{{base07-hex}};
@define-color base08 #{{base08-hex}};
@define-color base09 #{{base09-hex}};
@define-color base0A #{{base0A-hex}};
@define-color base0B #{{base0B-hex}};
@define-color base0C #{{base0C-hex}};
@define-color base0D #{{base0D-hex}};
@define-color base0E #{{base0E-hex}};
@define-color base0F #{{base0F-hex}};
/*
* Personal waybar config follows
*/
* {
all: unset;
font-size: 20px;
font-family: "Iosevka Nerd Font";
}
window {
background: transparent;
}
window > box {
color: @base05;
background: alpha(@base00, 0.5);
margin: 10px 10px 0px;
padding: 0px;
border: 1px solid @base0E;
border-radius: 10px;
}
tooltip {
color: @base05;
/* Temp set alpha to 1.0 until I can sort out blurls issue */
background: alpha(@base00, 1);
border: 1px solid @base0E;
border-radius: 10px;
padding: 5px;
margin: 0px;
}
#workspaces,
#window,
#mpris,
#pulseaudio,
#backlight,
#battery,
#clock,
#custom-notification,
#tray {
margin: 0px;
padding: 1px 5px;
}
#workspaces,
#window,
#mpris,
#tray,
#custom-separator {
color: @base05;
}
#workspaces button {
background: transparent;
color: @base05;
margin: 0px;
padding: 0px 5px;
}
#workspaces button.empty {
color: @base03;
}
#workspaces button.active {
color: @base0E;
}
#workspaces button.urgent {
color: @base09;
}
#custom-notification {
color: @base08;
}
#pulseaudio {
color: @base0B;
}
#clock {
color: @base0D;
}
#backlight,
#battery {
color: @base05;
}

View file

@ -9,7 +9,10 @@
}; };
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = ./style.css; style = builtins.readFile (config.lib.stylix.colors {
template = ./default.mustache;
extension = ".css";
});
systemd = { systemd = {
enable = true; enable = true;
target = "hyprland-session.target"; target = "hyprland-session.target";

View file

@ -15,6 +15,6 @@ base09: "ff9f80" # orange (comment / red-faint)
base0A: "fec43f" # yellow (warning / yellow-warmer) base0A: "fec43f" # yellow (warning / yellow-warmer)
base0B: "00c06f" # green (rx-construct / green-cooler) base0B: "00c06f" # green (rx-construct / green-cooler)
base0C: "00d3d0" # cyan (variable / cyan) base0C: "00d3d0" # cyan (variable / cyan)
base0D: "00bcff" # blue (constant / blue-cooler) base0D: "79a8ff" # blue (string / blue-warmer)
base0E: "f78fe7" # magenta (cursor / magenta-warmer) base0E: "f78fe7" # magenta (cursor / magenta-warmer)
base0F: "d2b580" # brown (identifier / yellow-faint) base0F: "d2b580" # brown (identifier / yellow-faint)

View file

@ -54,10 +54,10 @@
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
}; };
# Catppuccin Mocha (Lavender) theme # Catppuccin Mocha (Lavender) theme
"{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = { # "{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = {
installation_mode = "force_installed"; # installation_mode = "force_installed";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi"; # install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi";
}; # };
# Sweet-Dark theme # Sweet-Dark theme
"{59f619c8-220b-4a27-8918-bf1537bc060a}" = { "{59f619c8-220b-4a27-8918-bf1537bc060a}" = {
installation_mode = "force_installed"; installation_mode = "force_installed";
@ -184,8 +184,7 @@
]; ];
"browser.search.region" = "GB"; "browser.search.region" = "GB";
"browser.warnOnQuitShortcut" = false; "browser.warnOnQuitShortcut" = false;
# Catppuccin Mocha (Lavender) theme "extensions.activeThemeID" = "{59f619c8-220b-4a27-8918-bf1537bc060a}";
"extensions.activeThemeID" = "{8446b178-c865-4f5c-8ccc-1d7887811ae3}";
"intl.accept_languages" = "en-gb,en"; "intl.accept_languages" = "en-gb,en";
"intl.locale.requested" = "en-gb,en"; "intl.locale.requested" = "en-gb,en";
"intl.regional_prefs.use_os_locales" = false; "intl.regional_prefs.use_os_locales" = false;