theme: GTK and Qt take the YoRHa palette
GTK moves from Catppuccin Mocha to adw-gtk3-dark, recoloured through the libadwaita named colours in gtk-3.0/gtk.css and as CSS variables in gtk-4.0/gtk.css, so Nautilus and other libadwaita apps follow too. The gtk-4.0 symlinks into the Catppuccin theme are gone, since libadwaita would load its gtk-dark.css over the overrides. Qt gets qt6ct/colors/yorha.conf: the same palette in QPalette roles, with the light slab as the highlight and ink as its text. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9af24ccf87
commit
485ee5c0ca
9 files changed
+174
-14
No files matched your search
@@ -44,3 +44,6 @@ gtk-4.0/*
|
||||
!qt6ct/
|
||||
qt6ct/*
|
||||
!qt6ct/qt6ct.conf
|
||||
!qt6ct/colors/
|
||||
qt6ct/colors/*
|
||||
!qt6ct/colors/yorha.conf
|
||||
+57
-4
@@ -1,4 +1,57 @@
|
||||
/* Catppuccin Mocha Blue carries the whole GTK3 palette itself, so there is
|
||||
* nothing to override here — the Takemi branch only needed this file because
|
||||
* it was painting Fluent's greys black. Kept as a hook for the next time the
|
||||
* rice disagrees with stock Catppuccin. */
|
||||
/* YoRHa colours for adw-gtk3 — kept in step with
|
||||
* ~/.config/quickshell/config/Theme.qml and gtk-4.0/gtk.css.
|
||||
*
|
||||
* adw-gtk3 draws the libadwaita shapes (soft corners, flat cards) and takes
|
||||
* every surface from these named colours, so the whole palette lives here.
|
||||
* Selection is the shell's light slab with ink text; red only for destructive
|
||||
* and failed. */
|
||||
|
||||
@define-color accent_color #eef1ea;
|
||||
@define-color accent_bg_color #bcc1bf;
|
||||
@define-color accent_fg_color #090a08;
|
||||
|
||||
@define-color destructive_color #c8684f;
|
||||
@define-color destructive_bg_color #c8684f;
|
||||
@define-color destructive_fg_color #090a08;
|
||||
@define-color error_color #c8684f;
|
||||
@define-color error_bg_color #c8684f;
|
||||
@define-color error_fg_color #090a08;
|
||||
@define-color warning_color #c9b27c;
|
||||
@define-color warning_bg_color #c9b27c;
|
||||
@define-color warning_fg_color #090a08;
|
||||
@define-color success_color #8fa37e;
|
||||
@define-color success_bg_color #8fa37e;
|
||||
@define-color success_fg_color #090a08;
|
||||
|
||||
@define-color window_bg_color #0f110e;
|
||||
@define-color window_fg_color #ccd2cb;
|
||||
@define-color view_bg_color #0c0d0b;
|
||||
@define-color view_fg_color #ccd2cb;
|
||||
|
||||
@define-color headerbar_bg_color #161915;
|
||||
@define-color headerbar_fg_color #ccd2cb;
|
||||
@define-color headerbar_border_color #2a2f28;
|
||||
@define-color headerbar_backdrop_color #0f110e;
|
||||
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
|
||||
|
||||
@define-color sidebar_bg_color #161915;
|
||||
@define-color sidebar_fg_color #ccd2cb;
|
||||
@define-color sidebar_backdrop_color #0f110e;
|
||||
@define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color secondary_sidebar_bg_color #0f110e;
|
||||
@define-color secondary_sidebar_fg_color #ccd2cb;
|
||||
@define-color secondary_sidebar_backdrop_color #0c0d0b;
|
||||
|
||||
@define-color card_bg_color #161915;
|
||||
@define-color card_fg_color #ccd2cb;
|
||||
@define-color card_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color dialog_bg_color #161915;
|
||||
@define-color dialog_fg_color #ccd2cb;
|
||||
@define-color popover_bg_color #20241f;
|
||||
@define-color popover_fg_color #ccd2cb;
|
||||
@define-color popover_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color thumbnail_bg_color #20241f;
|
||||
@define-color thumbnail_fg_color #ccd2cb;
|
||||
|
||||
@define-color shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
|
||||
@@ -1,5 +1,5 @@
|
||||
[Settings]
|
||||
gtk-theme-name=catppuccin-mocha-blue-standard+default
|
||||
gtk-theme-name=adw-gtk3-dark
|
||||
gtk-icon-theme-name=Papirus-Dark
|
||||
gtk-font-name=Adwaita Sans 11
|
||||
gtk-cursor-theme-name=Bibata-Modern-Classic
|
||||
|
||||
+95
-4
@@ -1,4 +1,95 @@
|
||||
/* Catppuccin Mocha Blue, straight from the installed theme. The Takemi branch
|
||||
* overrode Fluent's greys with black here; Mocha needs no override — its own
|
||||
* surfaces are the palette the rest of the rice is built on. */
|
||||
@import url("/usr/share/themes/catppuccin-mocha-blue-standard+default/gtk-4.0/gtk.css");
|
||||
/* YoRHa colours for libadwaita and adw-gtk3 — kept in step with
|
||||
* ~/.config/quickshell/config/Theme.qml and gtk-3.0/gtk.css.
|
||||
*
|
||||
* libadwaita reads its palette from CSS variables; the named colours below
|
||||
* the variables cover GTK4 apps that still go through the adw-gtk3 theme. */
|
||||
|
||||
:root {
|
||||
--accent-color: #eef1ea;
|
||||
--accent-bg-color: #bcc1bf;
|
||||
--accent-fg-color: #090a08;
|
||||
--destructive-color: #c8684f;
|
||||
--destructive-bg-color: #c8684f;
|
||||
--destructive-fg-color: #090a08;
|
||||
--error-color: #c8684f;
|
||||
--error-bg-color: #c8684f;
|
||||
--error-fg-color: #090a08;
|
||||
--warning-color: #c9b27c;
|
||||
--warning-bg-color: #c9b27c;
|
||||
--warning-fg-color: #090a08;
|
||||
--success-color: #8fa37e;
|
||||
--success-bg-color: #8fa37e;
|
||||
--success-fg-color: #090a08;
|
||||
--window-bg-color: #0f110e;
|
||||
--window-fg-color: #ccd2cb;
|
||||
--view-bg-color: #0c0d0b;
|
||||
--view-fg-color: #ccd2cb;
|
||||
--headerbar-bg-color: #161915;
|
||||
--headerbar-fg-color: #ccd2cb;
|
||||
--headerbar-border-color: #2a2f28;
|
||||
--headerbar-backdrop-color: #0f110e;
|
||||
--headerbar-shade-color: rgba(0, 0, 0, 0.36);
|
||||
--sidebar-bg-color: #161915;
|
||||
--sidebar-fg-color: #ccd2cb;
|
||||
--sidebar-backdrop-color: #0f110e;
|
||||
--sidebar-shade-color: rgba(0, 0, 0, 0.36);
|
||||
--secondary-sidebar-bg-color: #0f110e;
|
||||
--secondary-sidebar-fg-color: #ccd2cb;
|
||||
--secondary-sidebar-backdrop-color: #0c0d0b;
|
||||
--card-bg-color: #161915;
|
||||
--card-fg-color: #ccd2cb;
|
||||
--card-shade-color: rgba(0, 0, 0, 0.36);
|
||||
--dialog-bg-color: #161915;
|
||||
--dialog-fg-color: #ccd2cb;
|
||||
--popover-bg-color: #20241f;
|
||||
--popover-fg-color: #ccd2cb;
|
||||
--popover-shade-color: rgba(0, 0, 0, 0.36);
|
||||
--thumbnail-bg-color: #20241f;
|
||||
--thumbnail-fg-color: #ccd2cb;
|
||||
--shade-color: rgba(0, 0, 0, 0.36);
|
||||
--scrollbar-outline-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
@define-color accent_color #eef1ea;
|
||||
@define-color accent_bg_color #bcc1bf;
|
||||
@define-color accent_fg_color #090a08;
|
||||
@define-color destructive_color #c8684f;
|
||||
@define-color destructive_bg_color #c8684f;
|
||||
@define-color destructive_fg_color #090a08;
|
||||
@define-color error_color #c8684f;
|
||||
@define-color error_bg_color #c8684f;
|
||||
@define-color error_fg_color #090a08;
|
||||
@define-color warning_color #c9b27c;
|
||||
@define-color warning_bg_color #c9b27c;
|
||||
@define-color warning_fg_color #090a08;
|
||||
@define-color success_color #8fa37e;
|
||||
@define-color success_bg_color #8fa37e;
|
||||
@define-color success_fg_color #090a08;
|
||||
@define-color window_bg_color #0f110e;
|
||||
@define-color window_fg_color #ccd2cb;
|
||||
@define-color view_bg_color #0c0d0b;
|
||||
@define-color view_fg_color #ccd2cb;
|
||||
@define-color headerbar_bg_color #161915;
|
||||
@define-color headerbar_fg_color #ccd2cb;
|
||||
@define-color headerbar_border_color #2a2f28;
|
||||
@define-color headerbar_backdrop_color #0f110e;
|
||||
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color sidebar_bg_color #161915;
|
||||
@define-color sidebar_fg_color #ccd2cb;
|
||||
@define-color sidebar_backdrop_color #0f110e;
|
||||
@define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color secondary_sidebar_bg_color #0f110e;
|
||||
@define-color secondary_sidebar_fg_color #ccd2cb;
|
||||
@define-color secondary_sidebar_backdrop_color #0c0d0b;
|
||||
@define-color card_bg_color #161915;
|
||||
@define-color card_fg_color #ccd2cb;
|
||||
@define-color card_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color dialog_bg_color #161915;
|
||||
@define-color dialog_fg_color #ccd2cb;
|
||||
@define-color popover_bg_color #20241f;
|
||||
@define-color popover_fg_color #ccd2cb;
|
||||
@define-color popover_shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color thumbnail_bg_color #20241f;
|
||||
@define-color thumbnail_fg_color #ccd2cb;
|
||||
@define-color shade_color rgba(0, 0, 0, 0.36);
|
||||
@define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
|
||||
@@ -1,5 +1,5 @@
|
||||
[Settings]
|
||||
gtk-theme-name=catppuccin-mocha-blue-standard+default
|
||||
gtk-theme-name=adw-gtk3-dark
|
||||
gtk-icon-theme-name=Papirus-Dark
|
||||
gtk-font-name=Adwaita Sans 11
|
||||
gtk-cursor-theme-name=Bibata-Modern-Classic
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
[ColorScheme]
|
||||
active_colors=#ffccd2cb, #ff20241f, #ff383e35, #ff2a2f28, #ff0c0d0b, #ff161915, #ffccd2cb, #ffeef1ea, #ffccd2cb, #ff0c0d0b, #ff0f110e, #ff090a08, #ffbcc1bf, #ff090a08, #ffeef1ea, #ff9fa7a2, #ff161915, #ff0f110e, #ff20241f, #ffccd2cb, #ff79847a, #ffbcc1bf
|
||||
inactive_colors=#ffccd2cb, #ff20241f, #ff383e35, #ff2a2f28, #ff0c0d0b, #ff161915, #ffccd2cb, #ffeef1ea, #ffccd2cb, #ff0c0d0b, #ff0f110e, #ff090a08, #ff383e35, #ffccd2cb, #ffeef1ea, #ff9fa7a2, #ff161915, #ff0f110e, #ff20241f, #ffccd2cb, #ff79847a, #ff383e35
|
||||
disabled_colors=#ff545c52, #ff161915, #ff2a2f28, #ff20241f, #ff0c0d0b, #ff161915, #ff545c52, #ff79847a, #ff545c52, #ff0c0d0b, #ff0f110e, #ff090a08, #ff20241f, #ff545c52, #ff79847a, #ff545c52, #ff161915, #ff0f110e, #ff20241f, #ff545c52, #ff464d44, #ff20241f
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
[Appearance]
|
||||
color_scheme_path=/usr/share/qt6ct/colors/catppuccin-mocha-blue.conf
|
||||
color_scheme_path=/home/narl/.config/qt6ct/colors/yorha.conf
|
||||
custom_palette=true
|
||||
icon_theme=Papirus-Dark
|
||||
standard_dialogs=default
|
||||
@@ -7,7 +7,7 @@ style=Fusion
|
||||
|
||||
[Fonts]
|
||||
fixed="Sans Serif,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
|
||||
general="Sans Serif,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
|
||||
general="Adwaita Sans,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
|
||||
|
||||
[Interface]
|
||||
activate_item_on_single_click=1
|
||||
|
||||
+10
-1
@@ -293,6 +293,8 @@ dark, the rim hairline and the wallpaper, not from patterns.
|
||||
| `fish/conf.d/yorha_theme.fish` | the prompt and pager |
|
||||
| `nvim/lua/yorha.lua` | the editor and its statusline |
|
||||
| `btop/themes/yorha.theme` | the resource monitor |
|
||||
| `gtk-3.0/gtk.css`, `gtk-4.0/gtk.css` | GTK and libadwaita apps |
|
||||
| `qt6ct/colors/yorha.conf` | Qt apps |
|
||||
|
||||
Everything else derives. `glow` *is* `accent`, and `primary` is plain `text`.
|
||||
`Theme.heat()` is a continuous text → light → red ramp, so a CPU figure that
|
||||
@@ -325,7 +327,14 @@ network and bluetooth, but keep running as the secret and pairing agents.
|
||||
surfaces with rounded rims, menus selecting with the light slab.
|
||||
- **btop** — `btop/themes/yorha.theme`. Hairline boxes; gradients climb from
|
||||
grey to the light, and only temperature and CPU load run on into rust.
|
||||
- **GTK and Qt** — still `catppuccin-mocha-blue`. Not yet moved.
|
||||
- **GTK** — the `adw-gtk3-dark` theme (package `adw-gtk-theme`) for the
|
||||
libadwaita shapes, recoloured by `gtk-3.0/gtk.css` and `gtk-4.0/gtk.css`.
|
||||
libadwaita apps such as Nautilus read the same overrides as CSS variables.
|
||||
Selection is the light slab with ink text; only destructive actions are red.
|
||||
The theme name is also in `xsettingsd/xsettingsd.conf` and has to be set with
|
||||
`gsettings` for portal-aware apps.
|
||||
- **Qt** — qt6ct with `qt6ct/colors/yorha.conf`, the same palette in
|
||||
`QPalette` roles. The style is Fusion unless Darkly is installed.
|
||||
- **Fish** — `fish/conf.d/yorha_theme.fish`.
|
||||
- **The launcher** — no external theming to keep in step, because it is part of
|
||||
this shell (`launcher/`). Fuzzel is gone; `takemi-dmenu` stands in for
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Net/ThemeName "catppuccin-mocha-blue-standard+default"
|
||||
Net/ThemeName "adw-gtk3-dark"
|
||||
Net/IconThemeName "Papirus-Dark"
|
||||
Gtk/CursorThemeName "Bibata-Modern-Classic"
|
||||
Net/EnableEventSounds 1
|
||||
|
||||
Reference in new issue
Block a user