Switch other theme elements to Sweet GTK + One Light

This commit is contained in:
Evie Litherland-Smith 2024-06-08 08:13:20 +01:00
parent 72c37af6fe
commit 9461b6da20
21 changed files with 26 additions and 8158 deletions

View file

@ -29,14 +29,13 @@
tt-schemes,
...
}: let
catppuccinVariant = "Latte";
defaultExtraSpecialArgs = {
system ? "x86_64-linux",
hostname ? "Atlas",
...
}: rec {
inherit hostname catppuccinVariant;
accentColour = "base07"; # catppuccin lavender
inherit hostname;
accentColour = "magenta";
iosevkaCustom = {
packages = iosevka-custom.outputs.packages.${system};
names = iosevka-custom.outputs.names;

View file

@ -1,21 +1,11 @@
{
config,
accentColour ? "base07",
...
}: {
{config, ...}: {
services.avizo = {
enable = true;
settings.default = with config.scheme; let
accent = {
r = config.scheme."${accentColour}-rgb-r";
g = config.scheme."${accentColour}-rgb-g";
b = config.scheme."${accentColour}-rgb-b";
};
in {
settings.default = with config.scheme; {
background = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9)";
bar-bg-color = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9)";
bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, 1.0)";
border-color = "rgba(${accent.r}, ${accent.g}, ${accent.b}, 1.0)";
border-color = "rgba(${base0E-rgb-r}, ${base0E-rgb-g}, ${base0E-rgb-b}, 1.0)"; # Make dynamic
image-opacity = "1.0";
};
};

View file

@ -1,8 +1,6 @@
{
config,
lib,
pkgs,
catppuccinVariant ? "Mocha",
...
}: {
imports = [
@ -56,17 +54,12 @@
};
};
programs.mpv.enable = true;
gtk = with lib.strings; let
accent = "Lavender";
variant = catppuccinVariant;
gtk = let
# Make this smarter at some point
type =
if variant == "Latte"
if config.scheme.variant == "light"
then "Light"
else "Dark";
inverseType =
if type == "Light"
then "Dark"
else "Light";
in {
enable = true;
iconTheme = {
@ -78,15 +71,9 @@
name = "volantes_cursors";
size = 32;
};
theme = let
size = "Standard";
in {
package = pkgs.catppuccin-gtk.override {
accents = [(toLower accent)];
size = toLower size;
variant = toLower variant;
};
name = "Catppuccin-${variant}-${size}-${accent}-${type}";
theme = {
package = pkgs.sweet;
name = "Sweet";
};
};
xdg = {

View file

@ -2,7 +2,7 @@
config,
pkgs,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
programs.fuzzel = {

View file

@ -1,7 +1,7 @@
{
config,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
services.mako = with config.scheme.withHashtag; {

View file

@ -39,7 +39,7 @@ layout {
}
cursor {
xcursor-theme "Catppuccin-Mocha-Dark-Cursors"
xcursor-theme "volantes_cursors"
xcursor-size 32
}

View file

@ -2,7 +2,7 @@
config,
pkgs,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
programs.rofi = {

View file

@ -3,7 +3,7 @@
lib,
pkgs,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
wayland.windowManager.sway = {

View file

@ -1,7 +1,7 @@
{
config,
pkgs,
accentColour ? "base07",
accentColour,
...
}: {
home.packages = with pkgs; [

View file

@ -2,7 +2,7 @@
config,
pkgs,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
home.packages = [pkgs.swaynotificationcenter];

View file

@ -4,7 +4,7 @@
pkgs,
hostname,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
systemd.user.targets.tray.Unit = {

View file

@ -1,7 +1,7 @@
{
config,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
programs.wlogout = {

View file

@ -54,14 +54,6 @@
installation_mode = "force_installed";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/simplelogin/latest.xpi";
};
"{bc6fdbef-4c18-4967-9899-7803fdcaf3b4}" = {
installation_mode = "force_installed";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-latte-lavender-git/latest.xpi";
};
"{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = {
installation_mode = "force_installed";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi";
};
};
FirefoxHome = {
Search = true;
@ -113,7 +105,7 @@
"browser.warnOnQuitShortcut" = false;
"distribution.searchplugins.defaultLocale" = "en-GB";
"doh-rollout.home-region" = "GB";
"extensions.activeThemeID" = "{bc6fdbef-4c18-4967-9899-7803fdcaf3b4}";
"extensions.activeThemeID" = "firefox-alpenglow@mozilla.org";
"extensions.formautofill.creditCards.enabled" = false;
"general.useragent.locale" = "en-GB";
"intl.accept_languages" = "en-gb,en";

View file

@ -63,4 +63,4 @@
(define-configuration browser
((restore-session-on-startup-p nil)))
(setf (uiop/os:getenv "GTK_THEME") "Adwaita:dark")
(setf (uiop/os:getenv "GTK_THEME") "Adwaita:light")

View file

@ -2,7 +2,7 @@
config,
pkgs,
fonts,
accentColour ? "base07",
accentColour,
...
}: {
home.packages = [pkgs.nyxt];

View file

@ -1,6 +1,6 @@
{
config,
accentColour ? "base07",
accentColour,
...
}: {
programs.bottom = {

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,4 @@
{
lib,
pkgs,
catppuccinVariant ? "Mocha",
...
}: {
{pkgs, ...}: {
imports = [
./bottom.nix
./fastfetch.nix
@ -22,7 +17,7 @@
bat = {
enable = true;
config = {
theme = "catppuccin${catppuccinVariant}";
theme = "OneHalfLight";
style = "plain,numbers,changes";
};
};
@ -46,15 +41,4 @@
jq.enable = true;
ripgrep.enable = true;
};
xdg.configFile = let
variants = ["Latte" "Frappe" "Macchiato" "Mocha"];
mkVariant = variant: let
fname = "catppuccin${variant}.tmTheme";
in {
name = "bat/themes/${fname}";
value = {source = ./. + "/${fname}";};
};
in
builtins.listToAttrs
(lib.lists.forEach variants mkVariant);
}