fix: significant changes, reordered sections, rewrote stuff, updated hero section, update deps

Author: ErikBjare

Gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.3.2"
+gem "jekyll", "~> 4.4.1"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.

Gemfile.lock

@@ -1,33 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.6)
+    csv (3.3.5)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    ffi (1.16.3)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    google-protobuf (3.25.0-arm64-darwin)
-    google-protobuf (3.25.0-x86_64-linux)
-    http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    google-protobuf (4.33.2-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.33.2-x86_64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    http_parser.rb (0.8.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.2)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
+      json (~> 2.6)
       kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
       rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
@@ -45,8 +56,8 @@ GEM
       pug-ruby (~> 2.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (3.0.0)
-      sass-embedded (~> 1.54)
+    jekyll-sass-converter (3.1.0)
+      sass-embedded (~> 1.75)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
@@ -56,54 +67,57 @@ GEM
       nokogiri (~> 1.12)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
-      rexml
+    json (2.18.0)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     memoist (0.16.2)
     mercenary (0.4.0)
     method-not-implemented (1.0.1)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    mini_portile2 (2.8.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     posix-spawn (0.3.15)
-    public_suffix (5.0.3)
+    public_suffix (7.0.0)
     pug-ruby (2.0.1)
       execjs (~> 2.0)
       memoist (~> 0.15)
       method-not-implemented (~> 1.0, >= 1.0.1)
       regexp-match-polyfill (~> 1.0, >= 1.0.2)
     racc (1.7.3)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     regexp-match-polyfill (1.0.2)
-    rexml (3.2.6)
-    rouge (4.2.0)
+    rexml (3.4.4)
+    rouge (4.6.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.69.5-arm64-darwin)
-      google-protobuf (~> 3.23)
-    sass-embedded (1.69.5-x86_64-linux-gnu)
-      google-protobuf (~> 3.23)
+    sass-embedded (1.97.1-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.97.1-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
+    webrick (1.9.2)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
   http_parser.rb (~> 0.6.0)
-  jekyll (~> 4.3.2)
+  jekyll (~> 4.4.1)
   jekyll-compose
   jekyll-feed (~> 0.12)
   jekyll-last-modified-at

index.pug

@@ -6,24 +6,18 @@ include templates/mixins.pug
 +section.bg-slate-950.text-white
   div.text-center.h-96.flex.flex-col.justify-center
     div
-      div.text-2xl
-        | Turning you into a
-      div.text-7xl Superuser
-    div.pt-10
-      | We build #[b(class="text-yellow-300") free and open-source software] that empowers users.
-
-+section.bg-gray-100.py-10
-  div.p-4.max-w-4xl.mx-auto
-    p.text-center.text-2xl
-      | About us
-    div
-      p.my-4
-        | We are a small team of developers and researchers who are passionate about free and open-source software, and we are building such software to empower users (like you!).
-      p.my-4
-        | Originally based in #[span(class="text-blue-950") 🇸🇪 Sweden], we have been active since 2017, and have experience working with technologies in a wide range of fields,
-        | including full-stack development, machine learning, algorithmic trading, smart contracts, and decentralized systems.
-      p.my-4
-        | We also offer consulting services in the fields of software development, machine learning, and computational neuroscience.
+      div.text-7xl Superuser #[span(class="text-slate-600") Labs]
+    div.pt-10.text-slate-300
+      | We build #[i(class="text-green-400") free] and #[i(class="text-green-400") open-source] software that empowers you
+      //-| Our software has been downloaded over #[b(class="text-green-500") 500,000 times] worldwide, and is used by individuals, researchers, and organizations alike.
+      //-| People use ActivityWatch as a critical tool to understand and improve their productivity, focus, and well-being in an increasingly digital world.
+    div.mt-6.text-slate-200.text-xl.opacity-80
+      div
+        | Software that gives you #[i(class="text-orange-400") superpowers]
+      div
+        | To make you a #[i(class="text-amber-200") superuser]
+      div
+        | For #[i(class="text-green-500") free]
 
 +section.max-w-4xl.mx-auto.py-10
   mixin project(name, imgname)
@@ -65,12 +59,12 @@ include templates/mixins.pug
       | A chat-CLI for conveniently interacting with LLMs in your terminal, similar to ChatGPT's "Advanced Data Analysis".
       | Has access to tools to run code and modify files on the host machine, to speed up your workflow.
     div.flex.flex-wrap
-      +button.mb-3(href="https://github.com/ErikBjare/gptme")
+      +button.mb-3(href="https://github.com/gptme/gptme")
         | #[i.fab.fa-github] GitHub
-      +button.mb-3(href="https://erik.bjareholt.com/gptme/docs/")
+      +button.mb-3(href="https://gptme.org/docs/")
         | #[i.fas.fa-book] Docs
     div.flex.flex-wrap
-      +github-stars-badge('ErikBjare/gptme')
+      +github-stars-badge('gptme/gptme')
 
   +project("Thankful", "thankful-logo.png")
     p.mb-1 Donate crypto directly to every content creator that you like. Automatically and without middlemen.
@@ -98,32 +92,68 @@ include templates/mixins.pug
     div.flex.flex-wrap
       +github-stars-badge('uniswap-python/uniswap-python')
 
-//+section.bg-gray-800.text-white
-  div(class="flex")
-    div(class="min-w-56 flex items-center justify-center")
-      +fa('donate', 'fas', 'text-yellow-500')
-    div(class="flex-grow")
-      h2 Support us!
-      p We rely on donations to keep our work going, keep an eye on this space for donations.
++section.bg-gray-100.py-10
+  div.p-4.max-w-4xl.mx-auto
+    p.text-center.text-2xl
+      | About us
+    div
+      p.my-4
+        | We are a small team of developers and researchers who are passionate about free and open-source software, and we are building such software to empower users (like you!).
+      p.my-4
+        | Originally based in #[span(class="text-blue-950") 🇸🇪 Sweden], we have been active since 2017, and have experience working with technologies in a wide range of fields,
+        | including full-stack development, machine learning, algorithmic trading, smart contracts, and decentralized systems.
+      p.my-4
+        | We also offer consulting services in the fields of software development, machine learning, and computational neuroscience.
+
++section.p-10(class="sm:p-20")
+  h2.text-center.text-4xl.mb-10 Team
+  div.max-w-3xl.mx-auto.grid.grid-cols-1.gap-10(class="sm:grid-cols-2")
+    +teammember("Erik Bjäreholt", "erik.jpg", "CEO, Developer", github="http://github.com/ErikBjare", linkedin="https://www.linkedin.com/in/erikbjareholt/")
+    +teammember("Johan Bjäreholt", "johan.png", "Developer", github="https://github.com/johan-bjareholt", linkedin="https://www.linkedin.com/in/johanbjareholt/")
+
+  div(class="xl:w-3/4").mx-auto.text-sm
+    details
+      summary.text-center.text-3xl.py-10(class="hover:cursor-pointer")
+        | Past team members
+        div.text-xs.text-gray-500
+          | (click to expand)
+
+      div.grid.grid-cols-1.gap-10(class="sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4")
+        +teammember("Johannes Ahnlide", "johannes.jpg", "Developer", github="https://github.com/ahnlabb")
+        +teammember("Jacob Karlsson", "jacob.jpg", "Developer", github="https://github.com/powersource", linkedin="https://www.linkedin.com/in/jacob-karlsson-6a483bb1/")
+        +teammember("Patrik Laurell", "patrik.jpg", "Developer", github="https://github.com/patrik-laurell", linkedin="https://www.linkedin.com/in/patrik-laurell-ba5b306b/")
+        +teammember("Valthor Halldórsson", "valthor.jpg", "Developer", github="https://github.com/vlthr", linkedin="https://www.linkedin.com/in/valthor-halldorsson-002aaa13a/")
+        +teammember("Dwight Lidman", "dwight.jpg", "Developer", github="https://github.com/dwilid", linkedin="https://www.linkedin.com/in/dwight-lidman/", image_style="background-position-y: 10%")
+        +teammember("Michael Young", "michael.jpg", "Developer", github="https://github.com/Miyou", linkedin="https://www.linkedin.com/in/michael-young-522148142/")
 
 div.bg-gray-800.text-white.py-10
   div.w-100.max-w-6xl.mx-auto
     div.container.mx-auto.px-6.py-10
       div.flex.flex-col.items-center
         div.text-4xl.mb-10 History
         ul.timeline
+          // TODO: mention 2013 as when I graduated high school/started university?
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2014
             p Erik starts working on ActivityWatch
+          li.border-l-2.border-gray-200.pl-4.pb-4
+            p.font-bold 2016
+            p ActivityWatch v0.1 released
+            p Johan joins ActivityWatch development
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2017
-            p Superuser Labs was founded, with Thankful as its initial project.
+            p Superuser Labs was founded, with Thankful as its initial project
+            p We are awarded a Leapfrogs grant by Lund University
+          li.border-l-2.border-gray-200.pl-4.pb-4
+            p.font-bold 2018
+            p We receive a double Leapfrogs grant
+            p Thankful team grows to 5 developers over the summer
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2019
-            p Thankful folds, ActivityWatch becomes the main focus.
+            p Thankful folds, ActivityWatch becomes the main focus
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2021
-            p ActivityWatch getting adopted by researchers.
+            p ActivityWatch getting adopted by researchers
             p Receives Uniswap Grant for uniswap-python
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2022
@@ -133,35 +163,28 @@ div.bg-gray-800.text-white.py-10
             p First consulting client: University of Ghent
             p March: Erik starts working on gptme
             p September: First public release of gptme
-            p December: Erik joins Lovable founding team as first hire
+            p December: Erik joins Lovable as first hire
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2024
-            p May: Erik leaves Lovable to focus on Superuser Labs and gptme full-time
+            p May: Erik leaves Lovable, focus returns to Superuser Labs and gptme
             p November: gptme-webui and gptme-agent-template is created
+            p November: #[a(href="https://github.com/TimeToLearnAlice") Alice] and #[a(href="https://timetobuildbob.github.io") Bob] are born
           li.border-l-2.border-gray-200.pl-4.pb-4
             p.font-bold 2025
             p January: prototype of landing page for gptme.ai
             p March: initial commit to gptme.ai infra
             p May: initial commit to gptme-tauri
+            p October: Bob achieves autonomous operation
+            p November: consulting for venture firm Pale Blue Dot
+            p December: consulting for Dendrite Systems (Strawberry Browser)
+          //-li.border-l-2.border-gray-200.pl-4.pb-4
+          //-  p.font-bold 2026
+          //-  p Jan-April: consulting for researcher at Lund University to customize ActivityWatch in a study
 
-+section.p-10.max-w-3xl.mx-auto(class="sm:p-20")
-  h2.text-center.text-4xl.mb-10 Team
-  div.grid.grid-cols-1.gap-10(class="sm:grid-cols-2")
-    +teammember("Erik Bjäreholt", "erik.jpg", "CEO, Developer", github="http://github.com/ErikBjare", linkedin="https://www.linkedin.com/in/erikbjareholt/")
-    +teammember("Johan Bjäreholt", "johan.png", "Developer", github="https://github.com/johan-bjareholt", linkedin="https://www.linkedin.com/in/johanbjareholt/")
-
-div.w-full.bg-gray-800.text-white.p-10.pb-20
-  div(class="xl:w-3/4").mx-auto.text-sm
-    details
-      summary.text-center.text-3xl.py-10(class="hover:cursor-pointer")
-        | Past team members
-        div.text-xs.text-gray-500
-          | (click to expand)
-
-      div.grid.grid-cols-1.gap-10(class="sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4")
-        +teammember("Johannes Ahnlide", "johannes.jpg", "Developer", github="https://github.com/ahnlabb")
-        +teammember("Jacob Karlsson", "jacob.jpg", "Developer", github="https://github.com/powersource", linkedin="https://www.linkedin.com/in/jacob-karlsson-6a483bb1/")
-        +teammember("Patrik Laurell", "patrik.jpg", "Developer", github="https://github.com/patrik-laurell", linkedin="https://www.linkedin.com/in/patrik-laurell-ba5b306b/")
-        +teammember("Valthor Halldórsson", "valthor.jpg", "Developer", github="https://github.com/vlthr", linkedin="https://www.linkedin.com/in/valthor-halldorsson-002aaa13a/")
-        +teammember("Dwight Lidman", "dwight.jpg", "Developer", github="https://github.com/dwilid", linkedin="https://www.linkedin.com/in/dwight-lidman/", image_style="background-position-y: 10%")
-        +teammember("Michael Young", "michael.jpg", "Developer", github="https://github.com/Miyou", linkedin="https://www.linkedin.com/in/michael-young-522148142/")
+//+section.bg-gray-800.text-white
+  div(class="flex")
+    div(class="min-w-56 flex items-center justify-center")
+      +fa('donate', 'fas', 'text-yellow-500')
+    div(class="flex-grow")
+      h2 Support us!
+      p We rely on donations to keep our open-source work going, keep an eye on this space for donations.