From 1716125bcaaca14c846bb10469a600839627e97c Mon Sep 17 00:00:00 2001 From: Yuri Zamyatin Date: Sun, 30 Mar 2025 22:06:01 +0000 Subject: [PATCH] wip --- arch-user/config/foot/foot.ini.tmpl | 8 +++--- arch-user/config/mako/config.tmpl | 6 ++-- arch-user/config/profile | 8 ++++++ arch-user/config/profile.part | 3 -- .../qutebrowser/{config.py.tmpl => config.py} | 8 +++--- arch-user/config/sway/config.tmpl | 28 +++++++++---------- arch-user/config/theme.json | 22 +++++++++++++++ arch-user/config/theme.sh | 23 --------------- 8 files changed, 55 insertions(+), 51 deletions(-) create mode 100644 arch-user/config/profile delete mode 100644 arch-user/config/profile.part rename arch-user/config/qutebrowser/{config.py.tmpl => config.py} (73%) create mode 100644 arch-user/config/theme.json delete mode 100644 arch-user/config/theme.sh diff --git a/arch-user/config/foot/foot.ini.tmpl b/arch-user/config/foot/foot.ini.tmpl index 051cd66..b937332 100644 --- a/arch-user/config/foot/foot.ini.tmpl +++ b/arch-user/config/foot/foot.ini.tmpl @@ -7,7 +7,7 @@ # app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode title=term # locked-title=no -font=$THEME_FONT_MONO:size=$THEME_SIZE_FONT_BASE_PT +font={{ .theme.font.name_mono }}:size={{ .theme.font.size_base_pt }} # font-bold= # font-italic= # font-bold-italic= @@ -83,9 +83,9 @@ pad=8x4 # optionally append 'center' # long-press-delay=400 [colors] -alpha=$THEME_OPACITY_HIGH -background=$THEME_COLOR_BG -# foreground=ffffff +alpha={{ .theme.opacity.high }} +background={{ .theme.color.bg }} +foreground={{ .theme.color.fg }} # flash=7f7f00 # flash-alpha=0.5 diff --git a/arch-user/config/mako/config.tmpl b/arch-user/config/mako/config.tmpl index 87524ab..f2c4235 100644 --- a/arch-user/config/mako/config.tmpl +++ b/arch-user/config/mako/config.tmpl @@ -1,9 +1,9 @@ format=%s - %a\n%b font=Roboto 10 -background-color=#$THEME_COLOR_BG_ACCENT_DARK$THEME_OPACITY_HIGH_HEX +background-color=#{{ .theme.color.bg_accent_dark }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }} border-size=2 border-radius=4 -border-color=#$THEME_COLOR_FG_ACCENT$THEME_OPACITY_MID_HEX +border-color=#{{ .theme.color.fg_accent }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} padding=5,10 width=400 -progress-color=#$THEME_COLOR_FG_ACCENT$THEME_OPACITY_MID_HEX +progress-color=#{{ .theme.color.fg_accent }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} diff --git a/arch-user/config/profile b/arch-user/config/profile new file mode 100644 index 0000000..5d7a95a --- /dev/null +++ b/arch-user/config/profile @@ -0,0 +1,8 @@ +#!/bin/bash + +export PATH=$PATH:~/.local/bin + + +{{ jq "1 config/theme.json\n" }} + +source ~/.config/bemenu/config.sh diff --git a/arch-user/config/profile.part b/arch-user/config/profile.part deleted file mode 100644 index d28d061..0000000 --- a/arch-user/config/profile.part +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -export PATH=$PATH:~/.local/bin diff --git a/arch-user/config/qutebrowser/config.py.tmpl b/arch-user/config/qutebrowser/config.py similarity index 73% rename from arch-user/config/qutebrowser/config.py.tmpl rename to arch-user/config/qutebrowser/config.py index 0c59e6b..e8d3e54 100644 --- a/arch-user/config/qutebrowser/config.py.tmpl +++ b/arch-user/config/qutebrowser/config.py @@ -1,4 +1,4 @@ -# vim: filetype=python +import os config.load_autoconfig(False) # actions @@ -11,7 +11,7 @@ for mode in ['normal','insert','hint','passthrough','command','prompt','yesno',' # styles config.set('colors.webpage.preferred_color_scheme','dark') config.set('colors.webpage.darkmode.enabled', True) -config.set('colors.webpage.bg','#$THEME_COLOR_BG') +config.set('colors.webpage.bg','#'+os.environ['THEME_COLOR_BG']) config.set('fonts.default_family','Roboto') # engines config.set('url.searchengines', { @@ -21,5 +21,5 @@ config.set('url.searchengines', { '!y': 'https://ya.ru/search/?text={}', '!c': 'https://chat.openai.com/chat?q={}', }) -config.set('url.default_page', 'file:///home/$USER/.local/share/qutebrowser/start.html') -config.set('url.start_pages', ['file:///home/$USER/.local/share/qutebrowser/start.html']) +config.set('url.default_page', 'file:///home/'+os.environ['USER']+'/.local/share/qutebrowser/start.html') +config.set('url.start_pages', ['file:///home/'+os.environ['USER']+'/.local/share/qutebrowser/start.html']) diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl index 3b1db47..73ea8cd 100644 --- a/arch-user/config/sway/config.tmpl +++ b/arch-user/config/sway/config.tmpl @@ -15,28 +15,28 @@ set $bwd apostrophe default_border pixel 1 smart_borders on title_align center -font pango:$THEME_FONT_REGULAR $THEME_SIZE_FONT_SMALL_PT -output * bg #$THEME_COLOR_BG solid_color -client.focused #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_FG #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_BG_ACCENT_LIGHT -client.focused_tab_title #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX #$THEME_COLOR_FG_DARK #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_BG_ACCENT_LIGHT -client.focused_inactive #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_FG_DARK #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX -client.unfocused #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_FG_DARK #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX +font pango:{{ .theme.font.name_regular }} {{ math.Mul .theme.font.size_base_pt .theme.font.size_smaller_em }} +output * bg #{{ .theme.color.bg }} solid_color +client.focused #{{ .theme.color.bg_accent_light }} #{{ .theme.color.bg_accent_light }} #{{ .theme.color.fg }} #{{ .theme.color.fg_accent }} #{{ .theme.color.bg_accent_light }} +client.focused_tab_title #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} #{{ .theme.color.fg_dark }} #{{ .theme.color.fg_accent }} #{{ .theme.color.bg_accent_light }} +client.focused_inactive #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} #{{ .theme.color.bg_accent_dark }} #{{ .theme.color.fg_dark }} #{{ .theme.color.fg_accent }} #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} +client.unfocused #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} #{{ .theme.color.bg_accent_dark }} #{{ .theme.color.fg_dark }} #{{ .theme.color.fg_accent }} #{{ .theme.color.bg_accent_light }}{{ math.Mul .theme.opacity.med 255 | conv.ToInt64 | printf "%02X" }} bar { position top - font pango:$THEME_FONT_REGULAR $THEME_SIZE_FONT_BASE_PT + font pango:{{ .theme.font.name_regular }} {{ .theme.font.size_base_pt }} status_command i3blocks strip_workspace_numbers yes separator_symbol | workspace_min_width 28 tray_output none colors { - statusline #$THEME_COLOR_FG - background #$THEME_COLOR_BG - separator #$THEME_COLOR_FG_DARK - focused_workspace #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_FG - inactive_workspace #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_FG - urgent_workspace #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_FG - binding_mode #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_FG_ACCENT #$THEME_COLOR_FG + statusline #{{ .theme.color.fg }} + background #{{ .theme.color.bg }} + separator #{{ .theme.color.fg_dark }} + focused_workspace #{{ .theme.color.bg_accent_light }} #{{ .theme.color.bg_accent_light }} #{{ .theme.color.fg }} + inactive_workspace #{{ .theme.color.bg_accent_dark }} #{{ .theme.color.bg_accent_dark }} #{{ .theme.color.fg }} + urgent_workspace #{{ .theme.color.fg_accent }} #{{ .theme.color.fg_accent }} #{{ .theme.color.fg }} + binding_mode #{{ .theme.color.fg_accent }} #{{ .theme.color.fg_accent }} #{{ .theme.color.fg }} } } ########################################### diff --git a/arch-user/config/theme.json b/arch-user/config/theme.json new file mode 100644 index 0000000..3d634bb --- /dev/null +++ b/arch-user/config/theme.json @@ -0,0 +1,22 @@ +{ + "color": { + "fg": "ffffff", + "fg_dark": "b8bcc1", + "fg_accent": "9988ff", + "bg": "0d1117", + "bg_accent_light":"510079", + "bg_accent_dark":"020030" + }, + "opacity": { + "low": 0.2, + "med": 0.55, + "high": 0.85 + }, + "font": { + "name_regular": "Roboto", + "name_mono": "Roboto Mono", + "size_base_pt": 12, + "size_smaller_em": 0.875, + "size_larger_em": 1.1125 + } +} diff --git a/arch-user/config/theme.sh b/arch-user/config/theme.sh deleted file mode 100644 index 05269cd..0000000 --- a/arch-user/config/theme.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# std -export THEME_COLOR_FG=ffffff # main text -export THEME_COLOR_FG_DARK=b8bcc1 # secondary text -export THEME_COLOR_FG_ACCENT=9988ff # highlighted text, scrollbars (low-mid transp) -export THEME_COLOR_BG=0d1117 # base bg -export THEME_COLOR_BG_ACCENT_LIGHT=510079 # highlighted alt bg, borders -export THEME_COLOR_BG_ACCENT_DARK=020030 # alt bg -export THEME_OPACITY_LOW=0.2 -export THEME_OPACITY_MID=0.55 -export THEME_OPACITY_HIGH=0.85 -export THEME_SIZE_FONT_BASE_PX=16 -export THEME_SIZE_FONT_SMALL_MULT=0.875 -export THEME_SIZE_FONT_LARGE_MULT=1.1125 -export THEME_FONT_REGULAR=Roboto -export THEME_FONT_MONO="Roboto Mono" -# calculated -export THEME_SIZE_FONT_BASE_PT=12 -export THEME_SIZE_FONT_SMALL_PT=10.5 -export THEME_SIZE_FONT_LARGE_PT=13.5 -export THEME_OPACITY_LOW_HEX=33 -export THEME_OPACITY_MID_HEX=8C -export THEME_OPACITY_HIGH_HEX=D9