💬 tweak homepage (bump deps)

Closes #17

.drone.yml

@@ -0,0 +1,27 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: build
+    image: jekyll/jekyll
+    environment:
+      JEKYLL_ENV: production
+    commands:
+      - chown -R jekyll:jekyll /drone/src
+      - npm install
+      - bundle install
+      - bundle exec jekyll build
+  - name: publish
+    image: walkah.dev/walkah/drone-ipfs-cluster
+    settings:
+      path: /drone/src/_site
+      domain: walkah.net
+      cluster_host: /ip4/100.95.167.126/tcp/9094
+      cluster_user: walkah
+      cluster_password:
+        from_secret: IPFS_CLUSTER_PASSWORD
+      cluster_args: -f
+      cf_email: walkah@walkah.net
+      cf_apikey:
+        from_secret: CLOUDFLARE_APIKEY

404.html

@@ -2,4 +2,4 @@
 layout: page
 title: Uh oh.
 ---
-Looks like I lost that one, sorry. Maybe check the <a href="/blog/">archive</a>?
+Looks like I lost that one, sorry. Maybe check the <a href="{{ "/blog" | relative_path  }}">archive</a>?

Gemfile

@@ -6,6 +6,7 @@ gem 'html-proofer'
 
 group :jekyll_plugins do
   gem 'jekyll-compose'
+  gem 'jekyll-feed'
   gem 'jekyll-gist'
   gem 'jekyll-postcss'
 end

Gemfile.lock

@@ -1,117 +1,139 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    Ascii85 (1.1.1)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    afm (0.2.2)
+    async (2.11.0)
+      console (~> 1.25, >= 1.25.2)
+      fiber-annotation
+      io-event (~> 1.5, >= 1.5.1)
+      timers (~> 4.1)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
+    console (1.25.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    ffi (1.15.5)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.16.3)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (0.1.1)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.4)
+    google-protobuf (4.26.1)
+      rake (>= 13)
+    hashery (2.1.2)
+    html-proofer (5.0.9)
       addressable (~> 2.3)
-      mercenary (~> 0.3)
+      async (~> 2.1)
       nokogiri (~> 1.13)
-      parallel (~> 1.10)
+      pdf-reader (~> 2.11)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
+      zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    io-event (1.5.1)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-compose (0.12.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-postcss (0.5.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.0)
-    multipart-post (2.1.1)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.6)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.22.1)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.0)
+    pdf-reader (2.12.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    public_suffix (5.0.5)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.28.0)
-    ruby2_keywords (0.0.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rouge (4.2.1)
+    ruby-rc4 (0.1.5)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sawyer (0.8.2)
+    sass-embedded (1.77.2)
+      google-protobuf (>= 3.25, < 5.0)
+      rake (>= 13.0.0)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
+      faraday (>= 0.17.3, < 3)
+    strscan (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    timers (4.3.5)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
+    webrick (1.8.1)
     yell (2.2.2)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby
@@ -120,8 +142,9 @@ DEPENDENCIES
   html-proofer
   jekyll
   jekyll-compose
+  jekyll-feed
   jekyll-gist
   jekyll-postcss
 
 BUNDLED WITH
-   2.2.20
+   2.5.10

_config.yml

@@ -16,9 +16,13 @@ exclude:
   - shell.nix
   - README.md
 
+feed:
+  path: /atom.xml
+
 postcss:
   cache: false
 
 plugins:
   - jekyll-gist
+  - jekyll-feed
   - jekyll-postcss

_deploy.yml

@@ -1,13 +0,0 @@
-method: rsync
-site_dir: _site 
-
-user: walkah@walkah.net
-remote_path: /var/www/walkah.net
-delete: true
-
-# flags: -rltDvz                          # Modify flags as necessary to suit your hosting setup
-# port:                                   # If your host requires a non standard port
-# exclude:                                # Path to file containing list of files to exclude
-# exclude-file:                           # Path to file containing list of files to exclude
-# include:                                # Path to file containing list of files to include
-# include-file:                           # Path to file containing list of files to include

_includes/article_list.html

@@ -1,4 +1,4 @@
 <article class="h-entry">
   <time class="dt-published" datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "%B %d" }}</time>
-  <a href="{{ post.url }}" class="u-url p-name">{{post.title}}</a>
+  <a href="{{ post.url | relative_path }}" class="u-url p-name">{{post.title}}</a>
 </article>

_includes/post.html

@@ -1,11 +1,11 @@
 <article class="h-entry prose lg:prose-lg" role="article">
   <header>
     <h1 class="p-name">{{ post.title }}</h1>
-    <time class="dt-published" datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate><a class="u-url" href="{{ post.url }}">{{ post.date | date: "%B %d, %Y" }}</a></time>
+    <time class="dt-published" datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate><a class="u-url" href="{{ post.url | relative_path }}">{{ post.date | date: "%B %d, %Y" }}</a></time>
   </header>
   {% if post.image %}
   <figure class="-mx-12">
-    <img class="u-featured rounded-md shadow-md w-full" src="{{ post.image }}" alt="{{ post.title }}">
+    <img class="u-featured rounded-md shadow-md w-full" src="{{ post.image | relative_path }}" alt="{{ post.title }}">
     {% if post.image_source %}
     <figcaption>
       <cite><a href="{{ post.image_source }}">{{ post.image_source }}</a></cite>

_layouts/default.html

@@ -3,8 +3,9 @@
 <head>
   <title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}</title>
   {% include meta.html %}
-  <link href="/css/main.css" media="screen, projection" rel="stylesheet" type="text/css">
-  <link href="/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml">
+  <link href="{{ "/css/main.css" | relative_path }}" media="screen, projection" rel="stylesheet" type="text/css">
+  <link href="{{ "/atom.xml" | relative_path }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
+  <script defer data-domain="walkah.net" src="https://plausible.io/js/script.js"></script>
 </head>
 <body class="bg-white text-gray-900 dark:bg-gray-900 dark:text-gray-100">
   <div class="container max-w-2xl mb-24 mt-8 mx-auto">

_layouts/post.html

@@ -8,7 +8,7 @@ layout: default
   </header>
   {% if page.image %}
   <figure class="md:-mx-12">
-    <img class="u-featured rounded-md shadow-md w-full" src="{{ page.image }}" alt="{{ page.title }}">
+    <img class="u-featured rounded-md shadow-md w-full" src="{{ page.image | relative_path }}" alt="{{ page.title }}">
     {% if page.image_source %}
     <figcaption>
       <cite><a href="{{ page.image_source }}">{{ page.image_source }}</a></cite>
@@ -21,8 +21,8 @@ layout: default
   </section>
   <footer class="flex flex-row not-prose">
     <div rel="author" class="p-author h-card basis-1/2">
-      <img class="u-photo w-8 inline-block" src="/images/walkah-avatar.png" >
-      <a href="/">walkah</a>
+      <img class="u-photo w-8 inline-block" src="{{ "/images/walkah-avatar.png" | relative_path }}" >
+      <a href="{{ "/" | relative_path }}">walkah</a>
     </div>
     <div class="text-right basis-1/2">{{ page.tags | tag_links }}</div>
   </footer>

_plugins/relative_path.rb

@@ -0,0 +1,10 @@
+module Jekyll
+  module RelativePath
+    def relative_path(url)
+      page_url = @context.registers[:page]['url']
+      Pathname(url).relative_path_from(Pathname(page_url)).to_s
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::RelativePath)

_plugins/tag_index.rb

@@ -5,12 +5,12 @@ module Jekyll
       @base = base
       @dir = dir
       @name = 'index.html'
-      self.process(@name)
-      self.read_yaml(File.join(base, '_layouts'), 'tag_index.html')
-      self.data['tag'] = tag
+      process(@name)
+      read_yaml(File.join(base, '_layouts'), 'tag_index.html')
+      data['tag'] = tag
       tag_title_prefix = site.config['tag_title_prefix'] || 'Posts Tagged “'
       tag_title_suffix = site.config['tag_title_suffix'] || '”'
-      self.data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}"
+      data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}"
     end
   end
 
@@ -20,31 +20,31 @@ module Jekyll
       @base = base
       @dir  = tag_dir
       @name = 'atom.xml'
-      self.process(@name)
+      process(@name)
       # Read the YAML data from the layout page.
-      self.read_yaml(File.join(base, '_layouts'), 'tag_feed.xml')
-      self.data['tag'] = tag
+      read_yaml(File.join(base, '_layouts'), 'tag_feed.xml')
+      data['tag'] = tag
       # Set the title for this page.
       tag_title_prefix = site.config['tag_title_prefix'] || 'Posts Tagged “'
       tag_title_suffix = site.config['tag_title_suffix'] || '”'
-      self.data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}"
+      data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}"
       # Set the meta-description for this page.
 
       # Set the correct feed URL.
-      self.data['feed_url'] = "#{tag_dir}/#{name}"
+      data['feed_url'] = "#{tag_dir}/#{name}"
     end
   end
 
   class TagGenerator < Generator
     safe true
     def generate(site)
-      if site.layouts.key? 'tag_index'
-        dir = site.config['tag_dir'] || 'tag'
-        site.tags.keys.each do |tag|
-          dest_dir = File.join(dir, tag.tr(' ', '-'))
-          write_tag_index(site, dest_dir, tag)
-          write_tag_feed(site, dest_dir, tag)
-        end
+      return unless site.layouts.key? 'tag_index'
+
+      dir = site.config['tag_dir'] || 'tag'
+      site.tags.keys.each do |tag|
+        dest_dir = File.join(dir, tag.tr(' ', '-'))
+        write_tag_index(site, dest_dir, tag)
+        write_tag_feed(site, dest_dir, tag)
       end
     end
 
@@ -74,8 +74,11 @@ module Jekyll
     #
     def tag_links(tags)
       tags = tags.sort!.map do |item|
+        page_url = @context.registers[:page]['url']
+
         item.tr!(' ', '-')
-        "<a class='p-category' href='/tag/#{item}/'>#{item}</a>"
+        tag_path = "/tag/#{item}"
+        "<a class='p-category' href='#{Pathname(tag_path).relative_path_from(Pathname(page_url))}'>#{item}</a>"
       end
       tags.join(', ')
     end

atom.xml

@@ -1,26 +0,0 @@
----
-layout: null
----
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-
-  <title><![CDATA[{{ site.title }}]]></title>
-  <link href="{{ site.url }}/atom.xml" rel="self"/>
-  <link href="{{ site.url }}/"/>
-  <updated>{{ site.time | date_to_xmlschema }}</updated>
-  <id>{{ site.url }}/</id>
-  <author>
-    <name><![CDATA[{{ site.author | strip_html }}]]></name>
-    {% if site.email %}<email><![CDATA[{{ site.email }}]]></email>{% endif %}
-  </author>
-
-  {% for post in site.posts limit: 20 %}
-  <entry>
-    <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
-    <link href="{{ site.url }}/{{ post.url }}"/>
-    <updated>{{ post.date | date_to_xmlschema }}</updated>
-    <id>{{ site.url }}/{{ post.id }}</id>
-    <content type="html"><![CDATA[{{ post.content | expand_urls: site.url | cdata_escape }}]]></content>
-  </entry>
-  {% endfor %}
-</feed>

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -17,12 +17,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1652776076,
-        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -33,16 +36,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
-        "owner": "NixOS",
+        "lastModified": 1716218643,
+        "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -53,6 +56,21 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,7 +2,7 @@
   description = "walkah.net";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
 
     flake-compat = {
@@ -11,22 +11,21 @@
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, ... }:
+  outputs = { nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in
         {
           devShells.default = pkgs.mkShell {
-            buildInputs = with pkgs; [ ruby nodejs ];
+            name = "net";
+            buildInputs = with pkgs; [ libyaml nodejs ruby ];
             shellHook = ''
               mkdir -p .gems
 
               export GEM_HOME=$PWD/.gems
               export GEM_PATH=$GEM_HOME
               export PATH=$PWD/bin:$GEM_HOME/bin:$PATH
-              # https://github.com/sass/sassc-ruby/issues/148#issuecomment-644450274
-              bundle config build.sassc --disable-lto
             '';
           };
         }

index.html

@@ -4,11 +4,11 @@ title: James Walker
 ---
 
 <section class="h-card prose lg:prose-2xl dark:prose-invert">
-  <img src="/images/walkah-avatar.png" alt="James Walker" class="u-photo rounded-full w-48 mx-auto">
+  <img src="{{ "/images/walkah-avatar.png" | relative_path }}" alt="James Walker" class="u-photo rounded-full w-48 mx-auto">
   <p class="lead text-center">👋 I'm <span class="p-name"><span class="p-given-name">James</span> <span class="p-family-name">Walker</span></span> aka <a href="https://walkah.net/" class="u-url u-uid p-nickname">walkah</a>.</p>
   <p class="p-note">
     I am a free software developer in <span class="p-locality">Toronto</span>, <span class="p-country-name">Canada</span>.
-    I'm currently the <span class="p-role">VP of Engineering</span> at <a class="p-org" href="https://fission.codes/">Fission</a> where we're building tools for a <span class="p-category">decentralized</span>, <span class="p-category">open web</span>.
+    I believe in a <span class="p-category">decentralized</span>, <span class="p-category">open web</span>.
   </p>
   <p>You can follow my work on <a href="https://github.com/walkah" rel="me">github</a> and <a href="https://twitter.com/walkah" rel="me">twitter</a>, but I prefer the <a href="https://walkah.social" rel="me">fediverse</a> and <a href="https://matrix.to/#/@walkah:walkah.chat" rel="me">matrix</a>.</p>
 </section>

package.json

@@ -2,9 +2,9 @@
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.2",
     "autoprefixer": "^10.4.7",
-    "cssnano": "^5.1.9",
+    "cssnano": "^7.0.0",
     "postcss": "^8.4.14",
-    "postcss-import": "^14.1.0",
+    "postcss-import": "^16.0.0",
     "tailwindcss": "^3.0.24"
   }
 }