deploy: ec9d4f60e5

configs/console/index.html

@@ -864,6 +864,10 @@
 <td>openssl</td>
 <td></td>
 </tr>
+<tr>
+<td>bottom-bin</td>
+<td>resource monitor</td>
+</tr>
 </tbody>
 </table>
 <h3 id="ripgrep-config">ripgrep config</h3>

configs/emacs/index.html

@@ -270,8 +270,8 @@ Emacs is also particularly great at writing Lisp code, e.g. Clojure, Common Lisp
 </span></span><span style="display:flex;"><span>		     (<span style="color:#00f">format</span> <span style="color:#ba2121">&#34;%.2f seconds&#34;</span>
 </span></span><span style="display:flex;"><span>			     (<span style="color:#00f">float-time</span>
 </span></span><span style="display:flex;"><span>			      (<span style="color:#00f">time-subtract</span> <span style="color:#19177c">after-init-time</span> <span style="color:#19177c">before-init-time</span>)))
-</span></span><span style="display:flex;"><span>		     <span style="color:#19177c">gcs-done</span>))
-</span></span><span style="display:flex;"><span>	  (<span style="color:#008000">setq</span> <span style="color:#19177c">my/emacs-started</span> <span style="color:#800">t</span>))
+</span></span><span style="display:flex;"><span>		     <span style="color:#19177c">gcs-done</span>)
+</span></span><span style="display:flex;"><span>	    (<span style="color:#008000">setq</span> <span style="color:#19177c">my/emacs-started</span> <span style="color:#800">t</span>)))
 </span></span></code></pre></div><p>Set the following to <code>t</code> to print debug information during the startup. This will include the order in which the packages are loaded and the loading time of individual packages.</p>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span><span style="color:#408080;font-style:italic">;; (setq use-package-verbose t)</span>
 </span></span></code></pre></div><h4 id="garbage-collection">Garbage collection</h4>
@@ -1284,7 +1284,7 @@ Emacs is also particularly great at writing Lisp code, e.g. Clojure, Common Lisp
 </span></span><span style="display:flex;"><span>      (<span style="color:#008000">setq</span> <span style="color:#19177c">global-mode-string</span> (<span style="color:#00f">delete</span> <span style="color:#666">&#39;</span>(<span style="color:#ba2121">&#34;&#34;</span> <span style="color:#19177c">keycast-mode-line</span> <span style="color:#ba2121">&#34; &#34;</span>) <span style="color:#19177c">global-mode-string</span>)))))
 </span></span></code></pre></div><h3 id="themes-and-colors">Themes and colors</h3>
 <h4 id="doom-themes">Doom themes</h4>
-<p>My colorscheme of choice.</p>
+<p>My colorschemes of choice.</p>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">use-package</span> <span style="color:#19177c">doom-themes</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:straight</span> <span style="color:#800">t</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:config</span>
@@ -1296,76 +1296,72 @@ Emacs is also particularly great at writing Lisp code, e.g. Clojure, Common Lisp
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">doom-themes-visual-bell-config</span>)
 </span></span><span style="display:flex;"><span>  (<span style="color:#008000">setq</span> <span style="color:#19177c">doom-themes-treemacs-theme</span> <span style="color:#ba2121">&#34;doom-colors&#34;</span>)
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">doom-themes-treemacs-config</span>))
+</span></span></code></pre></div><div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">use-package</span> <span style="color:#19177c">modus-themes</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#008000">:straight</span> <span style="color:#800">t</span>)
 </span></span></code></pre></div><h4 id="custom-theme">Custom theme</h4>
-<p>Here I define a custom theme dependent on colors from <code>doom-themes</code>.</p>
+<p>Here I define a custom theme dependent on colors from the current theme.</p>
 <p>A custom theme is necessary because if one calls <code>custom-set-faces</code> and <code>custom-set-variables</code> in code, whenever a variable is changed and saved in a customize buffer, data from all calls of these functions is saved as well.</p>
-<p>To make defining colors a bit easier, here is a function to blend two colors, taken from <a href="https://oremacs.com/2015/04/28/blending-faces/">this post</a> by abo-abo.</p>
-<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/color-join</span> (<span style="color:#19177c">r</span> <span style="color:#19177c">g</span> <span style="color:#19177c">b</span>)
-</span></span><span style="display:flex;"><span>  <span style="color:#ba2121">&#34;Build a color from R G B.
-</span></span></span><span style="display:flex;"><span><span style="color:#ba2121">Inverse of </span><span style="color:#19177c">`color-values&#39;</span><span style="color:#ba2121">.&#34;</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#00f">format</span> <span style="color:#ba2121">&#34;#%02x%02x%02x&#34;</span>
-</span></span><span style="display:flex;"><span>	  (<span style="color:#00f">ash</span> <span style="color:#19177c">r</span> <span style="color:#666">-8</span>)
-</span></span><span style="display:flex;"><span>	  (<span style="color:#00f">ash</span> <span style="color:#19177c">g</span> <span style="color:#666">-8</span>)
-</span></span><span style="display:flex;"><span>	  (<span style="color:#00f">ash</span> <span style="color:#19177c">b</span> <span style="color:#666">-8</span>)))
+<p>First, here&rsquo;s a great package with various color tools:</p>
+<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">use-package</span> <span style="color:#19177c">ct</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#008000">:straight</span> <span style="color:#800">t</span>)
+</span></span></code></pre></div><p>A function to get a color value from the current theme. Supports both <code>doom-themes</code> and <code>modus-themes</code>&hellip; Sort of.</p>
+<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/modus-get-base</span> (<span style="color:#19177c">color</span>)
+</span></span><span style="display:flex;"><span>  (<span style="color:#008000">let</span> ((<span style="color:#19177c">base-value</span> (<span style="color:#00f">string-to-number</span> (<span style="color:#00f">substring</span> (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">color</span>) <span style="color:#666">4</span> <span style="color:#666">5</span>)))
+</span></span><span style="display:flex;"><span>	(<span style="color:#19177c">base-start</span> (<span style="color:#19177c">cadr</span> (<span style="color:#00f">assoc</span> <span style="color:#19177c">&#39;bg-main</span> (<span style="color:#19177c">modus-themes--current-theme-palette</span>))))
+</span></span><span style="display:flex;"><span>	(<span style="color:#19177c">base-end</span> (<span style="color:#19177c">cadr</span> (<span style="color:#00f">assoc</span> <span style="color:#19177c">&#39;fg-dim</span> (<span style="color:#19177c">modus-themes--current-theme-palette</span>)))))
+</span></span><span style="display:flex;"><span>    (<span style="color:#00f">nth</span> <span style="color:#19177c">base-value</span> (<span style="color:#19177c">ct-gradient</span> <span style="color:#666">9</span> <span style="color:#19177c">base-start</span> <span style="color:#19177c">base-end</span> <span style="color:#800">t</span>))))
 </span></span><span style="display:flex;"><span>
-</span></span><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/color-blend</span> (<span style="color:#19177c">c1</span> <span style="color:#19177c">c2</span> <span style="color:#008000">&amp;optional</span> <span style="color:#19177c">alpha</span>)
-</span></span><span style="display:flex;"><span>  <span style="color:#ba2121">&#34;Blend the two colors C1 and C2 with ALPHA.
-</span></span></span><span style="display:flex;"><span><span style="color:#ba2121">C1 and C2 are in the format of </span><span style="color:#19177c">`color-values&#39;</span><span style="color:#ba2121">.
-</span></span></span><span style="display:flex;"><span><span style="color:#ba2121">ALPHA is a number between 0.0 and 1.0 which corresponds to the
-</span></span></span><span style="display:flex;"><span><span style="color:#ba2121">influence of C1 on the result.&#34;</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#008000">setq</span> <span style="color:#19177c">alpha</span> (<span style="color:#008000">or</span> <span style="color:#19177c">alpha</span> <span style="color:#666">0.5</span>))
-</span></span><span style="display:flex;"><span>  (<span style="color:#00f">apply</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">my/color-join</span>
-</span></span><span style="display:flex;"><span>	 (<span style="color:#19177c">cl-mapcar</span>
-</span></span><span style="display:flex;"><span>	  (<span style="color:#008000">lambda</span> (<span style="color:#19177c">x</span> <span style="color:#19177c">y</span>)
-</span></span><span style="display:flex;"><span>	    (<span style="color:#00f">round</span> (<span style="color:#00f">+</span> (<span style="color:#00f">*</span> <span style="color:#19177c">x</span> <span style="color:#19177c">alpha</span>) (<span style="color:#00f">*</span> <span style="color:#19177c">y</span> (<span style="color:#00f">-</span> <span style="color:#666">1</span> <span style="color:#19177c">alpha</span>)))))
-</span></span><span style="display:flex;"><span>	  <span style="color:#19177c">c1</span> <span style="color:#19177c">c2</span>)))
+</span></span><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/doom-p</span> ()
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">seq-find</span> (<span style="color:#008000">lambda</span> (<span style="color:#19177c">x</span>) (<span style="color:#19177c">string-match-p</span> (<span style="color:#008000">rx</span> <span style="color:#19177c">bos</span> <span style="color:#ba2121">&#34;doom&#34;</span>) (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">x</span>)))
+</span></span><span style="display:flex;"><span>	    <span style="color:#19177c">custom-enabled-themes</span>))
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/modus-p</span> ()
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">seq-find</span> (<span style="color:#008000">lambda</span> (<span style="color:#19177c">x</span>) (<span style="color:#19177c">string-match-p</span> (<span style="color:#008000">rx</span> <span style="color:#19177c">bos</span> <span style="color:#ba2121">&#34;modus&#34;</span>) (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">x</span>)))
+</span></span><span style="display:flex;"><span>	    <span style="color:#19177c">custom-enabled-themes</span>))
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/color-value</span> (<span style="color:#19177c">color</span>)
+</span></span><span style="display:flex;"><span>  (<span style="color:#008000">cond</span>
+</span></span><span style="display:flex;"><span>   ((<span style="color:#19177c">my/doom-p</span>) (<span style="color:#19177c">doom-color</span> <span style="color:#19177c">color</span>))
+</span></span><span style="display:flex;"><span>   ((<span style="color:#19177c">my/modus-p</span>) (<span style="color:#19177c">cadr</span>
+</span></span><span style="display:flex;"><span>		  (<span style="color:#00f">assoc</span>
+</span></span><span style="display:flex;"><span>		   (<span style="color:#008000">cond</span>
+</span></span><span style="display:flex;"><span>		     ((<span style="color:#00f">eq</span> <span style="color:#19177c">color</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#19177c">&#39;bg-main</span>)
+</span></span><span style="display:flex;"><span>		     ((<span style="color:#00f">eq</span> <span style="color:#19177c">color</span> <span style="color:#19177c">&#39;fg</span>) <span style="color:#19177c">&#39;fg-main</span>)
+</span></span><span style="display:flex;"><span>		     ((<span style="color:#19177c">string-match-p</span> (<span style="color:#008000">rx</span> <span style="color:#19177c">bos</span> <span style="color:#ba2121">&#34;base&#34;</span> <span style="color:#19177c">digit</span>)
+</span></span><span style="display:flex;"><span>					    (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">color</span>))
+</span></span><span style="display:flex;"><span>		      (<span style="color:#19177c">my/modus-get-base</span> <span style="color:#19177c">color</span>))
+</span></span><span style="display:flex;"><span>		     (<span style="color:#800">t</span> <span style="color:#19177c">color</span>))
+</span></span><span style="display:flex;"><span>		   (<span style="color:#19177c">modus-themes--current-theme-palette</span>))))))
 </span></span></code></pre></div><p>Defining the theme itself.</p>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">deftheme</span> <span style="color:#19177c">my-theme-1</span>)
 </span></span></code></pre></div><p>A macro to simplify defining custom colors.</p>
-<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defvar</span> <span style="color:#19177c">my/doom-theme-update-colors-hook</span> <span style="color:#800">nil</span>)
+<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defvar</span> <span style="color:#19177c">my/my-theme-update-color-params</span> <span style="color:#800">nil</span>)
 </span></span><span style="display:flex;"><span>
-</span></span><span style="display:flex;"><span>(<span style="color:#008000">defmacro</span> <span style="color:#19177c">my/use-doom-colors</span> (<span style="color:#008000">&amp;rest</span> <span style="color:#19177c">data</span>)
+</span></span><span style="display:flex;"><span>(<span style="color:#008000">defmacro</span> <span style="color:#19177c">my/use-colors</span> (<span style="color:#008000">&amp;rest</span> <span style="color:#19177c">data</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#666">`</span>(<span style="color:#008000">progn</span>
-</span></span><span style="display:flex;"><span>     (<span style="color:#19177c">add-hook</span> <span style="color:#19177c">&#39;my/doom-theme-update-colors-hook</span>
-</span></span><span style="display:flex;"><span>	       (<span style="color:#008000">lambda</span> ()
-</span></span><span style="display:flex;"><span>		 (<span style="color:#19177c">custom-theme-set-faces</span>
-</span></span><span style="display:flex;"><span>		  <span style="color:#19177c">&#39;my-theme-1</span>
-</span></span><span style="display:flex;"><span>		  <span style="color:#666">,@</span>(<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> <span style="color:#19177c">i</span> <span style="color:#19177c">in</span> <span style="color:#19177c">data</span> <span style="color:#19177c">collect</span>
-</span></span><span style="display:flex;"><span>			     <span style="color:#666">`</span>(<span style="color:#666">,</span><span style="color:#19177c">&#39;\`</span>
-</span></span><span style="display:flex;"><span>			       (<span style="color:#666">,</span>(<span style="color:#00f">car</span> <span style="color:#19177c">i</span>)
-</span></span><span style="display:flex;"><span>				((<span style="color:#800">t</span> (<span style="color:#666">,@</span>(<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> (<span style="color:#19177c">key</span> <span style="color:#19177c">value</span>) <span style="color:#19177c">on</span> (<span style="color:#00f">cdr</span> <span style="color:#19177c">i</span>) <span style="color:#19177c">by</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">cddr</span>
-</span></span><span style="display:flex;"><span>						<span style="color:#00f">append</span> <span style="color:#666">`</span>(<span style="color:#666">,</span><span style="color:#19177c">key</span> (<span style="color:#666">,</span><span style="color:#19177c">&#39;\,</span> <span style="color:#666">,</span><span style="color:#19177c">value</span>))))))))))))
-</span></span><span style="display:flex;"><span>     (<span style="color:#008000">when</span> (<span style="color:#008000">and</span> (<span style="color:#00f">fboundp</span> <span style="color:#19177c">&#39;doom-color</span>) <span style="color:#19177c">my/emacs-started</span>)
+</span></span><span style="display:flex;"><span>     <span style="color:#666">,@</span>(<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> <span style="color:#19177c">i</span> <span style="color:#19177c">in</span> <span style="color:#19177c">data</span> <span style="color:#19177c">collect</span>
+</span></span><span style="display:flex;"><span>		<span style="color:#666">`</span>(<span style="color:#008000">setf</span> (<span style="color:#19177c">alist-get</span> <span style="color:#19177c">&#39;,</span>(<span style="color:#00f">car</span> <span style="color:#19177c">i</span>) <span style="color:#19177c">my/my-theme-update-color-params</span>)
+</span></span><span style="display:flex;"><span>		       (<span style="color:#00f">list</span> <span style="color:#666">,@</span>(<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> (<span style="color:#19177c">key</span> <span style="color:#19177c">value</span>) <span style="color:#19177c">on</span> (<span style="color:#00f">cdr</span> <span style="color:#19177c">i</span>) <span style="color:#19177c">by</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">cddr</span>
+</span></span><span style="display:flex;"><span>					<span style="color:#00f">append</span> <span style="color:#666">`</span>(<span style="color:#666">,</span><span style="color:#19177c">key</span> <span style="color:#19177c">&#39;,value</span>)))))
+</span></span><span style="display:flex;"><span>     (<span style="color:#008000">when</span> (<span style="color:#008000">and</span> (<span style="color:#008000">or</span> (<span style="color:#19177c">my/doom-p</span>) (<span style="color:#19177c">my/modus-p</span>)) <span style="color:#19177c">my/emacs-started</span>)
 </span></span><span style="display:flex;"><span>       (<span style="color:#19177c">my/update-my-theme</span>))))
-</span></span></code></pre></div><p>This macro puts lambdas to <code>my/doom-theme-update-colors-hook</code> that updates faces in <code>my-theme-1</code>. Now I have to call this hook:</p>
+</span></span></code></pre></div><p>This macro puts lambdas to <code>my/my-theme-update-colors-hook</code> that updates faces in <code>my-theme-1</code>. Now I have to call this hook:</p>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/update-my-theme</span> (<span style="color:#008000">&amp;rest</span> <span style="color:#19177c">_</span>)
-</span></span><span style="display:flex;"><span>  (<span style="color:#00f">run-hooks</span> <span style="color:#19177c">&#39;my/doom-theme-update-colors-hook</span>)
+</span></span><span style="display:flex;"><span>  (<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> (<span style="color:#19177c">face</span> <span style="color:#666">.</span> <span style="color:#19177c">values</span>) <span style="color:#19177c">in</span> <span style="color:#19177c">my/my-theme-update-color-params</span>
+</span></span><span style="display:flex;"><span>	   <span style="color:#008000">do</span> (<span style="color:#19177c">custom-theme-set-faces</span>
+</span></span><span style="display:flex;"><span>	       <span style="color:#19177c">&#39;my-theme-1</span>
+</span></span><span style="display:flex;"><span>	       <span style="color:#666">`</span>(<span style="color:#666">,</span><span style="color:#19177c">face</span> ((<span style="color:#800">t</span> <span style="color:#666">,@</span>(<span style="color:#008000">cl-loop</span> <span style="color:#19177c">for</span> (<span style="color:#19177c">key</span> <span style="color:#19177c">value</span>) <span style="color:#19177c">on</span> <span style="color:#19177c">values</span> <span style="color:#19177c">by</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">cddr</span>
+</span></span><span style="display:flex;"><span>				      <span style="color:#19177c">collect</span> <span style="color:#19177c">key</span>
+</span></span><span style="display:flex;"><span>				      <span style="color:#19177c">collect</span> (<span style="color:#00f">eval</span> <span style="color:#19177c">value</span>)))))))
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">enable-theme</span> <span style="color:#19177c">&#39;my-theme-1</span>))
 </span></span><span style="display:flex;"><span>
 </span></span><span style="display:flex;"><span>(<span style="color:#008000">unless</span> <span style="color:#19177c">my/is-termux</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">advice-add</span> <span style="color:#19177c">&#39;load-theme</span> <span style="color:#008000">:after</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">my/update-my-theme</span>)
-</span></span><span style="display:flex;"><span>  (<span style="color:#008000">when</span> (<span style="color:#00f">fboundp</span> <span style="color:#19177c">&#39;doom-color</span>)
-</span></span><span style="display:flex;"><span>    (<span style="color:#19177c">my/update-my-theme</span>))
+</span></span><span style="display:flex;"><span>  <span style="color:#408080;font-style:italic">;; (when (fboundp &#39;doom-color)</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#408080;font-style:italic">;;   (my/update-my-theme))</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">add-hook</span> <span style="color:#19177c">&#39;emacs-startup-hook</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">my/update-my-theme</span>))
-</span></span></code></pre></div><p>A function to get a color value from the current theme:</p>
-<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/color-value</span> (<span style="color:#19177c">color</span>)
-</span></span><span style="display:flex;"><span>  (<span style="color:#008000">let</span> ((<span style="color:#19177c">is-doom</span>
-</span></span><span style="display:flex;"><span>	 (<span style="color:#19177c">seq-find</span> (<span style="color:#008000">lambda</span> (<span style="color:#19177c">x</span>) (<span style="color:#19177c">string-match-p</span> (<span style="color:#008000">rx</span> <span style="color:#19177c">bos</span> <span style="color:#ba2121">&#34;doom&#34;</span>) (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">x</span>)))
-</span></span><span style="display:flex;"><span>		   <span style="color:#19177c">custom-enabled-themes</span>))
-</span></span><span style="display:flex;"><span>	(<span style="color:#19177c">is-modus</span>
-</span></span><span style="display:flex;"><span>	 (<span style="color:#19177c">seq-find</span> (<span style="color:#008000">lambda</span> (<span style="color:#19177c">x</span>) (<span style="color:#19177c">string-match-p</span> (<span style="color:#008000">rx</span> <span style="color:#19177c">bos</span> <span style="color:#ba2121">&#34;modus&#34;</span>) (<span style="color:#00f">symbol-name</span> <span style="color:#19177c">x</span>)))
-</span></span><span style="display:flex;"><span>		   <span style="color:#19177c">custom-enabled-themes</span>)))
-</span></span><span style="display:flex;"><span>    (<span style="color:#008000">cond</span>
-</span></span><span style="display:flex;"><span>     (<span style="color:#19177c">is-doom</span> (<span style="color:#19177c">doom-color</span> <span style="color:#19177c">color</span>))
-</span></span><span style="display:flex;"><span>     (<span style="color:#19177c">is-modus</span> (<span style="color:#19177c">cadr</span>
-</span></span><span style="display:flex;"><span>		(<span style="color:#00f">assoc</span>
-</span></span><span style="display:flex;"><span>		 (<span style="color:#008000">pcase</span> <span style="color:#19177c">color</span>
-</span></span><span style="display:flex;"><span>		   (<span style="color:#19177c">&#39;bg</span> <span style="color:#19177c">&#39;bg-main</span>)
-</span></span><span style="display:flex;"><span>		   (<span style="color:#19177c">&#39;fg</span> <span style="color:#19177c">&#39;fg-main</span>)
-</span></span><span style="display:flex;"><span>		   (<span style="color:#19177c">_</span> <span style="color:#19177c">color</span>))
-</span></span><span style="display:flex;"><span>		 (<span style="color:#19177c">modus-themes--current-theme-palette</span>)))))))
 </span></span></code></pre></div><p>Defining colors for <code>tab-bar.el</code>:</p>
-<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#19177c">my/use-doom-colors</span>
+<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span> (<span style="color:#19177c">tab-bar-tab</span> <span style="color:#008000">:background</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>)
 </span></span><span style="display:flex;"><span>	      <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;yellow</span>)
 </span></span><span style="display:flex;"><span>	      <span style="color:#008000">:underline</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;yellow</span>))
@@ -1377,9 +1373,9 @@ Emacs is also particularly great at writing Lisp code, e.g. Clojure, Common Lisp
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:if</span> (<span style="color:#19177c">display-graphic-p</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:config</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">auto-dim-other-buffers-mode</span> <span style="color:#800">t</span>)
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">auto-dim-other-buffers-face</span>
-</span></span><span style="display:flex;"><span>    <span style="color:#008000">:background</span> (<span style="color:#19177c">color-darken-name</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>))))
+</span></span><span style="display:flex;"><span>    <span style="color:#008000">:background</span> (<span style="color:#19177c">ct-greaten</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>))))
 </span></span></code></pre></div><h4 id="toggle-light-dark">Toggle light/dark</h4>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/toggle-dark-light-theme</span> ()
 </span></span><span style="display:flex;"><span>  (<span style="color:#008000">interactive</span>)
@@ -1394,7 +1390,7 @@ Emacs is also particularly great at writing Lisp code, e.g. Clojure, Common Lisp
 <p><code>ansi-color.el</code> is a built-in Emacs package that translates ANSI color escape codes into faces.</p>
 <p>It is used by many other packages but doesn&rsquo;t seem to have an integration with <code>doom-themes</code>, so here is one.</p>
 <div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#008000">with-eval-after-load</span> <span style="color:#19177c">&#39;ansi-color</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">ansi-color-black</span>
 </span></span><span style="display:flex;"><span>    <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;base2</span>) <span style="color:#008000">:background</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;base0</span>))
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">ansi-color-red</span>
@@ -4796,9 +4792,9 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  (<span style="color:#008000">when</span> (<span style="color:#00f">eq</span> <span style="color:#19177c">major-mode</span> <span style="color:#19177c">&#39;org-mode</span>)
 </span></span><span style="display:flex;"><span>    (<span style="color:#19177c">my/org-no-ellipsis-in-headlines</span>)))
 </span></span></code></pre></div><h4 id="override-colors">Override colors</h4>
-<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#19177c">my/use-doom-colors</span>
-</span></span><span style="display:flex;"><span> (<span style="color:#19177c">org-block</span> <span style="color:#008000">:background</span> (<span style="color:#19177c">color-darken-name</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>))
-</span></span><span style="display:flex;"><span> (<span style="color:#19177c">org-block-begin-line</span> <span style="color:#008000">:background</span> (<span style="color:#19177c">color-darken-name</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>)
+<div class="highlight"><pre tabindex="0" style=";-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-emacs-lisp" data-lang="emacs-lisp"><span style="display:flex;"><span>(<span style="color:#19177c">my/use-colors</span>
+</span></span><span style="display:flex;"><span> (<span style="color:#19177c">org-block</span> <span style="color:#008000">:background</span> (<span style="color:#19177c">ct-greaten</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>))
+</span></span><span style="display:flex;"><span> (<span style="color:#19177c">org-block-begin-line</span> <span style="color:#008000">:background</span> (<span style="color:#19177c">ct-greaten</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>)
 </span></span><span style="display:flex;"><span>		       <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;grey</span>)))
 </span></span></code></pre></div><h3 id="export">Export</h3>
 <h4 id="hugo">Hugo</h4>
@@ -5677,7 +5673,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:after</span> <span style="color:#19177c">evil-collection</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:commands</span> (<span style="color:#19177c">eshell</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:init</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">epe-pipeline-delimiter-face</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;green</span>))
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">epe-pipeline-host-face</span>      <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;blue</span>))
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">epe-pipeline-time-face</span>      <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;yellow</span>))
@@ -5694,7 +5690,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:straight</span> (<span style="color:#008000">:repo</span> <span style="color:#ba2121">&#34;manateelazycat/aweshell&#34;</span> <span style="color:#008000">:host</span> <span style="color:#19177c">github</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:after</span> <span style="color:#19177c">eshell</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:init</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">aweshell-alert-buffer-face</span>  <span style="color:#008000">:background</span> (<span style="color:#19177c">color-darken-name</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;bg</span>) <span style="color:#666">3</span>))
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">aweshell-alert-command-face</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;red</span>) <span style="color:#008000">:weight</span> <span style="color:#19177c">&#39;bold</span>))
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:config</span>
@@ -5861,7 +5857,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>(<span style="color:#008000">defface</span> <span style="color:#19177c">elfeed-govt-entry</span> <span style="color:#800">nil</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#ba2121">&#34;Face for the elfeed entries with tag \&#34;blogs\&#34;&#34;</span>)
 </span></span><span style="display:flex;"><span>
-</span></span><span style="display:flex;"><span>(<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>(<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span> (<span style="color:#19177c">elfeed-search-tag-face</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;yellow</span>))
 </span></span><span style="display:flex;"><span> (<span style="color:#19177c">elfeed-videos-entry</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;red</span>))
 </span></span><span style="display:flex;"><span> (<span style="color:#19177c">elfeed-twitter-entry</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;blue</span>))
@@ -7035,7 +7031,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  <span style="color:#666">`</span>((<span style="color:#800">t</span> <span style="color:#008000">:inherit</span> <span style="color:#19177c">variable-pitch</span>))
 </span></span><span style="display:flex;"><span>  <span style="color:#ba2121">&#34;Default face for shr rendering.&#34;</span>)
 </span></span><span style="display:flex;"><span>
-</span></span><span style="display:flex;"><span>(<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>(<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/shr-face</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;blue</span>)))
 </span></span><span style="display:flex;"><span>
 </span></span><span style="display:flex;"><span>(<span style="color:#008000">defun</span> <span style="color:#19177c">my/shr-insert-around</span> (<span style="color:#19177c">fun</span> <span style="color:#008000">&amp;rest</span> <span style="color:#19177c">args</span>)
@@ -7595,7 +7591,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:commands</span> (<span style="color:#19177c">telega</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:init</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my-leader-def</span> <span style="color:#ba2121">&#34;a l&#34;</span> (<span style="color:#19177c">my/command-in-persp</span> <span style="color:#ba2121">&#34;telega&#34;</span> <span style="color:#ba2121">&#34;telega&#34;</span> <span style="color:#666">3</span> (<span style="color:#19177c">telega</span>)))
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">telega-button-active</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;base0</span>)
 </span></span><span style="display:flex;"><span>			 <span style="color:#008000">:background</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;cyan</span>))
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">telega-webpage-chat-link</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;base0</span>)
@@ -7804,7 +7800,7 @@ Didn&rsquo;t work out as I expected, so I&rsquo;ve made <code>org-journal-tags</
 </span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my-leader-def</span>
 </span></span><span style="display:flex;"><span>   <span style="color:#ba2121">&#34;hs&#34;</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">sx-search</span>
 </span></span><span style="display:flex;"><span>   <span style="color:#ba2121">&#34;hS&#34;</span> <span style="color:#00f">#&#39;</span><span style="color:#19177c">sx-tab-frontpage</span>)
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">sx-question-mode-accepted</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">my/color-value</span> <span style="color:#19177c">&#39;green</span>)
 </span></span><span style="display:flex;"><span>			      <span style="color:#008000">:weight</span> <span style="color:#19177c">&#39;bold</span>)
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">sx-question-mode-content</span> <span style="color:#008000">:background</span> <span style="color:#800">nil</span>))

configs/mail/index.html

@@ -457,7 +457,7 @@ Remove <code>TAG</code> from emails which are outside the matching <code>PATH</c
 </span></span><span style="display:flex;"><span>  <span style="color:#408080;font-style:italic">;; :ensure nil</span>
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:commands</span> (<span style="color:#19177c">notmuch</span> <span style="color:#19177c">notmuch-search</span>)
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:init</span>
-</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-doom-colors</span>
+</span></span><span style="display:flex;"><span>  (<span style="color:#19177c">my/use-colors</span>
 </span></span><span style="display:flex;"><span>   (<span style="color:#19177c">notmuch-wash-cited-text</span> <span style="color:#008000">:foreground</span> (<span style="color:#19177c">doom-color</span> <span style="color:#19177c">&#39;yellow</span>)))
 </span></span><span style="display:flex;"><span>  <span style="color:#008000">:config</span>
 </span></span><span style="display:flex;"><span>  (<span style="color:#008000">setq</span> <span style="color:#19177c">mail-specify-envelope-from</span> <span style="color:#800">t</span>)