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,53 +0,0 @@
|
||||
# ────────────────────────────────────────────────────────────
|
||||
# Omarchy Matte Black Theme for Alacritty
|
||||
# By tahayvr
|
||||
# https://github.com/tahayvr
|
||||
# ────────────────────────────────────────────────────────────
|
||||
|
||||
[window]
|
||||
# window padding {px}
|
||||
padding.x = 12
|
||||
padding.y = 12
|
||||
|
||||
[font]
|
||||
size = 12.0
|
||||
|
||||
|
||||
|
||||
[colors]
|
||||
[colors.primary]
|
||||
background = "#121212"
|
||||
foreground = "#bebebe"
|
||||
dim_foreground = "#8a8a8d"
|
||||
|
||||
[colors.cursor]
|
||||
text = "#121212"
|
||||
cursor = "#eaeaea"
|
||||
|
||||
[colors.vi_mode_cursor]
|
||||
text = "#121212"
|
||||
cursor = "#eaeaea"
|
||||
|
||||
[colors.selection]
|
||||
text = "CellForeground"
|
||||
background = "#333333"
|
||||
|
||||
[colors.normal]
|
||||
black = "#333333"
|
||||
red = "#D35F5F"
|
||||
green = "#FFC107"
|
||||
yellow = "#b91c1c"
|
||||
blue = "#e68e0d"
|
||||
magenta = "#D35F5F"
|
||||
cyan = "#bebebe"
|
||||
white = "#bebebe"
|
||||
|
||||
[colors.bright]
|
||||
black = "#8a8a8d"
|
||||
red = "#B91C1C"
|
||||
green = "#FFC107"
|
||||
yellow = "#b90a0a"
|
||||
blue = "#f59e0b"
|
||||
magenta = "#B91C1C"
|
||||
cyan = "#eaeaea"
|
||||
white = "#ffffff"
|
||||
26
themes/matte-black/colors.toml
Normal file
26
themes/matte-black/colors.toml
Normal file
@@ -0,0 +1,26 @@
|
||||
accent = "#e68e0d"
|
||||
active_border_color = "#595959"
|
||||
active_tab_background = "#121212"
|
||||
|
||||
cursor = "#eaeaea"
|
||||
foreground = "#bebebe"
|
||||
background = "#121212"
|
||||
selection_foreground = "#bebebe"
|
||||
selection_background = "#333333"
|
||||
|
||||
color0 = "#333333"
|
||||
color1 = "#D35F5F"
|
||||
color2 = "#FFC107"
|
||||
color3 = "#b91c1c"
|
||||
color4 = "#e68e0d"
|
||||
color5 = "#D35F5F"
|
||||
color6 = "#bebebe"
|
||||
color7 = "#bebebe"
|
||||
color8 = "#8a8a8d"
|
||||
color9 = "#B91C1C"
|
||||
color10 = "#FFC107"
|
||||
color11 = "#b90a0a"
|
||||
color12 = "#f59e0b"
|
||||
color13 = "#B91C1C"
|
||||
color14 = "#eaeaea"
|
||||
color15 = "#ffffff"
|
||||
@@ -1,28 +0,0 @@
|
||||
background = #121212
|
||||
foreground = #BEBEBE
|
||||
|
||||
cursor-color = #EAEAEA
|
||||
cursor-text = #121212
|
||||
|
||||
selection-background = #333333
|
||||
selection-foreground = #EAEAEA
|
||||
|
||||
# normal colors
|
||||
palette = 0=#333333
|
||||
palette = 1=#D35F5F
|
||||
palette = 2=#FFC107
|
||||
palette = 3=#B91C1C
|
||||
palette = 4=#E68E0D
|
||||
palette = 5=#D35F5F
|
||||
palette = 6=#BEBEBE
|
||||
palette = 7=#BEBEBE
|
||||
|
||||
# bright colors
|
||||
palette = 8=#8A8A8D
|
||||
palette = 9=#B91C1C
|
||||
palette = 10=#FFC107
|
||||
palette = 11=#B90A0A
|
||||
palette = 12=#F59E0B
|
||||
palette = 13=#B91C1C
|
||||
palette = 14=#EAEAEA
|
||||
palette = 15=#FFFFFF
|
||||
@@ -1,94 +0,0 @@
|
||||
@define-color foreground #EAEAEA;
|
||||
@define-color background #121212;
|
||||
@define-color accent #B91C1C;
|
||||
@define-color muted #595959;
|
||||
@define-color card_bg #1e1e1e;
|
||||
@define-color text_dark #EAEAEA;
|
||||
@define-color accent_hover #D35F5F;
|
||||
@define-color selected_tab #B91C1C;
|
||||
@define-color text #EAEAEA;
|
||||
|
||||
* {
|
||||
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(8A8A8D)
|
||||
|
||||
general {
|
||||
col.active_border = $activeBorderColor
|
||||
}
|
||||
|
||||
group {
|
||||
col.border_active = $activeBorderColor
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
$color = rgba(12,12,12,1.0)
|
||||
$inner_color = rgba(138,138,141,0.3)
|
||||
$outer_color = rgba(234,234,234,0.5)
|
||||
$font_color = rgba(234,234,234,1.0)
|
||||
$check_color = rgba(245,158,11,1.0)
|
||||
@@ -1,54 +0,0 @@
|
||||
## name: Matte Black
|
||||
|
||||
foreground #bebebe
|
||||
background #121212
|
||||
selection_foreground #121212
|
||||
selection_background #333333
|
||||
|
||||
cursor #eaeaea
|
||||
cursor_text_color #121212
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #bebebe
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #595959
|
||||
inactive_border_color #595959
|
||||
bell_border_color #595959
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #bebebe
|
||||
active_tab_background #121212
|
||||
inactive_tab_foreground #bebebe
|
||||
inactive_tab_background #121212
|
||||
tab_bar_background #bebebe
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #121212
|
||||
mark1_background #404040
|
||||
mark2_foreground #121212
|
||||
mark2_background #121212
|
||||
mark3_foreground #121212
|
||||
mark3_background #a6a6a6
|
||||
|
||||
color0 #333333
|
||||
color8 #8a8a8d
|
||||
color1 #D35F5F
|
||||
color9 #B91C1C
|
||||
color2 #FFC107
|
||||
color10 #FFC107
|
||||
color3 #b91c1c
|
||||
color11 #b90a0a
|
||||
color4 #e68e0d
|
||||
color12 #f59e0b
|
||||
color5 #D35F5F
|
||||
color13 #B91C1C
|
||||
color6 #bebebe
|
||||
color14 #eaeaea
|
||||
color7 #bebebe
|
||||
color15 #ffffff
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
include=~/.local/share/omarchy/default/mako/core.ini
|
||||
|
||||
text-color=#8a8a8d
|
||||
border-color=#8A8A8D
|
||||
background-color=#1e1e1e
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color background-color #121212;
|
||||
@define-color border-color #CCCCCC;
|
||||
@define-color label #CCCCCC;
|
||||
@define-color image #CCCCCC;
|
||||
@define-color progress #CCCCCC;
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color selected-text #B91C1C;
|
||||
@define-color text #EAEAEA;
|
||||
@define-color base #121212;
|
||||
@define-color border #EAEAEA88;
|
||||
@define-color foreground #EAEAEA;
|
||||
@define-color background #121212;
|
||||
@@ -1,2 +0,0 @@
|
||||
@define-color foreground #8a8a8d;
|
||||
@define-color background #1e1e1e;
|
||||
Reference in New Issue
Block a user