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:
committed by
GitHub
parent
de2757466b
commit
4a07b94cb6
@@ -1,24 +0,0 @@
|
||||
[colors]
|
||||
[colors.primary]
|
||||
background = '#2d353b'
|
||||
foreground = '#d3c6aa'
|
||||
|
||||
[colors.normal]
|
||||
black = '#475258'
|
||||
red = '#e67e80'
|
||||
green = '#a7c080'
|
||||
yellow = '#dbbc7f'
|
||||
blue = '#7fbbb3'
|
||||
magenta = '#d699b6'
|
||||
cyan = '#83c092'
|
||||
white = '#d3c6aa'
|
||||
|
||||
[colors.bright]
|
||||
black = '#475258'
|
||||
red = '#e67e80'
|
||||
green = '#a7c080'
|
||||
yellow = '#dbbc7f'
|
||||
blue = '#7fbbb3'
|
||||
magenta = '#d699b6'
|
||||
cyan = '#83c092'
|
||||
white = '#d3c6aa'
|
||||
26
themes/everforest/colors.toml
Normal file
26
themes/everforest/colors.toml
Normal file
@@ -0,0 +1,26 @@
|
||||
accent = "#7fbbb3"
|
||||
active_border_color = "#7fbbb3"
|
||||
active_tab_background = "#2d353b"
|
||||
|
||||
cursor = "#d3c6aa"
|
||||
foreground = "#d3c6aa"
|
||||
background = "#2d353b"
|
||||
selection_foreground = "#2d353b"
|
||||
selection_background = "#d3c6aa"
|
||||
|
||||
color0 = "#475258"
|
||||
color1 = "#e67e80"
|
||||
color2 = "#a7c080"
|
||||
color3 = "#dbbc7f"
|
||||
color4 = "#7fbbb3"
|
||||
color5 = "#d699b6"
|
||||
color6 = "#83c092"
|
||||
color7 = "#d3c6aa"
|
||||
color8 = "#475258"
|
||||
color9 = "#e67e80"
|
||||
color10 = "#a7c080"
|
||||
color11 = "#dbbc7f"
|
||||
color12 = "#7fbbb3"
|
||||
color13 = "#d699b6"
|
||||
color14 = "#83c092"
|
||||
color15 = "#d3c6aa"
|
||||
@@ -1,20 +0,0 @@
|
||||
background = #2d353b
|
||||
foreground = #d3c6aa
|
||||
|
||||
palette = 0=#475258
|
||||
palette = 1=#e67e80
|
||||
palette = 2=#a7c080
|
||||
palette = 3=#dbbc7f
|
||||
palette = 4=#7fbbb3
|
||||
palette = 5=#d699b6
|
||||
palette = 6=#83c092
|
||||
palette = 7=#d3c6aa
|
||||
|
||||
palette = 8=#475258
|
||||
palette = 9=#e67e80
|
||||
palette = 10=#a7c080
|
||||
palette = 11=#dbbc7f
|
||||
palette = 12=#7fbbb3
|
||||
palette = 13=#d699b6
|
||||
palette = 14=#83c092
|
||||
palette = 15=#d3c6aa
|
||||
@@ -1,94 +0,0 @@
|
||||
@define-color foreground #d3c6aa;
|
||||
@define-color background #2d353b;
|
||||
@define-color accent #a7c080;
|
||||
@define-color muted #475258;
|
||||
@define-color card_bg #333c43;
|
||||
@define-color text_dark #2d353b;
|
||||
@define-color accent_hover #83c092;
|
||||
@define-color selected_tab #a7c080;
|
||||
@define-color text #d3c6aa;
|
||||
|
||||
* {
|
||||
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(d3c6aa)
|
||||
|
||||
general {
|
||||
col.active_border = $activeBorderColor
|
||||
}
|
||||
|
||||
group {
|
||||
col.border_active = $activeBorderColor
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
$color = rgba(45,53,59,1.0)
|
||||
$inner_color = rgba(45,53,59,0.8)
|
||||
$outer_color = rgba(211,198,170,1.0)
|
||||
$font_color = rgba(211,198,170,1.0)
|
||||
$check_color = rgba(131, 192, 146, 1.0)
|
||||
@@ -1,28 +0,0 @@
|
||||
## name: Everforest Dark Hard
|
||||
## author: Sainnhe Park
|
||||
## license: MIT
|
||||
## upstream: https://github.com/ewal/kitty-everforest/blob/master/themes/everforest_dark_hard.conf
|
||||
## blurb: A green based color scheme designed to be warm and soft
|
||||
|
||||
background #2d353b
|
||||
foreground #d3c6aa
|
||||
|
||||
# Normal colors
|
||||
color0 #475258
|
||||
color1 #e67e80
|
||||
color2 #a7c080
|
||||
color3 #dbbc7f
|
||||
color4 #7fbbb3
|
||||
color5 #d699b6
|
||||
color6 #83c092
|
||||
color7 #d3c6aa
|
||||
|
||||
# Bright colors
|
||||
color8 #475258
|
||||
color9 #e67e80
|
||||
color10 #a7c080
|
||||
color11 #dbbc7f
|
||||
color12 #7fbbb3
|
||||
color13 #d699b6
|
||||
color14 #83c092
|
||||
color15 #d3c6aa
|
||||
@@ -1,5 +0,0 @@
|
||||
include=~/.local/share/omarchy/default/mako/core.ini
|
||||
|
||||
text-color=#d3c6aa
|
||||
border-color=#d3c6aa
|
||||
background-color=#2d353b
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color background-color #2d353b;
|
||||
@define-color border-color #d3c6aa;
|
||||
@define-color label #d3c6aa;
|
||||
@define-color image #d3c6aa;
|
||||
@define-color progress #d3c6aa;
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color selected-text #dbbc7f;
|
||||
@define-color text #d3c6aa;
|
||||
@define-color base #2d353b;
|
||||
@define-color border #d3c6aa;
|
||||
@define-color foreground #d3c6aa;
|
||||
@define-color background #2d353b;
|
||||
@@ -1,2 +0,0 @@
|
||||
@define-color foreground #d3c6aa;
|
||||
@define-color background #2d353b;
|
||||
Reference in New Issue
Block a user