mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Use theme config templates with singular color definition (#4053)
* Attempt to templaterize the theme specific files * Cleanup * Slim down * Combine render into -set * Pull out the dynamic template rendering again, but simpler * Fix vars * Variables are lowercase * Better presentation * Fix missing colors * Provide stripped values too * Fix colors for regular hex format * Bring back explicit btop themes They're too involved to derive from a basic color set * Make an atomic swap of the theme directories * No longer used by walker to cancel * Explain why * Remove redundant const * Consistent const naming * No longe have $THEMES_DIR * Correct the blue * Set opencode colors too * Fix colors for readability * Move the templates together with the others in default * Split user themes and default themes * Fix paths * Look for both user themes and default themes Plus speed things up * Migrate to the new setup where default themes live inside omarchy * Explicitly store the name of the current theme * Cleanup * No longer need omarchy-theme-next since themes are now fully rendered, not symlinks * Get current theme name from the new theme.name file * Look for user background images in dedicated directory * Need yq for toml * Need yq to parse colors.toml * Look for backgrounds matching the new theme.name We no longer have symlinks * Migrate existing user backgrounds to the new proper location * Install user backgrounds in the correct path * Fix quoting * Just rely on the system theme for opencode and get ready for USRSIG2 being available to live reload * Fix template generation for rgb colors
This commit is contained in:
David Heinemeier Hansson
committed by
GitHub
GitHub
parent
de2757466b
commit
4a07b94cb6
@@ -1,67 +0,0 @@
|
||||
# https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-latte.toml
|
||||
|
||||
[colors.primary]
|
||||
background = "#eff1f5"
|
||||
foreground = "#4c4f69"
|
||||
dim_foreground = "#8c8fa1"
|
||||
bright_foreground = "#4c4f69"
|
||||
|
||||
[colors.cursor]
|
||||
text = "#eff1f5"
|
||||
cursor = "#dc8a78"
|
||||
|
||||
[colors.vi_mode_cursor]
|
||||
text = "#eff1f5"
|
||||
cursor = "#7287fd"
|
||||
|
||||
[colors.search.matches]
|
||||
foreground = "#eff1f5"
|
||||
background = "#6c6f85"
|
||||
|
||||
[colors.search.focused_match]
|
||||
foreground = "#eff1f5"
|
||||
background = "#40a02b"
|
||||
|
||||
[colors.footer_bar]
|
||||
foreground = "#eff1f5"
|
||||
background = "#6c6f85"
|
||||
|
||||
[colors.hints.start]
|
||||
foreground = "#eff1f5"
|
||||
background = "#df8e1d"
|
||||
|
||||
[colors.hints.end]
|
||||
foreground = "#eff1f5"
|
||||
background = "#6c6f85"
|
||||
|
||||
[colors.selection]
|
||||
text = "#eff1f5"
|
||||
background = "#dc8a78"
|
||||
|
||||
[colors.normal]
|
||||
black = "#bcc0cc"
|
||||
red = "#d20f39"
|
||||
green = "#40a02b"
|
||||
yellow = "#df8e1d"
|
||||
blue = "#1e66f5"
|
||||
magenta = "#ea76cb"
|
||||
cyan = "#179299"
|
||||
white = "#5c5f77"
|
||||
|
||||
[colors.bright]
|
||||
black = "#acb0be"
|
||||
red = "#d20f39"
|
||||
green = "#40a02b"
|
||||
yellow = "#df8e1d"
|
||||
blue = "#1e66f5"
|
||||
magenta = "#ea76cb"
|
||||
cyan = "#179299"
|
||||
white = "#6c6f85"
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 16
|
||||
color = "#fe640b"
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 17
|
||||
color = "#dc8a78"
|
||||
26
themes/catppuccin-latte/colors.toml
Normal file
26
themes/catppuccin-latte/colors.toml
Normal file
@@ -0,0 +1,26 @@
|
||||
accent = "#1e66f5"
|
||||
active_border_color = "#8839EF"
|
||||
active_tab_background = "#8839EF"
|
||||
|
||||
cursor = "#dc8a78"
|
||||
foreground = "#4c4f69"
|
||||
background = "#eff1f5"
|
||||
selection_foreground = "#eff1f5"
|
||||
selection_background = "#dc8a78"
|
||||
|
||||
color0 = "#bcc0cc"
|
||||
color1 = "#d20f39"
|
||||
color2 = "#40a02b"
|
||||
color3 = "#df8e1d"
|
||||
color4 = "#1e66f5"
|
||||
color5 = "#ea76cb"
|
||||
color6 = "#179299"
|
||||
color7 = "#5c5f77"
|
||||
color8 = "#acb0be"
|
||||
color9 = "#d20f39"
|
||||
color10 = "#40a02b"
|
||||
color11 = "#df8e1d"
|
||||
color12 = "#1e66f5"
|
||||
color13 = "#ea76cb"
|
||||
color14 = "#179299"
|
||||
color15 = "#6c6f85"
|
||||
@@ -1 +0,0 @@
|
||||
theme = Catppuccin Latte
|
||||
@@ -1,94 +0,0 @@
|
||||
@define-color foreground #4C4F69;
|
||||
@define-color background #EFF1F5;
|
||||
@define-color accent #1E66F5;
|
||||
@define-color muted #9CA0B0;
|
||||
@define-color card_bg #E6E9EF;
|
||||
@define-color text_dark #EFF1F5;
|
||||
@define-color accent_hover #7287FD;
|
||||
@define-color selected_tab #1E66F5;
|
||||
@define-color text #4C4F69;
|
||||
|
||||
* {
|
||||
all: unset;
|
||||
font-family: JetBrains Mono NF;
|
||||
color: @foreground;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.window {
|
||||
background: alpha(@background, 0.95);
|
||||
border: solid 2px @accent;
|
||||
margin: 4px;
|
||||
padding: 18px;
|
||||
}
|
||||
|
||||
tabs {
|
||||
padding: 0.5rem 1rem;
|
||||
}
|
||||
|
||||
tabs > tab {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
.tab-label {
|
||||
color: @text;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
|
||||
text-decoration: underline currentColor;
|
||||
color: @selected_tab;
|
||||
}
|
||||
|
||||
tabs > tab:focus > .tab-label {
|
||||
color: @foreground;
|
||||
}
|
||||
|
||||
.page {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.image-label {
|
||||
font-size: 12px;
|
||||
padding: 0.25rem;
|
||||
}
|
||||
|
||||
flowboxchild > .card, button > .card {
|
||||
transition: all 0.2s ease;
|
||||
border: solid 2px transparent;
|
||||
border-color: @background;
|
||||
border-radius: 5px;
|
||||
background-color: @card_bg;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
|
||||
border: solid 2px @accent;
|
||||
}
|
||||
|
||||
.image {
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.region-button {
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 5px;
|
||||
background-color: @accent;
|
||||
color: @text_dark;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.region-button > label {
|
||||
color: @text_dark;
|
||||
}
|
||||
|
||||
.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
|
||||
background-color: @accent_hover;
|
||||
color: @text_dark;
|
||||
}
|
||||
|
||||
.region-button:disabled {
|
||||
background-color: @muted;
|
||||
color: @background;
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
$activeBorderColor = rgb(1e66f5)
|
||||
|
||||
general {
|
||||
col.active_border = $activeBorderColor
|
||||
}
|
||||
|
||||
group {
|
||||
col.border_active = $activeBorderColor
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
$color = rgba(239,241,245,1.0)
|
||||
$inner_color = rgba(239,241,245,0.8)
|
||||
$outer_color = rgba(30,102,245,1.0)
|
||||
$font_color = rgba(76,79,105,1.0)
|
||||
$check_color = rgba(4,165,229,1.0)
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
## name: Catppuccin Latte 🐑
|
||||
## author: Pocco81 (https://github.com/Pocco81)
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #4C4F69
|
||||
background #EFF1F5
|
||||
selection_foreground #EFF1F5
|
||||
selection_background #DC8A78
|
||||
|
||||
# Cursor colors
|
||||
cursor #DC8A78
|
||||
cursor_text_color #EFF1F5
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #7287FD
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #8839EF
|
||||
inactive_border_color #7C7F93
|
||||
bell_border_color #E64553
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #EFF1F5
|
||||
active_tab_background #8839EF
|
||||
inactive_tab_foreground #4C4F69
|
||||
inactive_tab_background #9CA0B0
|
||||
tab_bar_background #BCC0CC
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #EFF1F5
|
||||
mark1_background #1E66F5
|
||||
mark2_foreground #EFF1F5
|
||||
mark2_background #8839EF
|
||||
mark3_foreground #EFF1F5
|
||||
mark3_background #209FB5
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #4C4F69
|
||||
color8 #6C6F85
|
||||
|
||||
# red
|
||||
color1 #D20F39
|
||||
color9 #D20F39
|
||||
|
||||
# green
|
||||
color2 #40A02B
|
||||
color10 #40A02B
|
||||
|
||||
# yellow
|
||||
color3 #DF8E1D
|
||||
color11 #DF8E1D
|
||||
|
||||
# blue
|
||||
color4 #1E66F5
|
||||
color12 #1E66F5
|
||||
|
||||
# magenta
|
||||
color5 #EA76CB
|
||||
color13 #EA76CB
|
||||
|
||||
# cyan
|
||||
color6 #179299
|
||||
color14 #179299
|
||||
|
||||
# white
|
||||
color7 #ACB0BE
|
||||
color15 #ACB0BE
|
||||
@@ -1,5 +0,0 @@
|
||||
include=~/.local/share/omarchy/default/mako/core.ini
|
||||
|
||||
text-color=#4c4f69
|
||||
border-color=#1e66f5
|
||||
background-color=#eff1f5
|
||||
@@ -1,5 +0,0 @@
|
||||
@define-color background-color #eff1f5;
|
||||
@define-color border-color #1e66f5;
|
||||
@define-color label #4c4f69;
|
||||
@define-color image #4c4f69;
|
||||
@define-color progress #4c4f69;
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color selected-text #1e66f5;
|
||||
@define-color text #4c4f69;
|
||||
@define-color base #eff1f5;
|
||||
@define-color border #dce0e8;
|
||||
@define-color foreground #4c4f69;
|
||||
@define-color background #eff1f5;
|
||||
@@ -1,4 +0,0 @@
|
||||
@define-color foreground #4c4f69; /* text */
|
||||
@define-color background #eff1f5; /* base */
|
||||
@define-color border #dce0e8; /* crust */
|
||||
@define-color accent #1e66f5; /* blue */
|
||||
Reference in New Issue
Block a user