From 0a484ea39ce33b648b662c5571a807efd4e2d28b Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Wed, 30 Oct 2024 19:03:22 +0100
Subject: [PATCH] - [TUI] moved coloring rules to default theme file;

- [TUI] added rule to colorize hashtags.
---
 etc/default-theme.conf | 117 +++++++++++++++++++++++++++++++++++++++++
 etc/shared.conf        | 113 ---------------------------------------
 2 files changed, 117 insertions(+), 113 deletions(-)

diff --git a/etc/default-theme.conf b/etc/default-theme.conf
index 53963de..2f71113 100644
--- a/etc/default-theme.conf
+++ b/etc/default-theme.conf
@@ -701,6 +701,123 @@ gopher-window.line.prefix.foreground                 = cyan
 
 gopher-window.line.prefix.attribute                  = bold
 
+# color parts of a displayed message according to a regular expression
+# syntax is regular expression color attribute
+# valid color are specified using RGB triplets as #RRGGBB or color names
+# valid color names are:
+# - red
+# - green
+# - yellow
+# - blue
+# - magenta
+# - cyan
+# - white
+#
+# valid attributes are:
+# - bold
+# - italic
+# - underline
+# - blink
+
+# attribute is optional
+
+# Some examples follows, order matters!
+
+# footnotes
+
+color-regexp                     = "[⁰¹²³⁴⁵⁶⁷⁸⁹]" #f7a805 italic
+
+# http links
+color-regexp                     = "http(s)?://[^ ]+" #ff0000
+
+# gemini address header
+
+color-regexp                     = "-> gemini://[^ ]+" yellow underline
+
+#gemini links
+
+color-regexp                     = "gemini://[^ ]+" #ff0000
+
+#gopher links
+
+color-regexp                     = "gopher://[^ ]+" #ff0000
+
+# (c) and (r)
+
+color-regexp                     = "(?i)(\\(c\\))|(\\(r\\))" #ff0000 bold
+
+# date yyyy-mm-dd
+
+color-regexp                     = "[0-9]{4}-[0-9]?[0-9]-[0-9]?[0-9]" #0000ff bold
+
+# numbers
+
+color-regexp                     = "-?[0-9]+(.[0-9]+)?%" #ff00ff bold
+
+# by default polls uses that
+
+color-regexp                     = "⯀" green bold
+
+color-regexp                     = "The poll has expired" #ff00ff bold
+
+# HH:MM
+
+color-regexp                     = "[012]?[0-9]:[0123456][0-9]" cyan bold
+
+# your username mentioned
+
+#color-regexp                     = "your-username" #ff00ff bold
+
+# mentions
+
+color-regexp                     = "@[^\s]+" cyan
+
+# hashtags
+
+color-regexp                     = "#[^\s]+" #fca9ff
+
+# gemini colorization
+
+# header level 1
+
+color-regexp                     = "^🞂.*" white bold
+
+# header level 2
+
+color-regexp                     = "🞓 .+" blue bold
+
+# header level 3
+
+color-regexp                     = "🞐 .+" yellow bold
+
+# header level 4
+
+color-regexp                     = "🞎 " yellow
+
+# list bullet
+
+color-regexp                     = "• " blue bold
+
+# stream statuses
+
+color-regexp                     = ":completed" green bold
+
+color-regexp                     = ":aborted"   red
+
+color-regexp                     = ":rendering" cyan
+
+# _underline_
+
+color-regexp                     = "_[^_]+_" #ffff00 underline
+
+# *bold*
+
+color-regexp                     = "\*[^*]+\*" #ffff00 bold
+
+# /italic/ , commented as interferes with file path and URI
+
+#color-regexp                     = "/[^/]+/" #ffff00 italic
+
 #########################
 # ⚠ EXPERIMENTAL ZONE ⚠ #
 #########################
diff --git a/etc/shared.conf b/etc/shared.conf
index 1a38980..dcefce3 100644
--- a/etc/shared.conf
+++ b/etc/shared.conf
@@ -75,119 +75,6 @@ delete.fetched.mentions                     = yes
 
 open-message-link-window.close-after-select = yes
 
-# color parts of a displayed message according to a regular expression
-# syntax is regular expression color attribute
-# valid color are specified using RGB triplets as #RRGGBB or color names
-# valid color names are:
-# - red
-# - green
-# - yellow
-# - blue
-# - magenta
-# - cyan
-# - white
-#
-# valid attributes are:
-# - bold
-# - italic
-# - underline
-# - blink
-
-# attribute is optional
-
-# Some examples follows, order matters!
-
-# footnotes
-
-color-regexp                     = "[⁰¹²³⁴⁵⁶⁷⁸⁹]" #f7a805 italic
-
-# http links
-color-regexp                     = "http(s)?://[^ ]+" #ff0000
-
-# gemini address header
-
-color-regexp                     = "-> gemini://[^ ]+" yellow underline
-
-#gemini links
-
-color-regexp                     = "gemini://[^ ]+" #ff0000
-
-#gopher links
-
-color-regexp                     = "gopher://[^ ]+" #ff0000
-
-# (c) and (r)
-
-color-regexp                     = "(?i)(\\(c\\))|(\\(r\\))" #ff0000 bold
-
-# date yyyy-mm-dd
-
-color-regexp                     = "[0-9]{4}-[0-9]?[0-9]-[0-9]?[0-9]" #0000ff bold
-
-# numbers
-
-color-regexp                     = "-?[0-9]+(.[0-9]+)?%" #ff00ff bold
-
-# by default polls uses that
-
-color-regexp                     = "⯀" green bold
-
-color-regexp                     = "The poll has expired" #ff00ff bold
-
-# HH:MM
-
-color-regexp                     = "[012]?[0-9]:[0123456][0-9]" cyan bold
-
-# your username mentioned
-
-#color-regexp                     = "your-username" #ff00ff bold
-
-# mentions
-
-color-regexp                     = "@[^\s]+" cyan
-
-# gemini colorization
-
-# header level 1
-
-color-regexp                     = "^🞂.*" white bold
-
-# header level 2
-
-color-regexp                     = "🞓 .+" blue bold
-
-# header level 3
-
-color-regexp                     = "🞐 .+" yellow bold
-
-# header level 4
-
-color-regexp                     = "🞎 " yellow
-
-# list bullet
-
-color-regexp                     = "• " blue bold
-
-# stream statuses
-
-color-regexp                     = ":completed" green bold
-
-color-regexp                     = ":aborted"   red
-
-color-regexp                     = ":rendering" cyan
-
-# _underline_
-
-color-regexp                     = "_[^_]+_" #ffff00 underline
-
-# *bold*
-
-color-regexp                     = "\*[^*]+\*" #ffff00 bold
-
-# /italic/ , commented as interferes with file path and URI
-
-#color-regexp                     = "/[^/]+/" #ffff00 italic
-
 gemini.search-engine.uri        = "gemini://kennedy.gemi.dev/search"
 
 # gemini proxy, forward all the gemini and http requests to the servel