conflicts

8 files changed, 553 insertions, 0 deletions

diff --git a/about/resources.html b/about/resources.html
index b6c781a5..88db4fb3 100644
--- a/about/resources.html
+++ b/about/resources.html
@@ -50,6 +50,7 @@
 <span>In random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications</li>
 <li>The Docker Book; James Turnbull; Kindle</li>
 <li>Systemprogrammierung in Go; Frank Müller; dpunkt</li>
@@ -95,12 +96,60 @@
 <li>Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O&#39;Reilly</li>
 <li>Polished Ruby Programming; Jeremy Evans; Packt Publishing</li>
 <li>Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications</li>
+=======
+<li>Java ist auch eine Insel; Christian Ullenboom; </li>
+<li>Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt </li>
+<li>Modern Perl; Chromatic ; Onyx Neon Press</li>
+<li>Systemprogrammierung in Go; Frank Müller; dpunkt</li>
+<li>The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional</li>
+<li>Effective Java; Joshua Bloch; Addison-Wesley Professional</li>
+<li>Concurrency in Go; Katherine Cox-Buday; O&#39;Reilly</li>
+<li>Pro Puppet; James Turnbull, Jeffrey McCune; Apress</li>
+<li>Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner</li>
+<li>Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O&#39;Reilly</li>
+<li>The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton</li>
+<li>The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible</li>
+<li>Ultimate Go Notebook; Bill Kennedy</li>
+<li>Higher Order Perl; Mark Dominus; Morgan Kaufmann</li>
+<li>Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers </li>
+<li>Data Science at the Command Line; Jeroen Janssens; O&#39;Reilly</li>
+<li>Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O&#39;Reilly</li>
+<li>Effective awk programming; Arnold Robbins; O&#39;Reilly</li>
+<li>The Practise of System and Network Administration; Thomas A. Limoncelli, Christina J. Hogan, Strata R. Chalup; Addison-Wesley Professional Pro Git; Scott Chacon, Ben Straub; Apress</li>
+<li>Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press</li>
+<li>Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers</li>
+<li>The Docker Book; James Turnbull; Kindle</li>
+<li>Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications</li>
+<li>Polished Ruby Programming; Jeremy Evans; Packt Publishing</li>
+<li>Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press</li>
+<li>Perl New Features; Joshua McAdams, brian d foy; Perl School</li>
+<li>Raku Fundamentals; Moritz Lenz; Apress</li>
+<li>DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible</li>
+<li>Developing Games in Java; David Brackeen and others...; New Riders</li>
+<li>Clusterbau mit Linux-HA; Michael Schwartzkopff; O&#39;Reilly</li>
+<li>Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall &amp; Jon Orwant; O&#39;Reilly</li>
+<li>C++ Programming Language; Bjarne Stroustrup;</li>
+<li>Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson</li>
+<li>Terraform Cookbook; Mikael Krief; Packt Publishing</li>
+<li>DNS and BIND; Cricket Liu; O&#39;Reilly</li>
+<li>100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications</li>
+<li>Funktionale Programmierung; Peter Pepper; Springer</li>
+<li>Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O&#39;Reilly</li>
+<li>Site Reliability Engineering; How Google runs production systems; O&#39;Reilly</li>
+<li>Raku Recipes; J.J. Merelo; Apress</li>
+<li>97 things every SRE should know; Emil Stolarsky, Jaime Woo; O&#39;Reilly</li>
+<li>The Pragmatic Programmer; David Thomas; Addison-Wesley</li>
+<li>Leanring eBPF; Liz Rice; O&#39;Reilly</li>
+<li>21st Century C: C Tips from the New School; Ben Klemens; O&#39;Reilly</li>
+<li>The Kubernetes Book; Nigel Poulton; Unabridged Audiobook</li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <h2 style='display: inline' id='technical-references'>Technical references</h2><br />
 <br />
 <span>I didn&#39;t read them from the beginning to the end, but I am using them to look up things. The books are in random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley</li>
 <li>Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O&#39;Reilly</li>
 <li>The Linux Programming Interface; Michael Kerrisk; No Starch Press </li>
@@ -108,12 +157,22 @@
 <li>Relayd and Httpd Mastery; Michael W Lucas</li>
 <li>Groovy Kurz &amp; Gut; Joerg Staudemeier; O&#39;Reilly</li>
 <li>Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley</li>
+=======
+<li>Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O&#39;Reilly</li>
+<li>Implementing Service Level Objectives; Alex Hidalgo; O&#39;Reilly</li>
+<li>Relayd and Httpd Mastery; Michael W Lucas</li>
+<li>Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley</li>
+<li>BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley</li>
+<li>Groovy Kurz &amp; Gut; Joerg Staudemeier; O&#39;Reilly</li>
+<li>The Linux Programming Interface; Michael Kerrisk; No Starch Press </li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <h2 style='display: inline' id='self-development-and-soft-skills-books'>Self-development and soft-skills books</h2><br />
 <br />
 <span>In random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>Psycho-Cybernetics; Maxwell Maltz; Perigee Books</li>
 <li>The Bullet Journal Method; Ryder Carroll; Fourth Estate</li>
 <li>The Power of Now; Eckhard Tolle; Yellow Kite</li>
@@ -147,6 +206,41 @@
 <li>Ultralearning; Anna Laurent; Self-published via Amazon</li>
 <li>Slow Productivity; Cal Newport; Penguin Random House</li>
 <li>So Good They Can&#39;t Ignore You; Cal Newport; Business Plus</li>
+=======
+<li>Solve for Happy; Mo Gawdat</li>
+<li>Deep Work; Cal Newport; Piatkus</li>
+<li>Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion </li>
+<li>The Bullet Journal Method; Ryder Carroll; Fourth Estate</li>
+<li>Digital Minimalism; Cal Newport; Portofolio Penguin</li>
+<li>101 Essays that change the way you think; Brianna Wiest; Audible</li>
+<li>The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books</li>
+<li>Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press</li>
+<li>Atomic Habits; James Clear; Random House Business</li>
+<li>Staff Engineer: Leadership beyond the management track; Will Larson; Audible</li>
+<li>The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select</li>
+<li>Time Management for System Administrators; Thomas A. Limoncelli; O&#39;Reilly</li>
+<li>The Power of Now; Eckhard Tolle; Yellow Kite</li>
+<li>Search Inside Yourself - The Unexpected path to Achieving Success, Happiness (and World Peace); Chade-Meng Tan, Daniel Goleman, Jon Kabat-Zinn; HarperOne</li>
+<li>The Off Switch; Mark Cropley; Virgin Books</li>
+<li>Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing</li>
+<li>Ultralearning; Anna Laurent; Self-published via Amazon</li>
+<li>Stop starting, start finishing; Arne Roock; Lean-Kanban University  </li>
+<li>The Good Enough Job; Simone Stolzoff; Ebury Edge</li>
+<li>So Good They Can&#39;t Ignore You; Cal Newport; Business Plus</li>
+<li>The Joy of Missing Out; Christina Crook; New Society Publishers</li>
+<li>The Complete Software Developer&#39;s Career Guide; John Sonmez; Unabridged Audiobook</li>
+<li>Soft Skills; John Sommez; Manning Publications</li>
+<li>Influence without Authority; A. Cohen, D. Bradford; Wiley</li>
+<li>Eat That Frog!; Brian Tracy; Hodder Paperbacks</li>
+<li>Never Split the Difference; Chris Voss, Tahl Raz; Random House Business</li>
+<li>Getting Things Done; David Allen</li>
+<li>Slow Productivity; Cal Newport; Penguin Random House</li>
+<li>Ultralearning; Scott Young; Thorsons</li>
+<li>The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd</li>
+<li>The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon &amp; Schuster UK</li>
+<li>Eat That Frog; Brian Tracy</li>
+<li>Psycho-Cybernetics; Maxwell Maltz; Perigee Books</li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <a class='textlink' href='../notes/index.html'>Here are notes of mine for some of the books</a><br />
 <br />
@@ -155,6 +249,7 @@
 <span>Some of these were in-person with exams; others were online learning lectures only. In random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>Ultimate Go Programming; Bill Kennedy; O&#39;Reilly Online</li>
 <li>Developing IaC with Terraform (with Live Lessons); O&#39;Reilly Online</li>
 <li>Apache Tomcat Best Practises; 3-day on-site training</li>
@@ -171,6 +266,24 @@
 <li>Functional programming lecture; Remote University of Hagen</li>
 <li>The Ultimate Kubernetes Bootcamp; School of Devops; O&#39;Reilly Online</li>
 <li>AWS Immersion Day; Amazon; 1-day interactive online training </li>
+=======
+<li>Functional programming lecture; Remote University of Hagen</li>
+<li>Developing IaC with Terraform (with Live Lessons); O&#39;Reilly Online</li>
+<li>The Well-Grounded Rubyist Video Edition; David. A. Black; O&#39;Reilly Online</li>
+<li>AWS Immersion Day; Amazon; 1-day interactive online training </li>
+<li>Apache Tomcat Best Practises; 3-day on-site training</li>
+<li>Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training</li>
+<li>Scripting Vim; Damian Conway; O&#39;Reilly Online</li>
+<li>The Ultimate Kubernetes Bootcamp; School of Devops; O&#39;Reilly Online</li>
+<li>Algorithms Video Lectures; Robert Sedgewick; O&#39;Reilly Online</li>
+<li>Red Hat Certified System Administrator; Course + certification (Although I had the option, I decided not to take the next course as it is more effective to self learn what I need)</li>
+<li>MySQL Deep Dive Workshop; 2-day on-site training</li>
+<li>Structure and Interpretation of Computer Programs; Harold Abelson and more...; </li>
+<li>Ultimate Go Programming; Bill Kennedy; O&#39;Reilly Online</li>
+<li>Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon</li>
+<li>Protocol buffers; O&#39;Reilly Online</li>
+<li>F5 Loadbalancers Training; 2-day on-site training; F5, Inc. </li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <h2 style='display: inline' id='technical-guides'>Technical guides</h2><br />
 <br />
@@ -188,6 +301,7 @@
 <span>In random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>Hidden Brain</li>
 <li>BSD Now</li>
 <li>Fork Around And Find Out</li>
@@ -200,17 +314,39 @@
 <li>Fallthrough [Golang]</li>
 <li>The Changelog Podcast(s)</li>
 <li>Maintainable</li>
+=======
+<li>Maintainable</li>
+<li>Fork Around And Find Out</li>
+<li>Deep Questions with Cal Newport</li>
+<li>Backend Banter</li>
+<li>Dev Interrupted</li>
+<li>Hidden Brain</li>
+<li>The Changelog Podcast(s)</li>
+<li>The Pragmatic Engineer Podcast</li>
+<li>The ProdCast (Google SRE Podcast)</li>
+<li>BSD Now</li>
+<li>Cup o&#39; Go [Golang]</li>
+<li>Fallthrough [Golang]</li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <h3 style='display: inline' id='podcasts-i-liked'>Podcasts I liked</h3><br />
 <br />
 <span>I liked them but am not listening to them anymore. The podcasts have either "finished" (no more episodes) or I stopped listening to them due to time constraints or a shift in my interests.</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>FLOSS weekly</li>
 <li>CRE: Chaosradio Express [german]</li>
 <li>Ship It (predecessor of Fork Around And Find Out)</li>
 <li>Modern Mentor</li>
 <li>Java Pub House</li>
+=======
+<li>CRE: Chaosradio Express [german]</li>
+<li>Java Pub House</li>
+<li>Modern Mentor</li>
+<li>FLOSS weekly</li>
+<li>Ship It (predecessor of Fork Around And Find Out)</li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <li>Go Time (predecessor of fallthrough)</li>
 </ul><br />
 <h2 style='display: inline' id='newsletters-i-like'>Newsletters I like</h2><br />
@@ -218,6 +354,7 @@
 <span>This is a mix of tech and non-tech newsletters I am subscribed to. In random order:</span><br />
 <br />
 <ul>
+<<<<<<< HEAD
 <li>Andreas Brandhorst Newsletter (Sci-Fi author)</li>
 <li>Applied Go Weekly Newsletter</li>
 <li>byteSizeGo</li>
@@ -230,6 +367,20 @@
 <li>Changelog News</li>
 <li>Monospace Mentor</li>
 <li>The Imperfectionist</li>
+=======
+<li>VK Newsletter</li>
+<li>The Pragmatic Engineer</li>
+<li>Andreas Brandhorst Newsletter (Sci-Fi author)</li>
+<li>The Imperfectionist</li>
+<li>byteSizeGo</li>
+<li>Golang Weekly</li>
+<li>Monospace Mentor</li>
+<li>Changelog News</li>
+<li>Applied Go Weekly Newsletter</li>
+<li>Register Spill</li>
+<li>Ruby Weekly</li>
+<li>The Valuable Dev</li>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </ul><br />
 <h1 style='display: inline' id='formal-education'>Formal education</h1><br />
 <br />
diff --git a/gemfeed/2009-02-13-sgi-onyx-3200.html b/gemfeed/2009-02-13-sgi-onyx-3200.html
index b8a894a2..1821f167 100644
--- a/gemfeed/2009-02-13-sgi-onyx-3200.html
+++ b/gemfeed/2009-02-13-sgi-onyx-3200.html
@@ -21,7 +21,11 @@
 <li>4 x 400 MHz IP35 MIPS CPUs</li>
 <li>4GB of RAM</li>
 </ul><br />
+<<<<<<< HEAD
 <a class='textlink' href='./sgi-onyx-3200/desk.webp'>./sgi-onyx-3200/desk.webp</a><br />
+=======
+<a href='./sgi-onyx-3200/desk.webp'><img src='./sgi-onyx-3200/desk.webp' /></a><br />
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <br />
 <span>We used this monster when I was a student worker at the Fraunhofer Institute for Production Technology around the year 2006. It operated a walk-in 2-sided 3D cave (unfortunately, I don&#39;t have any pictures of that cave), where you could literally walk around with a set of VR glasses and see everything in 3D (that was when there wasn&#39;t any Oculus Quest yet). That was useful for running industrial simulations.</span><br />
 <br />
@@ -71,11 +75,19 @@ USB Human Interface Device: device id 0 type keyboard
 USB Human Interface Device: device id 0 type mouse
 </pre>
 <br />
+<<<<<<< HEAD
 <a class='textlink' href='./sgi-onyx-3200/collage.webp'>./sgi-onyx-3200/collage.webp</a><br />
 <br />
 <span>I was mainly working on drilling simulations on this machine. Sometimes I worked directly at one of the 2 terminal screens of the Onyx, or often I used a nearby Linux machine and forwarded the X11 windows to my local screen.</span><br />
 <br />
 <a class='textlink' href='./sgi-onyx-3200/collage2.webp'>./sgi-onyx-3200/collage2.webp</a><br />
+=======
+<a href='./sgi-onyx-3200/collage.webp'><img src='./sgi-onyx-3200/collage.webp' /></a><br />
+<br />
+<span>I was mainly working on drilling simulations on this machine. Sometimes I worked directly at one of the 2 terminal screens of the Onyx, or often I used a nearby Linux machine and forwarded the X11 windows to my local screen.</span><br />
+<br />
+<a href='./sgi-onyx-3200/collage2.webp'><img src='./sgi-onyx-3200/collage2.webp' /></a><br />
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <br />
 <span>E-Mail your comments to <span class='inlinecode'>paul@nospam.buetow.org</span> :-)</span><br />
 <br />
diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml
index e8e585c5..6edb3400 100644
--- a/gemfeed/atom.xml
+++ b/gemfeed/atom.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
+<<<<<<< HEAD
     <updated>2025-02-21T11:07:08+02:00</updated>
+=======
+    <updated>2025-02-13T10:21:17+02:00</updated>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
     <title>foo.zone feed</title>
     <subtitle>To be in the .zone!</subtitle>
     <link href="https://foo.zone/gemfeed/atom.xml" rel="self" />
@@ -1289,6 +1293,7 @@ Jan 26 17:36:32 f2 apcupsd[2159]: apcupsd shutdown succeeded
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
+<<<<<<< HEAD
 <pre><b><u><font color="#000000">export</font></u></b> EDITOR=hx
 <b><u><font color="#000000">export</font></u></b> VISUAL=$EDITOR
 <b><u><font color="#000000">export</font></u></b> GIT_EDITOR=$EDITOR
@@ -1316,6 +1321,35 @@ editor::helix::random_theme () {
 <b><u><font color="#000000">if</font></u></b> [ -f $HELIX_CONFIG_DIR/config.toml ]; <b><u><font color="#000000">then</font></u></b>
     editor::helix::random_theme
 <b><u><font color="#000000">fi</font></u></b>
+=======
+<pre><b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">EDITOR</font><font color="#F3E651">=</font><font color="#ff0000">hx</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">VISUAL</font><font color="#F3E651">=</font><font color="#ff0000">$EDITOR</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">GIT_EDITOR</font><font color="#F3E651">=</font><font color="#ff0000">$EDITOR</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">HELIX_CONFIG_DIR</font><font color="#F3E651">=</font><font color="#ff0000">$HOME</font><font color="#F3E651">/.</font><font color="#ff0000">config/helix</font>
+
+<font color="#ff0000">editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#7bc710">random_theme ()</font><font color="#ff0000"> {</font>
+<font color="#ff0000">    </font><i><font color="#ababab"># May add more theme search paths based on OS. This one is</font></i>
+<font color="#ff0000">    </font><i><font color="#ababab"># for Fedora Linux, but there is also MacOS, etc.</font></i>
+<font color="#ff0000">    </font><b><font color="#ffffff">local</font></b><font color="#ff0000"> -r </font><font color="#ff0000">theme_dir</font><font color="#F3E651">=</font><font color="#ff0000">/usr/share/helix/runtime/themes</font>
+<font color="#ff0000">    </font><b><font color="#ffffff">if</font></b><font color="#ff0000"> </font><font color="#F3E651">[</font><font color="#ff0000"> </font><font color="#F3E651">!</font><font color="#ff0000"> -d </font><font color="#ff0000">$theme_dir</font><font color="#ff0000"> </font><font color="#F3E651">];</font><font color="#ff0000"> </font><b><font color="#ffffff">then</font></b>
+<font color="#ff0000">        echo </font><font color="#bb00ff">"Helix theme dir $theme_dir doesnt exist"</font>
+<font color="#ff0000">        </font><b><font color="#ffffff">return</font></b><font color="#ff0000"> </font><font color="#bb00ff">1</font>
+<font color="#ff0000">    </font><b><font color="#ffffff">fi</font></b>
+
+<font color="#ff0000">    </font><b><font color="#ffffff">local</font></b><font color="#ff0000"> -r </font><font color="#ff0000">config_file</font><font color="#F3E651">=</font><font color="#ff0000">$HELIX_CONFIG_DIR</font><font color="#ff0000">/config</font><font color="#F3E651">.</font><font color="#ff0000">toml</font>
+<font color="#ff0000">    </font><b><font color="#ffffff">local</font></b><font color="#ff0000"> -r </font><font color="#ff0000">random_theme</font><font color="#F3E651">=</font><font color="#bb00ff">"$(basename "</font><font color="#ff0000">$(</font><font color="#ff0000">ls </font><font color="#ff0000">$theme_dir</font><font color="#ff0000"> </font><font color="#F3E651">\</font>
+<font color="#ff0000">        </font><font color="#F3E651">|</font><font color="#ff0000"> grep -v random</font><font color="#F3E651">.</font><font color="#ff0000">toml </font><font color="#F3E651">|</font><font color="#ff0000"> grep </font><font color="#F3E651">.</font><font color="#ff0000">toml </font><font color="#F3E651">|</font><font color="#ff0000"> sort -R </font><font color="#F3E651">\</font>
+<font color="#ff0000">        </font><font color="#F3E651">|</font><font color="#ff0000"> head -n </font><font color="#bb00ff">1</font><font color="#F3E651">)</font><font color="#bb00ff">" | cut -d. -f1)"</font>
+
+<font color="#ff0000">    sed </font><font color="#bb00ff">"/^theme =/ { s/.*/theme = </font><font color="#ffffff">\"</font><font color="#bb00ff">$random_theme</font><font color="#ffffff">\"</font><font color="#bb00ff">/; }"</font><font color="#ff0000"> </font><font color="#F3E651">\</font>
+<font color="#ff0000">        </font><font color="#ff0000">$config_file</font><font color="#ff0000"> </font><font color="#F3E651">&gt;</font><font color="#ff0000"> </font><font color="#ff0000">$config_file</font><font color="#F3E651">.</font><font color="#ff0000">tmp </font><font color="#F3E651">&amp;&amp;</font><font color="#ff0000"> </font>
+<font color="#ff0000">        mv </font><font color="#ff0000">$config_file</font><font color="#F3E651">.</font><font color="#ff0000">tmp </font><font color="#ff0000">$config_file</font>
+<font color="#ff0000">}</font>
+
+<b><font color="#ffffff">if</font></b><font color="#ff0000"> </font><font color="#F3E651">[</font><font color="#ff0000"> -f </font><font color="#ff0000">$HELIX_CONFIG_DIR</font><font color="#ff0000">/config</font><font color="#F3E651">.</font><font color="#ff0000">toml </font><font color="#F3E651">];</font><font color="#ff0000"> </font><b><font color="#ffffff">then</font></b>
+<font color="#ff0000">    editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">random_theme</font>
+<b><font color="#ffffff">fi</font></b>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </pre>
 <br />
 <span>So every time I open a new terminal or shell, <span class='inlinecode'>editor::helix::random_theme</span> gets called, which randomly selects a theme from all installed ones and updates the helix config accordingly.</span><br />
@@ -1324,6 +1358,7 @@ editor::helix::random_theme () {
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
+<<<<<<< HEAD
 <pre>[paul@earth] ~ % editor::helix::random_theme
 [paul@earth] ~ % head -n <font color="#000000">1</font> ~/.config/helix/config.toml
 theme = <font color="#808080">"jellybeans"</font>
@@ -1334,6 +1369,18 @@ theme = <font color="#808080">"rose_pine"</font>
 [paul@earth] ~ % head -n <font color="#000000">1</font> ~/.config/helix/config.toml
 theme = <font color="#808080">"noctis"</font>
 [paul@earth] ~ %
+=======
+<pre><font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">random_theme</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> head -n </font><font color="#bb00ff">1</font><font color="#ff0000"> </font><font color="#F3E651">~/.</font><font color="#ff0000">config/helix/config</font><font color="#F3E651">.</font><font color="#ff0000">toml</font>
+<font color="#ff0000">theme </font><font color="#F3E651">=</font><font color="#ff0000"> </font><font color="#bb00ff">"jellybeans"</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">random_theme</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> head -n </font><font color="#bb00ff">1</font><font color="#ff0000"> </font><font color="#F3E651">~/.</font><font color="#ff0000">config/helix/config</font><font color="#F3E651">.</font><font color="#ff0000">toml</font>
+<font color="#ff0000">theme </font><font color="#F3E651">=</font><font color="#ff0000"> </font><font color="#bb00ff">"rose_pine"</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">random_theme</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font><font color="#ff0000"> head -n </font><font color="#bb00ff">1</font><font color="#ff0000"> </font><font color="#F3E651">~/.</font><font color="#ff0000">config/helix/config</font><font color="#F3E651">.</font><font color="#ff0000">toml</font>
+<font color="#ff0000">theme </font><font color="#F3E651">=</font><font color="#ff0000"> </font><font color="#bb00ff">"noctis"</font>
+<font color="#F3E651">[</font><font color="#ff0000">paul@earth</font><font color="#F3E651">]</font><font color="#ff0000"> </font><font color="#F3E651">~</font><font color="#ff0000"> </font><font color="#F3E651">%</font>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </pre>
 <br />
 <h2 style='display: inline' id='a-better-version'>A better version</h2><br />
@@ -1344,6 +1391,7 @@ theme = <font color="#808080">"noctis"</font>
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
+<<<<<<< HEAD
 <pre><b><u><font color="#000000">export</font></u></b> EDITOR=hx
 <b><u><font color="#000000">export</font></u></b> VISUAL=$EDITOR
 <b><u><font color="#000000">export</font></u></b> GIT_EDITOR=$EDITOR
@@ -1371,6 +1419,35 @@ editor::helix::theme::set () {
 <b><u><font color="#000000">if</font></u></b> [ -f $HELIX_CONFIG_DIR/config.toml ]; <b><u><font color="#000000">then</font></u></b>
     editor::helix::theme::<b><u><font color="#000000">set</font></u></b> $(editor::helix::theme::get_random)
 <b><u><font color="#000000">fi</font></u></b>
+=======
+<pre><b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">EDITOR</font><font color="#F3E651">=</font><font color="#ff0000">hx</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">VISUAL</font><font color="#F3E651">=</font><font color="#ff0000">$EDITOR</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">GIT_EDITOR</font><font color="#F3E651">=</font><font color="#ff0000">$EDITOR</font>
+<b><font color="#ffffff">export</font></b><font color="#ff0000"> </font><font color="#ff0000">HELIX_CONFIG_DIR</font><font color="#F3E651">=</font><font color="#ff0000">$HOME</font><font color="#F3E651">/.</font><font color="#ff0000">config/helix</font>
+
+<font color="#ff0000">editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">theme</font><font color="#F3E651">::</font><font color="#7bc710">get_random ()</font><font color="#ff0000"> {</font>
+<font color="#ff0000">    </font><b><font color="#ffffff">for</font></b><font color="#ff0000"> dir </font><b><font color="#ffffff">in</font></b><font color="#ff0000"> </font><font color="#ff0000">$(</font><font color="#ff0000">hx --health </font><font color="#F3E651">\</font>
+<font color="#ff0000">        </font><font color="#F3E651">|</font><font color="#ff0000"> awk </font><font color="#bb00ff">'/^Runtime directories/ { print $3 }'</font><font color="#ff0000"> </font><font color="#F3E651">|</font><font color="#ff0000"> tr </font><font color="#bb00ff">';'</font><font color="#ff0000"> </font><font color="#bb00ff">' '</font><font color="#F3E651">);</font><font color="#ff0000"> </font><b><font color="#ffffff">do</font></b>
+<font color="#ff0000">        </font><b><font color="#ffffff">if</font></b><font color="#ff0000"> </font><font color="#F3E651">[</font><font color="#ff0000"> -d </font><font color="#ff0000">$dir</font><font color="#ff0000">/themes </font><font color="#F3E651">];</font><font color="#ff0000"> </font><b><font color="#ffffff">then</font></b>
+<font color="#ff0000">            ls </font><font color="#ff0000">$dir</font><font color="#ff0000">/themes</font>
+<font color="#ff0000">        </font><b><font color="#ffffff">fi</font></b>
+<font color="#ff0000">    </font><b><font color="#ffffff">done</font></b><font color="#ff0000"> </font><font color="#F3E651">|</font><font color="#ff0000"> grep -F </font><font color="#F3E651">.</font><font color="#ff0000">toml </font><font color="#F3E651">|</font><font color="#ff0000"> sort -R </font><font color="#F3E651">|</font><font color="#ff0000"> head -n </font><font color="#bb00ff">1</font><font color="#ff0000"> </font><font color="#F3E651">|</font><font color="#ff0000"> cut -d</font><font color="#F3E651">.</font><font color="#ff0000"> -f</font><font color="#bb00ff">1</font>
+<font color="#ff0000">}</font>
+
+<font color="#ff0000">editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">theme</font><font color="#F3E651">::</font><font color="#7bc710">set ()</font><font color="#ff0000"> {</font>
+<font color="#ff0000">    </font><b><font color="#ffffff">local</font></b><font color="#ff0000"> -r </font><font color="#ff0000">theme</font><font color="#F3E651">=</font><font color="#bb00ff">"$1"</font><font color="#F3E651">;</font><font color="#ff0000"> </font><b><font color="#ffffff">shift</font></b>
+
+<font color="#ff0000">    </font><b><font color="#ffffff">local</font></b><font color="#ff0000"> -r </font><font color="#ff0000">config_file</font><font color="#F3E651">=</font><font color="#ff0000">$HELIX_CONFIG_DIR</font><font color="#ff0000">/config</font><font color="#F3E651">.</font><font color="#ff0000">toml</font>
+
+<font color="#ff0000">    sed </font><font color="#bb00ff">"/^theme =/ { s/.*/theme = </font><font color="#ffffff">\"</font><font color="#bb00ff">$theme</font><font color="#ffffff">\"</font><font color="#bb00ff">/; }"</font><font color="#ff0000"> </font><font color="#F3E651">\</font>
+<font color="#ff0000">        </font><font color="#ff0000">$config_file</font><font color="#ff0000"> </font><font color="#F3E651">&gt;</font><font color="#ff0000"> </font><font color="#ff0000">$config_file</font><font color="#F3E651">.</font><font color="#ff0000">tmp </font><font color="#F3E651">&amp;&amp;</font><font color="#ff0000"> </font>
+<font color="#ff0000">        mv </font><font color="#ff0000">$config_file</font><font color="#F3E651">.</font><font color="#ff0000">tmp </font><font color="#ff0000">$config_file</font>
+<font color="#ff0000">}</font>
+
+<b><font color="#ffffff">if</font></b><font color="#ff0000"> </font><font color="#F3E651">[</font><font color="#ff0000"> -f </font><font color="#ff0000">$HELIX_CONFIG_DIR</font><font color="#ff0000">/config</font><font color="#F3E651">.</font><font color="#ff0000">toml </font><font color="#F3E651">];</font><font color="#ff0000"> </font><b><font color="#ffffff">then</font></b>
+<font color="#ff0000">    editor</font><font color="#F3E651">::</font><font color="#ff0000">helix</font><font color="#F3E651">::</font><font color="#ff0000">theme</font><font color="#F3E651">::</font><b><font color="#ffffff">set</font></b><font color="#ff0000"> </font><font color="#ff0000">$(editor::helix::theme::get_random)</font>
+<b><font color="#ffffff">fi</font></b>
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 </pre>
 <br />
 <span>I hope you had some fun. E-Mail your comments to <span class='inlinecode'>paul@nospam.buetow.org</span> :-)</span><br />
diff --git a/index.html b/index.html
index 02351882..d32a4636 100644
--- a/index.html
+++ b/index.html
@@ -13,7 +13,11 @@
 </p>
 <h1 style='display: inline' id='foozone'>foo.zone</h1><br />
 <br />
+<<<<<<< HEAD
 <span class='quote'>This site was generated at 2025-02-21T11:07:02+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
+=======
+<span class='quote'>This site was generated at 2025-02-16T11:18:30+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <br />
 <span>Welcome to the foo.zone. Everything you read on this site is my personal opinion and experience. You can call me a Linux/*BSD enthusiast and hobbyist. I mainly write about tech, IT, programming and sometimes also about self-improvement here. And I also like coding.</span><br />
 <br />
diff --git a/notes/eat-that-frog.html b/notes/eat-that-frog.html
index 399a5988..4d89734a 100644
--- a/notes/eat-that-frog.html
+++ b/notes/eat-that-frog.html
@@ -112,9 +112,12 @@
 <br />
 <span>Improve specific key skills to increase productivity and enter "the zone."</span><br />
 <br />
+<<<<<<< HEAD
 <span>Other book notes of mine are:</span><br />
 <br />
 <br />
+=======
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <span>E-Mail your comments to <span class='inlinecode'>paul@nospam.buetow.org</span> :-)</span><br />
 <br />
 <a class='textlink' href='../'>Back to the main site</a><br />
diff --git a/notes/index.html b/notes/index.html
index e710ddc5..2afcc4c3 100644
--- a/notes/index.html
+++ b/notes/index.html
@@ -27,7 +27,10 @@
 <a class='textlink' href='./never-split-the-difference.html'>&#39;Never split the difference&#39; book notes</a><br />
 <a class='textlink' href='./mind-management.html'>&#39;Mind Management&#39; book notes</a><br />
 <a class='textlink' href='./mental-combat.html'>&#39;Mental Combat&#39; book notes</a><br />
+<<<<<<< HEAD
 <a class='textlink' href='./love-people-use-things.html'>Love People, Use Things</a><br />
+=======
+>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
 <a class='textlink' href='./joy-on-demand.html'>&#39;Joy On Domand&#39; book notes</a><br />
 <a class='textlink' href='./influence-wihout-authority.html'>&#39;Influence without Authority&#39; book notes</a><br />
 <a class='textlink' href='./eat-that-frog.html'>&#39;Eat That Frog&#39; book notes</a><br />
diff --git a/notes/when.html b/notes/when.html
index a480bda4..81a51f61 100644
--- a/notes/when.html
+++ b/notes/when.html
@@ -100,9 +100,12 @@
 </ul><br />
 <span>These insights from "When" can guide actions to optimize perf