From: Andre Ramnitz Date: Wed, 18 Sep 2024 17:34:35 +0000 (+0200) Subject: flavours: move color definitions into separate files X-Git-Tag: v0.2~59 X-Git-Url: https://git.ramnitz.eu/?a=commitdiff_plain;h=e6496ed015a1e29f9c228e00c009fb12ba771331;p=dotfiles.git flavours: move color definitions into separate files --- diff --git a/.gitignore b/.gitignore index 41fe146d..3e615a5e 100644 --- a/.gitignore +++ b/.gitignore @@ -468,3 +468,13 @@ tmux/dot-tmux/plugins/* # tbsm session order #.*(?:[0-9]{3}).*\.desktop$ config/tbsm + +# base16 generated files +base16-colors.ini +base16-colors.conf +base16.kak +base16-colors.css +dabruin-wrapper.kak +base16-wrapper.py +base16-flavours + diff --git a/config/dot-config/flavours/config.toml b/config/dot-config/flavours/config.toml index 1a7bfd64..07ebada2 100644 --- a/config/dot-config/flavours/config.toml +++ b/config/dot-config/flavours/config.toml @@ -2,7 +2,7 @@ shell = "bash -c '{}'" [[item]] template = "foot" -file = "~/.config/foot/colours.ini" +file = "~/.config/foot/base16-colors.ini" rewrite = true [[item]] @@ -27,22 +27,21 @@ file = "~/.config/fuzzel/fuzzel-powermenu.ini" [[item]] template = "hyprland" subtemplate = "colors" -file = "~/.config/hypr/colors.conf" +file = "~/.config/hypr/base16-colors.conf" hook = "hyprctl reload" rewrite = true [[item]] template = "qutebrowser" subtemplate = "minimal" -file = "~/.config/qutebrowser/config.py" +file = "~/.config/qutebrowser/base16-wrapper.py" hook = "~/.config/flavours/hooks/reloadqb" -start = "# Start flavours" -end = "# End flavours" +rewrite = true [[item]] template = "waybar" -file = "~/.config/waybar/colors.css" -hook = "swaync-client -cp -sw && pkill -USR2 waybar" +file = "~/.config/waybar/base16-colors.css" +hook = "swaync-client -rs -sw && pkill -USR2 waybar" rewrite = true [[item]] @@ -54,8 +53,8 @@ hook = "plasma-apply-colorscheme Oxygen && plasma-apply-colorscheme base16" [[item]] template = "kakoune" subtemplate = "dabruin" -file = "~/.config/kak/kakrc" -rewrite = false +file = "~/.config/kak/dabruin-wrapper.kak" +rewrite = true [[item]] template = "kakoune" diff --git a/config/dot-config/flavours/templates/kakoune/templates/config.yaml b/config/dot-config/flavours/templates/kakoune/templates/config.yaml index 2f9f5536..0c8af607 100644 --- a/config/dot-config/flavours/templates/kakoune/templates/config.yaml +++ b/config/dot-config/flavours/templates/kakoune/templates/config.yaml @@ -1,11 +1,11 @@ default: extension: .kak - output: colors + output: base16 dabruin: extension: .kak - output: colors + output: dabruin-wrapper -dabruin-default: +dabruin-alpha: extension: .kak - output: colors + output: dabruin-wrapper diff --git a/config/dot-config/flavours/templates/kakoune/templates/dabruin-alpha.mustache b/config/dot-config/flavours/templates/kakoune/templates/dabruin-alpha.mustache new file mode 100644 index 00000000..6598250d --- /dev/null +++ b/config/dot-config/flavours/templates/kakoune/templates/dabruin-alpha.mustache @@ -0,0 +1,5 @@ +## base16-kakoune (https://github.com/leira/base16-kakoune) +## by Leira Hua +## {{scheme-name}} scheme by {{scheme-author}} +declare-option str dabruin_background 'default' +declare-option str dabruin_accent 'rgb:{{base0C-hex}}' diff --git a/config/dot-config/flavours/templates/kakoune/templates/dabruin-default.mustache b/config/dot-config/flavours/templates/kakoune/templates/dabruin-default.mustache deleted file mode 100644 index 6598250d..00000000 --- a/config/dot-config/flavours/templates/kakoune/templates/dabruin-default.mustache +++ /dev/null @@ -1,5 +0,0 @@ -## base16-kakoune (https://github.com/leira/base16-kakoune) -## by Leira Hua -## {{scheme-name}} scheme by {{scheme-author}} -declare-option str dabruin_background 'default' -declare-option str dabruin_accent 'rgb:{{base0C-hex}}' diff --git a/config/dot-config/flavours/templates/qutebrowser/templates/colorsonly.mustache b/config/dot-config/flavours/templates/qutebrowser/templates/colorsonly.mustache new file mode 100644 index 00000000..23e543f0 --- /dev/null +++ b/config/dot-config/flavours/templates/qutebrowser/templates/colorsonly.mustache @@ -0,0 +1,22 @@ +# base16-qutebrowser (https://github.com/theova/base16-qutebrowser) +# Scheme name: {{scheme-name}} +# Scheme author: {{scheme-author}} +# Template author: theova +# Commentary: Tinted Theming: (https://github.com/tinted-theming) + +base00 = "#{{base00-hex}}" +base01 = "#{{base01-hex}}" +base02 = "#{{base02-hex}}" +base03 = "#{{base03-hex}}" +base04 = "#{{base04-hex}}" +base05 = "#{{base05-hex}}" +base06 = "#{{base06-hex}}" +base07 = "#{{base07-hex}}" +base08 = "#{{base08-hex}}" +base09 = "#{{base09-hex}}" +base0A = "#{{base0A-hex}}" +base0B = "#{{base0B-hex}}" +base0C = "#{{base0C-hex}}" +base0D = "#{{base0D-hex}}" +base0E = "#{{base0E-hex}}" +base0F = "#{{base0F-hex}}" diff --git a/config/dot-config/flavours/templates/qutebrowser/templates/config.yaml b/config/dot-config/flavours/templates/qutebrowser/templates/config.yaml index d033b4c4..96cae8e3 100644 --- a/config/dot-config/flavours/templates/qutebrowser/templates/config.yaml +++ b/config/dot-config/flavours/templates/qutebrowser/templates/config.yaml @@ -5,3 +5,7 @@ default: minimal: extension: .config.py output: themes/minimal + +colorsonly: + extension: .py + output: base16-wrapper diff --git a/config/dot-config/flavours/templates/qutebrowser/templates/minimal.mustache b/config/dot-config/flavours/templates/qutebrowser/templates/minimal.mustache index cf3b1fe0..1689256b 100644 --- a/config/dot-config/flavours/templates/qutebrowser/templates/minimal.mustache +++ b/config/dot-config/flavours/templates/qutebrowser/templates/minimal.mustache @@ -299,5 +299,4 @@ c.colors.tabs.selected.even.bg = base04 # Background color for webpages if unset (or empty to use the theme's # color). -c.colors.webpage.bg = base00 - +c.colors.webpage.bg = '' diff --git a/config/dot-config/foot/colours.ini b/config/dot-config/foot/colours.ini deleted file mode 100644 index fd575d9f..00000000 --- a/config/dot-config/foot/colours.ini +++ /dev/null @@ -1,32 +0,0 @@ -# base16-foot -# Scheme name: Rosé Pine -# Scheme author: Emilia Dunfelt <edun@dunfelt.se> -# Template author: Tinted Theming (https://github.com/tinted-theming) -# include in foot.ini like so: -# include=~/.config/foot/colours.ini -# must be included under [main], or untitled section at beginning of file -[colors] -foreground=e0def4 -background=191724 -regular0=191724 # black -regular1=eb6f92 # red -regular2=31748f # green -regular3=ebbcba # yellow -regular4=c4a7e7 # blue -regular5=f6c177 # magenta -regular6=9ccfd8 # cyan -regular7=e0def4 # white -bright0=6e6a86 # bright black -bright1=eb6f92 # bright red -bright2=31748f # bright green -bright3=ebbcba # bright yellow -bright4=c4a7e7 # bright blue -bright5=f6c177 # bright magenta -bright6=9ccfd8 # bright cyan -bright7=524f67 # bright white -16=f6c177 -17=524f67 -18=1f1d2e -19=26233a -20=908caa -21=e0def4 \ No newline at end of file diff --git a/config/dot-config/foot/foot.ini b/config/dot-config/foot/foot.ini index 15dd461a..56991c9c 100644 --- a/config/dot-config/foot/foot.ini +++ b/config/dot-config/foot/foot.ini @@ -1,5 +1,5 @@ # -*- conf -*- -include=~/.config/foot/colours.ini +include=~/.config/foot/base16-colors.ini # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) shell=/bin/fish diff --git a/config/dot-config/hypr/colors.conf b/config/dot-config/hypr/colors.conf deleted file mode 100644 index 579444a5..00000000 --- a/config/dot-config/hypr/colors.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Base16 Rosé Pine -# Author: Emilia Dunfelt <edun@dunfelt.se> - -$base00 = 0xff191724 -$base01 = 0xff1f1d2e -$base02 = 0xff26233a -$base03 = 0xff6e6a86 -$base04 = 0xff908caa -$base05 = 0xffe0def4 -$base06 = 0xffe0def4 -$base07 = 0xff524f67 -$base08 = 0xffeb6f92 -$base09 = 0xfff6c177 -$base0A = 0xffebbcba -$base0B = 0xff31748f -$base0C = 0xff9ccfd8 -$base0D = 0xffc4a7e7 -$base0E = 0xfff6c177 -$base0F = 0xff524f67 \ No newline at end of file diff --git a/config/dot-config/hypr/hyprland.conf b/config/dot-config/hypr/hyprland.conf index e0bc2ef2..04bd9f18 100644 --- a/config/dot-config/hypr/hyprland.conf +++ b/config/dot-config/hypr/hyprland.conf @@ -4,7 +4,7 @@ autogenerated = 0 # remove this line to remove the warning -source=./colors.conf +source=./base16-colors.conf debug:disable_logs = true # file logging. defaults to 1 for production diff --git a/config/dot-config/kak/colors/base16.kak b/config/dot-config/kak/colors/base16.kak deleted file mode 100644 index 0ae479e0..00000000 --- a/config/dot-config/kak/colors/base16.kak +++ /dev/null @@ -1,76 +0,0 @@ -## -## base16.kak by lenormf -## - -evaluate-commands %sh{ - black_lighterer='rgb:383838' - black_lighter='rgb:2D2D2D' - black_light='rgb:1C1C1C' - cyan_light='rgb:7CB0FF' - green_dark='rgb:A1B56C' - grey_dark='rgb:585858' - grey_medium='rgb:989898' - grey_light='rgb:D8D8D8' - magenta_dark='rgb:AB4642' - magenta_light='rgb:AB4434' - orange_dark='rgb:DC9656' - orange_light='rgb:F7CA88' - purple_dark='rgb:BA8BAF' - - ## code - echo " - face global value ${orange_dark}+b - face global type ${orange_light} - face global variable ${magenta_dark} - face global module ${green_dark} - face global function ${cyan_light} - face global string ${green_dark} - face global keyword ${purple_dark}+b - face global operator ${cyan_light} - face global attribute ${orange_dark} - face global comment ${grey_medium} - face global documentation comment - face global meta ${orange_light} - face global builtin default+b - " - - ## markup - echo " - face global title blue - face global header ${cyan_light} - face global mono ${green_dark} - face global block ${orange_dark} - face global link blue - face global bullet ${magenta_light} - face global list ${magenta_dark} - " - - ## builtin - echo " - face global Default ${grey_light},${black_light} - face global PrimarySelection white,blue+fg - face global SecondarySelection black,blue+fg - face global PrimaryCursor black,white+fg - face global SecondaryCursor black,white+fg - face global PrimaryCursorEol black,${cyan_light}+fg - face global SecondaryCursorEol black,${cyan_light}+fg - face global LineNumbers ${grey_light},${black_lighter} - face global LineNumberCursor ${grey_light},rgb:282828+b - face global MenuForeground ${grey_light},blue - face global MenuBackground blue,${grey_light} - face global MenuInfo ${cyan_light} - face global Information ${black_light},${cyan_light} - face global Error ${grey_light},${magenta_light} - face global DiagnosticError ${magenta_light} - face global DiagnosticWarning ${cyan_light} - face global StatusLine ${grey_light},${black_lighterer} - face global StatusLineMode ${orange_dark} - face global StatusLineInfo ${cyan_light} - face global StatusLineValue ${green_dark} - face global StatusCursor ${black_lighterer},${cyan_light} - face global Prompt ${black_light},${cyan_light} - face global MatchingChar ${cyan_light},${black_light}+b - face global BufferPadding ${cyan_light},${black_lighter} - face global Whitespace ${grey_dark}+f - " -} diff --git a/config/dot-config/kak/kakrc b/config/dot-config/kak/kakrc index 1a967a72..f993f822 100644 --- a/config/dot-config/kak/kakrc +++ b/config/dot-config/kak/kakrc @@ -139,14 +139,11 @@ hook global WinSetOption filetype=yaml %{ # Look and Feel # ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── -# dabruin colorscheme config -# Start flavours -## base16-kakoune (https://github.com/leira/base16-kakoune) -## by Leira Hua -## Rosé Pine scheme by Emilia Dunfelt <edun@dunfelt.se> -declare-option str dabruin_background 'default' -declare-option str dabruin_accent 'rgb:9ccfd8' -# End flavours +# dabruin colorscheme config in separate file +source "%val{config}/dabruin-wrapper.kak" +# with the following values: +# declare-option str dabruin_background 'rgb:181818' +# declare-option str dabruin_accent 'rgb:86c1b9' colorscheme dabruin # wrapping only word-wise diff --git a/config/dot-config/qutebrowser/config.py b/config/dot-config/qutebrowser/config.py index 6bebdd37..87140bac 100644 --- a/config/dot-config/qutebrowser/config.py +++ b/config/dot-config/qutebrowser/config.py @@ -729,317 +729,6 @@ c.zoom.default = '123%' # Type: Int c.zoom.mouse_divider = 1024 - -# Start flavours -# base16-qutebrowser (https://github.com/theova/base16-qutebrowser) -# Scheme name: Rosé Pine -# Scheme author: Emilia Dunfelt <edun@dunfelt.se> -# Template author: theova -# Commentary: Tinted Theming: (https://github.com/tinted-theming) - -base00 = "#191724" -base01 = "#1f1d2e" -base02 = "#26233a" -base03 = "#6e6a86" -base04 = "#908caa" -base05 = "#e0def4" -base06 = "#e0def4" -base07 = "#524f67" -base08 = "#eb6f92" -base09 = "#f6c177" -base0A = "#ebbcba" -base0B = "#31748f" -base0C = "#9ccfd8" -base0D = "#c4a7e7" -base0E = "#f6c177" -base0F = "#524f67" - -# set qutebrowser colors - -# Text color of the completion widget. May be a single color to use for -# all columns or a list of three colors, one for each column. -c.colors.completion.fg = base05 - -# Background color of the completion widget for odd rows. -c.colors.completion.odd.bg = base00 - -# Background color of the completion widget for even rows. -c.colors.completion.even.bg = base00 - -# Foreground color of completion widget category headers. -c.colors.completion.category.fg = base0D - -# Background color of the completion widget category headers. -c.colors.completion.category.bg = base00 - -# Top border color of the completion widget category headers. -c.colors.completion.category.border.top = base00 - -# Bottom border color of the completion widget category headers. -c.colors.completion.category.border.bottom = base00 - -# Foreground color of the selected completion item. -c.colors.completion.item.selected.fg = base06 - -# Background color of the selected completion item. -c.colors.completion.item.selected.bg = base07 - -# Top border color of the selected completion item. -c.colors.completion.item.selected.border.top = base02 - -# Bottom border color of the selected completion item. -c.colors.completion.item.selected.border.bottom = base02 - -# Foreground color of the matched text in the selected completion item. -c.colors.completion.item.selected.match.fg = base05 - -# Foreground color of the matched text in the completion. -c.colors.completion.match.fg = base0C - -# Color of the scrollbar handle in the completion view. -c.colors.completion.scrollbar.fg = base05 - -# Color of the scrollbar in the completion view. -c.colors.completion.scrollbar.bg = base00 - -# Background color of disabled items in the context menu. -c.colors.contextmenu.disabled.bg = base00 - -# Foreground color of disabled items in the context menu. -c.colors.contextmenu.disabled.fg = base04 - -# Background color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.bg = base00 - -# Foreground color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.fg = base05 - -# Background color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.bg = base03 - -#Foreground color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.fg = base05 - -# Background color for the download bar. -c.colors.downloads.bar.bg = base00 - -# Color gradient start for download text. -c.colors.downloads.start.fg = base00 - -# Color gradient start for download backgrounds. -c.colors.downloads.start.bg = base0D - -# Color gradient end for download text. -c.colors.downloads.stop.fg = base00 - -# Color gradient stop for download backgrounds. -c.colors.downloads.stop.bg = base0C - -# Foreground color for downloads with errors. -c.colors.downloads.error.fg = base08 - -# Font color for hints. -c.colors.hints.fg = base00 - -# Background color for hints. Note that you can use a `rgba(...)` value -# for transparency. -c.colors.hints.bg = base0A - -# Font color for the matched part of hints. -c.colors.hints.match.fg = base05 - -# Text color for the keyhint widget. -c.colors.keyhint.fg = base05 - -# Highlight color for keys to complete the current keychain. -c.colors.keyhint.suffix.fg = base05 - -# Background color of the keyhint widget. -c.colors.keyhint.bg = base00 - -# Foreground color of an error message. -c.colors.messages.error.fg = base00 - -# Background color of an error message. -c.colors.messages.error.bg = base08 - -# Border color of an error message. -c.colors.messages.error.border = base08 - -# Foreground color of a warning message. -c.colors.messages.warning.fg = base00 - -# Background color of a warning message. -c.colors.messages.warning.bg = base0E - -# Border color of a warning message. -c.colors.messages.warning.border = base0E - -# Foreground color of an info message. -c.colors.messages.info.fg = base05 - -# Background color of an info message. -c.colors.messages.info.bg = base00 - -# Border color of an info message. -c.colors.messages.info.border = base00 - -# Foreground color for prompts. -c.colors.prompts.fg = base05 - -# Border used around UI elements in prompts. -c.colors.prompts.border = base00 - -# Background color for prompts. -c.colors.prompts.bg = base00 - -# Background color for the selected item in filename prompts. -c.colors.prompts.selected.bg = base02 - -# Foreground color for the selected item in filename prompts. -c.colors.prompts.selected.fg = base05 - -# Foreground color of the statusbar. -c.colors.statusbar.normal.fg = base05 - -# Background color of the statusbar. -c.colors.statusbar.normal.bg = base00 - -# Foreground color of the statusbar in insert mode. -c.colors.statusbar.insert.fg = base0C - -# Background color of the statusbar in insert mode. -c.colors.statusbar.insert.bg = base00 - -# Foreground color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.fg = base0A - -# Background color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.bg = base00 - -# Foreground color of the statusbar in private browsing mode. -c.colors.statusbar.private.fg = base0E - -# Background color of the statusbar in private browsing mode. -c.colors.statusbar.private.bg = base00 - -# Foreground color of the statusbar in command mode. -c.colors.statusbar.command.fg = base04 - -# Background color of the statusbar in command mode. -c.colors.statusbar.command.bg = base01 - -# Foreground color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.fg = base0E - -# Background color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.bg = base01 - -# Foreground color of the statusbar in caret mode. -c.colors.statusbar.caret.fg = base0D - -# Background color of the statusbar in caret mode. -c.colors.statusbar.caret.bg = base00 - -# Foreground color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.fg = base0D - -# Background color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.bg = base00 - -# Background color of the progress bar. -c.colors.statusbar.progress.bg = base0D - -# Default foreground color of the URL in the statusbar. -c.colors.statusbar.url.fg = base05 - -# Foreground color of the URL in the statusbar on error. -c.colors.statusbar.url.error.fg = base08 - -# Foreground color of the URL in the statusbar for hovered links. -c.colors.statusbar.url.hover.fg = base09 - -# Foreground color of the URL in the statusbar on successful load -# (http). -c.colors.statusbar.url.success.http.fg = base0B - -# Foreground color of the URL in the statusbar on successful load -# (https). -c.colors.statusbar.url.success.https.fg = base0B - -# Foreground color of the URL in the statusbar when there's a warning. -c.colors.statusbar.url.warn.fg = base0E - -# Background color of the tab bar. -c.colors.tabs.bar.bg = base00 - -# Color gradient start for the tab indicator. -c.colors.tabs.indicator.start = base09 - -# Color gradient end for the tab indicator. -c.colors.tabs.indicator.stop = base0B - -# Color for the tab indicator on errors. -c.colors.tabs.indicator.error = base08 - -# Foreground color of unselected odd tabs. -c.colors.tabs.odd.fg = base05 - -# Background color of unselected odd tabs. -c.colors.tabs.odd.bg = base01 - -# Foreground color of unselected even tabs. -c.colors.tabs.even.fg = base05 - -# Background color of unselected even tabs. -c.colors.tabs.even.bg = base01 - -# Background color of pinned unselected even tabs. -c.colors.tabs.pinned.even.bg = base02 - -# Foreground color of pinned unselected even tabs. -c.colors.tabs.pinned.even.fg = base05 - -# Background color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.bg = base02 - -# Foreground color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.fg = base05 - -# Background color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.bg = base04 - -# Foreground color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.fg = base00 - -# Background color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.bg = base04 - -# Foreground color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.fg = base00 - -# Foreground color of selected odd tabs. -c.colors.tabs.selected.odd.fg = base00 - -# Background color of selected odd tabs. -c.colors.tabs.selected.odd.bg = base04 - -# Foreground color of selected even tabs. -c.colors.tabs.selected.even.fg = base00 - -# Background color of selected even tabs. -c.colors.tabs.selected.even.bg = base04 - -# Background color for webpages if unset (or empty to use the theme's -# color). -c.colors.webpage.bg = base00 -# End flavours - -# Background color for webpages if unset (or empty to use the theme's -# color). -# Type: QtColor -c.colors.webpage.bg = 'white' - # Render all web contents using a dark theme. Example configurations # from Chromium's `chrome://flags`: - "With simple HSL/CIELAB/RGB-based # inversion": Set `colors.webpage.darkmode.algorithm` accordingly. - @@ -1221,3 +910,7 @@ config.bind('tw6', 'set tabs.width 480') # Bindings for insert mode config.bind('', 'spawn --userscript qute-keepassxc --key 285D16B66B11BD45BFD57B6CB22C3113D0E83104', mode='insert') + +# set qutebrowser colors +config.source('base16-wrapper.py') + diff --git a/config/dot-config/swaync/style.css b/config/dot-config/swaync/style.css index ad013362..d9015fab 100644 --- a/config/dot-config/swaync/style.css +++ b/config/dot-config/swaync/style.css @@ -1,4 +1,4 @@ -@import "../waybar/colors.css"; +@import "../waybar/base16-colors.css"; @define-color cc-bg rgba(46, 46, 46, 0.7); @define-color noti-border-color rgba(255, 255, 255, 0.15); diff --git a/config/dot-config/waybar/colors.css b/config/dot-config/waybar/colors.css deleted file mode 100644 index d2aed44b..00000000 --- a/config/dot-config/waybar/colors.css +++ /dev/null @@ -1,23 +0,0 @@ -/* -* -* Base16 Rosé Pine -* Author: Emilia Dunfelt <edun@dunfelt.se> -* -*/ - -@define-color base00 #191724; -@define-color base01 #1f1d2e; -@define-color base02 #26233a; -@define-color base03 #6e6a86; -@define-color base04 #908caa; -@define-color base05 #e0def4; -@define-color base06 #e0def4; -@define-color base07 #524f67; -@define-color base08 #eb6f92; -@define-color base09 #f6c177; -@define-color base0A #ebbcba; -@define-color base0B #31748f; -@define-color base0C #9ccfd8; -@define-color base0D #c4a7e7; -@define-color base0E #f6c177; -@define-color base0F #524f67; \ No newline at end of file diff --git a/config/dot-config/waybar/config.jsonc b/config/dot-config/waybar/config.jsonc index 3068c5ea..433b5bbd 100644 --- a/config/dot-config/waybar/config.jsonc +++ b/config/dot-config/waybar/config.jsonc @@ -107,7 +107,7 @@ }, "state-icons": { "paused": "", - "playing": "", + "playing": "", }, "tooltip-format": "{artist} - {album} - {title} | {volume}%", "tooltip-format-disconnected": "mpd disconnected!", diff --git a/config/dot-config/waybar/style.css b/config/dot-config/waybar/style.css index 25d1eee4..7078e4ab 100644 --- a/config/dot-config/waybar/style.css +++ b/config/dot-config/waybar/style.css @@ -1,5 +1,5 @@ /* ----------------------------------- import ----------------------------------- */ -@import "colors.css"; +@import "base16-colors.css"; /* ----------------------------------- window ----------------------------------- */ * { diff --git a/local/dot-local/bin/base16-flavours b/local/dot-local/bin/base16-flavours deleted file mode 100755 index 915cb2b8..00000000 --- a/local/dot-local/bin/base16-flavours +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh -# base16-shell (https://github.com/chriskempson/base16-shell) -# Base16 Shell template by Chris Kempson (http://chriskempson.com) -# Rosé Pine scheme by Emilia Dunfelt <edun@dunfelt.se> -export BASE16_THEME=rose-pine - -color00="19/17/24" # Base 00 - Black -color01="eb/6f/92" # Base 08 - Red -color02="31/74/8f" # Base 0B - Green -color03="eb/bc/ba" # Base 0A - Yellow -color04="c4/a7/e7" # Base 0D - Blue -color05="f6/c1/77" # Base 0E - Magenta -color06="9c/cf/d8" # Base 0C - Cyan -color07="e0/de/f4" # Base 05 - White -color08="6e/6a/86" # Base 03 - Bright Black -color09=$color01 # Base 08 - Bright Red -color10=$color02 # Base 0B - Bright Green -color11=$color03 # Base 0A - Bright Yellow -color12=$color04 # Base 0D - Bright Blue -color13=$color05 # Base 0E - Bright Magenta -color14=$color06 # Base 0C - Bright Cyan -color15="52/4f/67" # Base 07 - Bright White -color16="f6/c1/77" # Base 09 -color17="52/4f/67" # Base 0F -color18="1f/1d/2e" # Base 01 -color19="26/23/3a" # Base 02 -color20="90/8c/aa" # Base 04 -color21="e0/de/f4" # Base 06 -color_foreground="e0/de/f4" # Base 05 -color_background="19/17/24" # Base 00 - -if [ -n "$TMUX" ]; then - # Tell tmux to pass the escape sequences through - # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324) - put_template() { printf '\033Ptmux;\033\033]4;%d;rgb:%s\033\033\\\033\\' $@; } - put_template_var() { printf '\033Ptmux;\033\033]%d;rgb:%s\033\033\\\033\\' $@; } - put_template_custom() { printf '\033Ptmux;\033\033]%s%s\033\033\\\033\\' $@; } -elif [ "${TERM%%[-.]*}" = "screen" ]; then - # GNU screen (screen, screen-256color, screen-256color-bce) - put_template() { printf '\033P\033]4;%d;rgb:%s\007\033\\' $@; } - put_template_var() { printf '\033P\033]%d;rgb:%s\007\033\\' $@; } - put_template_custom() { printf '\033P\033]%s%s\007\033\\' $@; } -elif [ "${TERM%%-*}" = "linux" ]; then - put_template() { [ $1 -lt 16 ] && printf "\e]P%x%s" $1 $(echo $2 | sed 's/\///g'); } - put_template_var() { true; } - put_template_custom() { true; } -else - put_template() { printf '\033]4;%d;rgb:%s\033\\' $@; } - put_template_var() { printf '\033]%d;rgb:%s\033\\' $@; } - put_template_custom() { printf '\033]%s%s\033\\' $@; } -fi - -# 16 color space -put_template 0 $color00 -put_template 1 $color01 -put_template 2 $color02 -put_template 3 $color03 -put_template 4 $color04 -put_template 5 $color05 -put_template 6 $color06 -put_template 7 $color07 -put_template 8 $color08 -put_template 9 $color09 -put_template 10 $color10 -put_template 11 $color11 -put_template 12 $color12 -put_template 13 $color13 -put_template 14 $color14 -put_template 15 $color15 - -# 256 color space -put_template 16 $color16 -put_template 17 $color17 -put_template 18 $color18 -put_template 19 $color19 -put_template 20 $color20 -put_template 21 $color21 - -# foreground / background / cursor color -if [ -n "$ITERM_SESSION_ID" ]; then - # iTerm2 proprietary escape codes - put_template_custom Pg e0def4 # foreground - put_template_custom Ph 191724 # background - put_template_custom Pi e0def4 # bold color - put_template_custom Pj 26233a # selection color - put_template_custom Pk e0def4 # selected text color - put_template_custom Pl e0def4 # cursor - put_template_custom Pm 191724 # cursor text -else - put_template_var 10 $color_foreground - if [ "$BASE16_SHELL_SET_BACKGROUND" != false ]; then - put_template_var 11 $color_background - if [ "${TERM%%-*}" = "rxvt" ]; then - put_template_var 708 $color_background # internal border (rxvt) - fi - fi - put_template_custom 12 ";7" # cursor (reverse video) -fi - -# clean up -unset -f put_template -unset -f put_template_var -unset -f put_template_custom -unset color00 -unset color01 -unset color02 -unset color03 -unset color04 -unset color05 -unset color06 -unset color07 -unset color08 -unset color09 -unset color10 -unset color11 -unset color12 -unset color13 -unset color14 -unset color15 -unset color16 -unset color17 -unset color18 -unset color19 -unset color20 -unset color21 -unset color_foreground -unset color_background \ No newline at end of file