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,39 +0,0 @@
|
||||
[colors.bright]
|
||||
black = "#100F0F"
|
||||
blue = "#205EA6"
|
||||
cyan = "#3AA99F"
|
||||
green = "#879A39"
|
||||
magenta = "#CE5D97"
|
||||
red = "#D14D41"
|
||||
white = "#FFFCF0"
|
||||
yellow = "#D0A215"
|
||||
|
||||
[colors.cursor]
|
||||
cursor = "#100F0F"
|
||||
text = "#FFFCF0"
|
||||
|
||||
[colors.dim]
|
||||
black = "#100F0F"
|
||||
blue = "#205EA6"
|
||||
cyan = "#3AA99F"
|
||||
green = "#879A39"
|
||||
magenta = "#CE5D97"
|
||||
red = "#D14D41"
|
||||
white = "#FFFCF0"
|
||||
yellow = "#D0A215"
|
||||
|
||||
[colors.normal]
|
||||
black = "#100F0F"
|
||||
blue = "#205EA6"
|
||||
cyan = "#3AA99F"
|
||||
green = "#879A39"
|
||||
magenta = "#CE5D97"
|
||||
red = "#D14D41"
|
||||
white = "#FFFCF0"
|
||||
yellow = "#D0A215"
|
||||
|
||||
[colors.primary]
|
||||
background = "#FFFCF0"
|
||||
bright_foreground = "#100F0F"
|
||||
dim_foreground = "#100F0F"
|
||||
foreground = "#100F0F"
|
||||
26
themes/flexoki-light/colors.toml
Normal file
26
themes/flexoki-light/colors.toml
Normal file
@@ -0,0 +1,26 @@
|
||||
accent = "#205EA6"
|
||||
active_border_color = "#D14D41"
|
||||
active_tab_background = "#CECDC3"
|
||||
|
||||
cursor = "#100F0F"
|
||||
foreground = "#100F0F"
|
||||
background = "#FFFCF0"
|
||||
selection_foreground = "#100F0F"
|
||||
selection_background = "#CECDC3"
|
||||
|
||||
color0 = "#100F0F"
|
||||
color1 = "#D14D41"
|
||||
color2 = "#879A39"
|
||||
color3 = "#D0A215"
|
||||
color4 = "#205EA6"
|
||||
color5 = "#CE5D97"
|
||||
color6 = "#3AA99F"
|
||||
color7 = "#FFFCF0"
|
||||
color8 = "#100F0F"
|
||||
color9 = "#D14D41"
|
||||
color10 = "#879A39"
|
||||
color11 = "#D0A215"
|
||||
color12 = "#4385BE"
|
||||
color13 = "#CE5D97"
|
||||
color14 = "#3AA99F"
|
||||
color15 = "#FFFCF0"
|
||||
@@ -1 +0,0 @@
|
||||
theme = Flexoki Light
|
||||
@@ -1,94 +0,0 @@
|
||||
@define-color foreground #100F0F;
|
||||
@define-color background #FFFCF0;
|
||||
@define-color accent #205EA6;
|
||||
@define-color muted #6F6E69;
|
||||
@define-color card_bg #F2F0E5;
|
||||
@define-color text_dark #FFFCF0;
|
||||
@define-color accent_hover #4385BE;
|
||||
@define-color selected_tab #205EA6;
|
||||
@define-color text #100F0F;
|
||||
|
||||
* {
|
||||
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 = rgba(205EA6ee)
|
||||
|
||||
general {
|
||||
col.active_border = $activeBorderColor
|
||||
}
|
||||
|
||||
group {
|
||||
col.border_active = $activeBorderColor
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
$color = rgba(255,252,240,1.0)
|
||||
$inner_color = rgba(242,240,229,1.0)
|
||||
$outer_color = rgba(206,205,195,1.0)
|
||||
$font_color = rgba(16,15,15,1.0)
|
||||
$check_color = rgba(32, 94, 166, 1.0)
|
||||
@@ -1,67 +0,0 @@
|
||||
# vim:ft=kitty
|
||||
|
||||
## name: Flexoki (Light)
|
||||
## author: Kepano
|
||||
## license: MIT
|
||||
## upstream: https://raw.githubusercontent.com/kepano/flexoki/main/kitty/flexoki_light.conf
|
||||
## blurb: An inky color scheme for prose and code
|
||||
|
||||
# The basic colors
|
||||
foreground #100F0F
|
||||
background #FFFCF0
|
||||
selection_foreground #100F0F
|
||||
selection_background #CECDC3
|
||||
|
||||
# Cursor colors
|
||||
cursor #100F0F
|
||||
cursor_text_color #FFFCF0
|
||||
|
||||
# kitty window border colors
|
||||
active_border_color #D14D41
|
||||
inactive_border_color #CECDC3
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #100F0F
|
||||
active_tab_background #CECDC3
|
||||
inactive_tab_foreground #6F6E69
|
||||
inactive_tab_background #E6E4D9
|
||||
|
||||
# The basic 16 colors
|
||||
# black
|
||||
color0 #100F0F
|
||||
color8 #6F6E69
|
||||
|
||||
|
||||
# red
|
||||
color1 #D14D41
|
||||
color9 #AF3029
|
||||
|
||||
|
||||
# green
|
||||
color2 #879A39
|
||||
color10 #66800B
|
||||
|
||||
|
||||
# yellow
|
||||
color3 #D0A215
|
||||
color11 #AD8301
|
||||
|
||||
|
||||
# blue
|
||||
color4 #4385BE
|
||||
color12 #205EA6
|
||||
|
||||
|
||||
# magenta
|
||||
color5 #CE5D97
|
||||
color13 #A02F6F
|
||||
|
||||
|
||||
# cyan
|
||||
color6 #3AA99F
|
||||
color14 #24837B
|
||||
|
||||
|
||||
# white
|
||||
color7 #FFFCF0
|
||||
color15 #F2F0E5
|
||||
@@ -1,5 +0,0 @@
|
||||
include=~/.local/share/omarchy/default/mako/core.ini
|
||||
|
||||
text-color=#100F0F
|
||||
border-color=#205EA6
|
||||
background-color=#FFFCF0
|
||||
@@ -1,5 +0,0 @@
|
||||
@define-color background-color #FFFCF0;
|
||||
@define-color border-color #205EA6;
|
||||
@define-color label #100F0F;
|
||||
@define-color image #100F0F;
|
||||
@define-color progress #100F0F;
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color selected-text #205EA6;
|
||||
@define-color text #100F0F;
|
||||
@define-color base #FFFCF0;
|
||||
@define-color border #205EA6;
|
||||
@define-color foreground #100F0F;
|
||||
@define-color background #FFFCF0;
|
||||
@@ -1,2 +0,0 @@
|
||||
@define-color foreground #100F0F;
|
||||
@define-color background #FFFCF0;
|
||||
Reference in New Issue
Block a user