From dcc71b98fdb8c653c2edeb9994d26d38003f4116 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 12 Dec 2020 01:13:21 -0500 Subject: [PATCH 1/1] various enhancements, including valid atom and rss feeds --- GNUmakefile | 7 +++--- arch-macbook-air.m4 | 30 ++++++++++++------------ computing.m4 | 55 ++++++++++++++++++++++---------------------- header.html | 10 ++++---- index.m4 | 56 ++++++++++++++++++++++----------------------- meta_feed_atom.m4 | 3 ++- meta_feed_rss.m4 | 5 +++- 7 files changed, 87 insertions(+), 79 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4eaaf04..bbf2bb5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -7,8 +7,9 @@ all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css out/GNUmakefile $(STA out/%.html: %.m4 header.html footer.html @mkdir -p $(@D) m4 $< > $@ -out/notes.atom: meta_feed_atom.m4 ; m4 $< > $@ -out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@ +out/notes.%: meta_feed_%.m4 $(SRC) header.html footer.html + m4 $< > $@ + sed -i 's|href="/\([^/]\)|href="https://bndl.org/\1|' $@ out/GNUmakefile: GNUmakefile ; ln -s $(PWD)/$< $@ $(STATIC): ; ln -s $(PWD)/static/$(@F) $@ @@ -25,7 +26,7 @@ clean: deploy: rsync -avzLP out/ abandali@bndl.org:www/bndl.org/ - ssh abandali@bndl.org mv www/bndl.org/.htaccess-www www/.htaccess +# ssh abandali@bndl.org mv www/bndl.org/.htaccess-www www/.htaccess watch: while true; do \ diff --git a/arch-macbook-air.m4 b/arch-macbook-air.m4 index 4435a94..d1991c8 100644 --- a/arch-macbook-air.m4 +++ b/arch-macbook-air.m4 @@ -8,9 +8,9 @@ include(header.html)dnl

This post summarizes how I install and dual-boot Arch GNU/Linux with Full-Disk Encryption alongside macOS. It is not meant to be a replacement for the -Installation +Installation Guide or the former -Beginner's +Beginner's Guide. Rather, it mostly serves as a small summary with a few useful notes about the gotchas.

@@ -32,7 +32,7 @@ then come back!

Creating a bootable Arch Installer USB

There are different ways of creating a bootable Arch USB, all documented on the -USB +USB flash installation media page on the Arch wiki, but the simplest one is using dd if you already have access to another UNIX system.

@@ -80,13 +80,13 @@ status.

Partitioning

I won't dive into partitioning and instead, I will refer you to the -Partitioning +Partitioning page of Arch wiki. Of the available partitioning tools, I personally prefer cfdisk.

Setting up LVM & LUKS

I use an -LVM +LVM on LUKS setup, where I set up LVM on top of the encrypted partition.

@@ -100,7 +100,7 @@ cryptsetup -v --cipher aes-xts-plain64 --key-size 512 --hash sha512 \

where /dev/sdaX is the partition you created in the last step (e.g. /dev/sda4). For more information about the cryptsetup options, see the -LUKS +LUKS encryption options.

Then we open the container:

@@ -234,9 +234,9 @@ reboot

Congratulations! You now have a minimal Arch installation.

At this point, I usually install my favorite AUR helper, -pacaur, then I -install the -mba6x_bl-dkms +pacaur, then +I install the +mba6x_bl-dkms backlight driver to fix the post suspend/resume issue where there's no brightness after waking up from suspend, and the only available brightness would be 100%.

@@ -256,7 +256,7 @@ pacaur -S mba6x_bl-dkms

Check out the -General +General recommendations for more details.

References

@@ -264,12 +264,12 @@ recommendations for more details.

bits and pieces, about installing Arch on a MacBook:

diff --git a/computing.m4 b/computing.m4 index 8b647ac..9b65cdd 100644 --- a/computing.m4 +++ b/computing.m4 @@ -5,52 +5,53 @@ define(__upd, 2020-07-17T12:00:00Z)dnl define(__id, 2)dnl include(header.html)dnl -

Inspired by the computing pages of -rms and -Leah Rowe.

+

Inspired by the computing page of +rms.

Computers

-

My librebooted ThinkPad X200 computer -is the machine I use the most and where I do most of my computing. I -also have the privilege of having access to a fleet of servers through -our school's -Computer Science Club that I use -for some more computationally intensive tasks every now and again, and -also for hosting this very website.

+

My librebooted ThinkPad X200 +computer is the machine I use the most and where I do most of my +computing. I also have the privilege of having access to a fleet of +servers through our school's +Computer Science Club that I +use for some more computationally intensive tasks every now and again, +and also for hosting this very website.

GNU/Linux distributions

I have used a wide variety of GNU/Linux distros over the years; but as of late, I find myself using -Trisquel, -Guix System, and -Debian (with no contrib or -non-free) almost exclusively. For the kernel, I mostly -use GNU +Trisquel, +Guix System, and +Debian (with +no contrib or non-free) almost exclusively. +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.

+jxself's APT +repository.

Actual computing

I spend most of my time in -GNU Emacs.

+GNU Emacs.

TODO: elaborate

Maintaining this site

I took a great amount of inspiration -from Phil Hagelberg's setup. -The pages of this site are written in plain HTML using GNU Emacs, -with GNU M4 acting as a full-featured -template engine. +from Phil Hagelberg's +setup. The pages of this site are written in plain HTML using GNU +Emacs, with GNU M4 acting as a +full-featured template engine. A GNUmakefile provides convenient make rules to build and publish the site. The bibliography of my publications is generated from bandali.bib -using bibtex2html, -and further processed and put together -using GNU sed and another -GNUmakefile. The git repository containing all the -sources used to build this site is -available here.

+using bibtex2html, +and further processed and put together using +GNU sed and +another GNUmakefile. The git repository containing all +the sources used to build this site is available +here.

define(__copy, `2019, 2020')dnl include(footer.html)dnl diff --git a/header.html b/header.html index 3a14408..9371905 100644 --- a/header.html +++ b/header.html @@ -3,9 +3,9 @@ ifdef(`__slug',,`define(__slug, _get(`notes', __id))')dnl ifdef(`__feed_atom', ` bandali -tag:bndl.org,atom,notes:__slug +tag:bndl.org,2020:notes.atom:__slug __pub -__upd +ifdef(`__upd',`__upd',`__pub') __title ', @@ -13,8 +13,9 @@ ifdef(`__feed_atom', ` __title https://bndl.org/__slug -tag:bndl.org,rss,notes:__slug +tag:bndl.org,2020:notes.rss:__slug syscmd(date "-uRd __pub" | tr -d \\n) +ifdef(`__upd',`__upd')dnl ', ` @@ -23,7 +24,8 @@ ifdef(`__feed_atom', __title`'ifdef(`__nts',,` — bandali') - + + diff --git a/index.m4 b/index.m4 index 02fc07d..23c4639 100644 --- a/index.m4 +++ b/index.m4 @@ -6,45 +6,45 @@ include(header.html)dnl

Hi, I'm bandali. I am -a free software -activist and a computing scientist. I graduated from the University -of Waterloo with a Master of Mathematics degree -in Computer Science, where I did research in formal logic, model -checking, and verification supervised -by Prof. Nancy Day, with the -main goal of improving software and systems +a free +software activist and a computing scientist. I graduated from the +University of Waterloo with a Master of +Mathematics degree in Computer Science, where I did research in +formal logic, model checking, and verification supervised +by Prof. Nancy Day, with +the main goal of improving software and systems reliability through application of -formal methods. -My research areas of interest include programming languages, proof -assistants, and their type systems.

+formal +methods. My research areas of interest include programming +languages, proof assistants, and their type systems.

I am currently employed -by Savoir-faire Linux as a -Free Software Consultant, where I get to hack on various parts -of Jami, work with the maintainers of Jami -packages in various GNU/Linux distributions like Debian and Trisquel -to help keep up-to-date the version of Jami available in the official -repositories of those distributions, and generally serve as a +by Savoir-faire Linux as +a Free Software Consultant, where I get to hack on various parts +of Jami, work with the maintainers of +Jami packages in various GNU/Linux distributions like Debian and +Trisquel to help keep up-to-date the version of Jami available in the +official repositories of those distributions, and generally serve as a community liaison between the Jami core development team and the wider free software community around Jami. To be sure, the views or opinions expressed on this site are solely my own, and do not necessarily represent those of my employer or anyone else.

-

On the side, I -enjoy hacking -on Emacs -Lisp. I'm a -GNU maintainer, -webmaster, -and Savannah -hacker; and an associate +

On the side, I enjoy +hacking on +Emacs +Lisp. I'm a GNU +maintainer, +webmaster, +and Savannah +hacker; and an associate member of the Free Software Foundation (FSF). I'm currently the -chief organizer of the EmacsConf +chief organizer of the EmacsConf conference, and the co-host of the -Emacs.el podcast with -Daniel Gopar. I am also a member of +Emacs.el podcast with +Daniel Gopar. I am also a member of the Systems Committee of the -Computer Science Club of the +Computer Science Club of the University of Waterloo.

diff --git a/meta_feed_atom.m4 b/meta_feed_atom.m4 index d9da718..72ac296 100644 --- a/meta_feed_atom.m4 +++ b/meta_feed_atom.m4 @@ -2,8 +2,9 @@ include(meta_defs.m4)dnl Amin Bandali's Personal Site -tag:bndl.org,atom,notes/ +tag:bndl.org,2020:notes.atom + syscmd(date -Iseconds -u | tr -d \\n) define(__feed_atom)dnl diff --git a/meta_feed_rss.m4 b/meta_feed_rss.m4 index c0e30c9..a9feeb3 100644 --- a/meta_feed_rss.m4 +++ b/meta_feed_rss.m4 @@ -1,6 +1,6 @@ include(meta_defs.m4)dnl - + Amin Bandali's Personal Site Notes and blog posts by Amin Bandali @@ -8,6 +8,9 @@ include(meta_defs.m4)dnl syscmd(date -uR | tr -d \\n) syscmd(date -uR | tr -d \\n) 1800 + + + define(__feed_rss)dnl define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1, `pushdef(`$1',$2)$4`'popdef(`$1')$0(`$1',decr($2),$3,`$4')')')') -- 2.20.1