From 3fdab855a4dd23026c0320dbb01a58acbfd7c728 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 10 Jul 2020 00:21:50 -0400 Subject: [PATCH 1/1] bandali.eu.org -> bndl.org --- Makefile | 4 ++-- computing.m4 | 34 ++++++++++++++++------------------ cv.m4 | 2 +- header.html | 10 +++++----- index.m4 | 10 +++++----- license.m4 | 2 +- meta_feed_atom.m4 | 6 +++--- meta_feed_rss.m4 | 2 +- static/.htaccess-www | 4 ++-- static/404.html | 2 +- 10 files changed, 37 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 3d667cb..353cbb8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ clean: rm -rf out/ deploy: - rsync -avzLP out/ abandali@bandali.eu.org:www/site/ - ssh abandali@bandali.eu.org mv www/site/.htaccess-www www/.htaccess + rsync -avzLP out/ abandali@bndl.org:www/site/ + ssh abandali@bndl.org mv www/site/.htaccess-www www/.htaccess .PHONY: deploy diff --git a/computing.m4 b/computing.m4 index d9f1c6e..7f6c64d 100644 --- a/computing.m4 +++ b/computing.m4 @@ -1,7 +1,7 @@ dnl -*- html -*- define(__title, `How I do my Computing')dnl define(__pub, 2019-09-14T12:00:00Z)dnl -define(__upd, 2019-11-30T23:00:00Z)dnl +define(__upd, 2020-07-02T12:00:00Z)dnl define(__id, 2)dnl include(header.html)dnl @@ -10,30 +10,28 @@ include(header.html)dnl Leah Rowe)

Computers

-

My main computer is a -soon-to-be-librebooted -ThinkPad X200. This is the machine I use the most in or out the -house. I also own and occasionally use a Dell XPS 15 more as a -“Desktop”, and a ThinkPad X220T tablet I use when reading -(and annotating) research papers.

+

My main computer is a librebooted +ThinkPad X200, and is the machine I use the most. I also own a +ThinkPad X220T tablet that I occasionally use for reading and +annotating research papers, and a Dell XPS 15 I use every now and +again more as a “desktop”.

I also have the privilege of having access to a fleet of beefy servers through our school's -Computer Science Club, -which I use for some heavier computations every now and -again.

+Computer Science Club, which I use +for some heavier computations every now and again.

GNU/Linux distros

-

I've used a large number of GNU/Linux distributions throughout the -years, but as of late, my favourite distros are +

I've used a wide variety of GNU/Linux distributions over the years; +but as of late, I find myself using Trisquel, Guix System, and Debian (with no contrib or -non-free). I mostly use the -GNU Linux-libre kernel. -Guix System comes with GNU Linux-libre out of the box, and on -Debian-based distros I install it from jxself's -APT repository.

+non-free). For the kernel, I mostly use +GNU +Linux-libre. Guix System comes with GNU Linux-libre out of +the box, and on Debian-based distros I tend to install it from +jxself's APT repository.

Actual computing

I spend most of my time in @@ -48,5 +46,5 @@ for functioning. I can't wait for lxo's reality fast enough. :-)

-define(__copy, `2019')dnl +define(__copy, `2019, 2020')dnl include(footer.html)dnl diff --git a/cv.m4 b/cv.m4 index 8a7bf94..9d4d254 100644 --- a/cv.m4 +++ b/cv.m4 @@ -9,7 +9,7 @@ include(header.html)dnl Site -bandali.eu.org +bndl.org Email diff --git a/header.html b/header.html index 33ac3e5..2cc6c75 100644 --- a/header.html +++ b/header.html @@ -1,19 +1,19 @@ include(meta_notes.m4)dnl ifdef(`__slug',,`define(__slug, _get(`notes', __id))')dnl ifdef(`__feed_atom', -` +` Amin Bandali -tag:bandali.eu.org,atom,notes:__slug +tag:bndl.org,atom,notes:__slug __pub __upd - + __title ', `ifdef(`__feed_rss', ` __title -https://bandali.eu.org/__slug -tag:bandali.eu.org,rss,notes:__slug +https://bndl.org/__slug +tag:bndl.org,rss,notes:__slug syscmd(date "-uRd __pub" | tr -d \\n) ', ` diff --git a/index.m4 b/index.m4 index fa7f4b0..2459b42 100644 --- a/index.m4 +++ b/index.m4 @@ -37,13 +37,13 @@ co-host of the Emacs.el podcast with the Systems Committee of the Computer Science Club of the University of Waterloo, and an intern with the FSF tech team starting -in May 2020.

+in spring 2020.

Papers

-
A Comparison of the Declarative Modelling Languages B, DASH, and +
A Comparison of the Declarative Modelling Languages B, Dash, and TLA+ [ pdf @@ -52,7 +52,7 @@ TLA+
-Ali Abbassi, Amin Bandali, +Ali Abbassi, Amin Bandali, Nancy A. Day, Jose Serna
2018 IEEE 8th International Model-Driven Requirements Engineering Workshop (MoDRE)
@@ -76,7 +76,7 @@ York University, Toronto, Canada, August 15, 2017">poster
-Amin Bandali, +Amin Bandali, Simon Hudon, Jonathan S. Ostroff
@@ -136,5 +136,5 @@ and
-define(__copy, `2016–2019')dnl +define(__copy, `2016–2020')dnl include(footer.html)dnl diff --git a/license.m4 b/license.m4 index 35e5912..8809dd6 100644 --- a/license.m4 +++ b/license.m4 @@ -4,7 +4,7 @@ define(__slug, `license')dnl include(header.html)dnl
-

License information for bandali.eu.org

+

License information for bndl.org

I strongly believe in free culture and that all creative works everywhere should be diff --git a/meta_feed_atom.m4 b/meta_feed_atom.m4 index f0c9a46..a425652 100644 --- a/meta_feed_atom.m4 +++ b/meta_feed_atom.m4 @@ -2,9 +2,9 @@ include(meta_notes.m4)dnl Amin Bandali's Personal Site -tag:bandali.eu.org,atom,notes/ - - +tag:bndl.org,atom,notes/ + + syscmd(date -Iseconds -u | tr -d \\n) define(__feed_atom)dnl define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1, diff --git a/meta_feed_rss.m4 b/meta_feed_rss.m4 index 8ebecd8..cc24c84 100644 --- a/meta_feed_rss.m4 +++ b/meta_feed_rss.m4 @@ -4,7 +4,7 @@ include(meta_notes.m4)dnl Amin Bandali's Personal Site Notes and blog posts by Amin Bandali -https://bandali.eu.org +https://bndl.org syscmd(date -uR | tr -d \\n) syscmd(date -uR | tr -d \\n) 1800 diff --git a/static/.htaccess-www b/static/.htaccess-www index 87c80d1..9d6976c 100644 --- a/static/.htaccess-www +++ b/static/.htaccess-www @@ -4,7 +4,7 @@ Options -MultiViews RewriteEngine On RewriteBase / -# if on csclub.uwaterloo.ca, redirect to bandali.eu.org +# if on csclub.uwaterloo.ca, redirect to bndl.org RewriteCond %{HTTP_HOST} ^csclub\.uwaterloo\.ca$ -RewriteRule ^(.*)$ https://bandali.eu.org/$1 [R] +RewriteRule ^(.*)$ https://bndl.org/$1 [R] diff --git a/static/404.html b/static/404.html index 26f3f81..883067e 100644 --- a/static/404.html +++ b/static/404.html @@ -8,7 +8,7 @@ -

+

404

Sorry, that page does not exist.

-- 2.20.1