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,36 +0,0 @@
|
||||
[colors]
|
||||
[colors.primary]
|
||||
background = '#1f1f28'
|
||||
foreground = '#dcd7ba'
|
||||
|
||||
[colors.normal]
|
||||
black = '#090618'
|
||||
red = '#c34043'
|
||||
green = '#76946a'
|
||||
yellow = '#c0a36e'
|
||||
blue = '#7e9cd8'
|
||||
magenta = '#957fb8'
|
||||
cyan = '#6a9589'
|
||||
white = '#c8c093'
|
||||
|
||||
[colors.bright]
|
||||
black = '#727169'
|
||||
red = '#e82424'
|
||||
green = '#98bb6c'
|
||||
yellow = '#e6c384'
|
||||
blue = '#7fb4ca'
|
||||
magenta = '#938aa9'
|
||||
cyan = '#7aa89f'
|
||||
white = '#dcd7ba'
|
||||
|
||||
[colors.selection]
|
||||
background = '#2d4f67'
|
||||
foreground = '#c8c093'
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 16
|
||||
color = '#ffa066'
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 17
|
||||
color = '#ff5d62'
|
||||
26
themes/kanagawa/colors.toml
Normal file
26
themes/kanagawa/colors.toml
Normal file
@@ -0,0 +1,26 @@
|
||||
accent = "#7e9cd8"
|
||||
active_border_color = "#7e9cd8"
|
||||
active_tab_background = "#1f1f28"
|
||||
|
||||
cursor = "#c8c093"
|
||||
foreground = "#dcd7ba"
|
||||
background = "#1f1f28"
|
||||
selection_foreground = "#c8c093"
|
||||
selection_background = "#2d4f67"
|
||||
|
||||
color0 = "#090618"
|
||||
color1 = "#c34043"
|
||||
color2 = "#76946a"
|
||||
color3 = "#c0a36e"
|
||||
color4 = "#7e9cd8"
|
||||
color5 = "#957fb8"
|
||||
color6 = "#6a9589"
|
||||
color7 = "#c8c093"
|
||||
color8 = "#727169"
|
||||
color9 = "#e82424"
|
||||
color10 = "#98bb6c"
|
||||
color11 = "#e6c384"
|
||||
color12 = "#7fb4ca"
|
||||
color13 = "#938aa9"
|
||||
color14 = "#7aa89f"
|
||||
color15 = "#dcd7ba"
|
||||
@@ -1 +0,0 @@
|
||||
theme = Kanagawa Wave
|
||||
@@ -1,94 +0,0 @@
|
||||
@define-color foreground #dcd7ba;
|
||||
@define-color background #1f1f28;
|
||||
@define-color accent #7e9cd8;
|
||||
@define-color muted #727169;
|
||||
@define-color card_bg #2a2a37;
|
||||
@define-color text_dark #16161d;
|
||||
@define-color accent_hover #7fb4ca;
|
||||
@define-color selected_tab #7e9cd8;
|
||||
@define-color text #dcd7ba;
|
||||
|
||||
* {
|
||||
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,5 +0,0 @@
|
||||
$color = rgba(31,31,40,1.0)
|
||||
$inner_color = rgba(31,31,40,0.8)
|
||||
$outer_color = rgba(220,215,186,1.0)
|
||||
$font_color = rgba(220,215,186,1.0)
|
||||
$check_color = rgba(126, 156, 216, 1.0)
|
||||
@@ -1,68 +0,0 @@
|
||||
## name: Kanagawa
|
||||
## author: Tommaso Laurenzi
|
||||
## license: MIT
|
||||
## upstream: https://github.com/rebelot/kanagawa.nvim/
|
||||
## blurb: NeoVim dark colorscheme inspired by the colors of the famous painting
|
||||
## by Katsushika Hokusai.
|
||||
|
||||
#: The basic colors
|
||||
|
||||
foreground #dcd7ba
|
||||
background #1f1f28
|
||||
selection_foreground #c8c093
|
||||
selection_background #2d4f67
|
||||
|
||||
#: Cursor colors
|
||||
|
||||
cursor #c8c093
|
||||
|
||||
#: URL underline color when overing with mouse
|
||||
|
||||
url_color #72a7bc
|
||||
|
||||
#: Tab bar colors
|
||||
|
||||
active_tab_foreground #c8c093
|
||||
active_tab_background #1f1f28
|
||||
inactive_tab_foreground #727169
|
||||
inactive_tab_background #1f1f28
|
||||
|
||||
#: The basic 16 colors
|
||||
|
||||
#: black
|
||||
color0 #16161d
|
||||
color8 #727169
|
||||
|
||||
#: red
|
||||
color1 #c34043
|
||||
color9 #e82424
|
||||
|
||||
#: green
|
||||
color2 #76946a
|
||||
color10 #98bb6c
|
||||
|
||||
#: yellow
|
||||
color3 #c0a36e
|
||||
color11 #e6c384
|
||||
|
||||
#: blue
|
||||
color4 #7e9cd8
|
||||
color12 #7fb4ca
|
||||
|
||||
#: magenta
|
||||
color5 #957fb8
|
||||
color13 #938aa9
|
||||
|
||||
#: cyan
|
||||
color6 #6a9589
|
||||
color14 #7aa89f
|
||||
|
||||
#: white
|
||||
color7 #c8c093
|
||||
color15 #dcd7ba
|
||||
|
||||
|
||||
#: You can set the remaining 240 colors as color16 to color255.
|
||||
|
||||
color16 #ffa066
|
||||
color17 #ff5d62
|
||||
@@ -1,5 +0,0 @@
|
||||
include=~/.local/share/omarchy/default/mako/core.ini
|
||||
|
||||
text-color=#dcd7ba
|
||||
border-color=#dcd7ba
|
||||
background-color=#1f1f28
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color background-color #1f1f28;
|
||||
@define-color border-color #dcd7ba;
|
||||
@define-color label #dcd7ba;
|
||||
@define-color image #dcd7ba;
|
||||
@define-color progress #dcd7ba;
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
@define-color selected-text #dca561;
|
||||
@define-color text #dcd7ba;
|
||||
@define-color base #1f1f28;
|
||||
@define-color border #dcd7ba;
|
||||
@define-color foreground #dcd7ba;
|
||||
@define-color background #1f1f28;
|
||||
@@ -1,2 +0,0 @@
|
||||
@define-color foreground #dcd7ba;
|
||||
@define-color background #1f1f28;
|
||||
Reference in New Issue
Block a user