From c867ac90ce4d41f3934f99db27f6bf9164c14f10 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 17 Jul 2020 18:54:51 -0400 Subject: [PATCH 1/1] various updates --- Makefile => GNUmakefile | 7 ++-- computing.m4 | 60 ++++++++++++++++++-------------- footer.html | 3 +- meta_defs.m4 | 1 + static/{Makefile => GNUmakefile} | 0 static/style.css | 6 +++- 6 files changed, 44 insertions(+), 33 deletions(-) rename Makefile => GNUmakefile (79%) rename static/{Makefile => GNUmakefile} (100%) diff --git a/Makefile b/GNUmakefile similarity index 79% rename from Makefile rename to GNUmakefile index 38db53a..fb9fc11 100644 --- a/Makefile +++ b/GNUmakefile @@ -1,14 +1,15 @@ SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4 fsf-internship/*.m4)) OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC)) -STATIC := $(patsubst static/%,out/%, $(wildcard static/* static/.*)) +STATIC := $(patsubst static/%,out/%, $(filter-out static/GNUmakefile, $(wildcard static/* static/.*))) -all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC) +all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css out/GNUmakefile $(STATIC) 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/GNUmakefile: GNUmakefile ; ln -s $(PWD)/$< $@ $(STATIC): ; ln -s $(PWD)/static/$(@F) $@ # publications bibliography @@ -30,7 +31,7 @@ watch: while true; do \ echo $(SRC) header.html footer.html \ static/bandali.bib static/bandali-bib-* static/publications-* \ - Makefile static/Makefile | \ + GNUmakefile static/GNUmakefile | \ tr " " "\n" | entr -d make; done .PHONY: deploy watch diff --git a/computing.m4 b/computing.m4 index 7f6c64d..93a6ff1 100644 --- a/computing.m4 +++ b/computing.m4 @@ -1,36 +1,33 @@ dnl -*- html -*- define(__title, `How I do my Computing')dnl define(__pub, 2019-09-14T12:00:00Z)dnl -define(__upd, 2020-07-02T12:00:00Z)dnl +define(__upd, 2020-07-17T12:00:00Z)dnl define(__id, 2)dnl include(header.html)dnl -

(Inspired by computing pages of +

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

+Leah Rowe.

Computers

-

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”.

+

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.

-

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.

- -

GNU/Linux distros

-

I've used a wide variety of GNU/Linux distributions over the years; -but as of late, I find myself using +

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). 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 +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.

Actual computing

@@ -38,13 +35,22 @@ jxself's APT repository.

GNU Emacs.

TODO: elaborate

-

Cell phone

-

I have an old Nexus 5 I reluctantly use from time to time. It runs -LineageOS+microG without GApps. Sadly it still requires some blobs -for functioning. I can't wait for lxo's -0G to become a -reality fast enough. -:-)

+

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. +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.

define(__copy, `2019, 2020')dnl include(footer.html)dnl diff --git a/footer.html b/footer.html index 7d41981..a7e7e7d 100644 --- a/footer.html +++ b/footer.html @@ -2,8 +2,7 @@ ifdef(`__feed_atom', `', `ifdef(`__feed_rss', `', `ifdef(`__pub', `

Got a question or comment? You can find my -email address on my contact page. -:-)

+email address on my contact page. __smly

')dnl diff --git a/meta_defs.m4 b/meta_defs.m4 index 30d52b4..aad4d83 100644 --- a/meta_defs.m4 +++ b/meta_defs.m4 @@ -6,3 +6,4 @@ _put(`notes', 2, `computing')dnl _put(`notes', 3, `fsf-internship/intro')dnl dnl define(__latex, `')dnl +define(__smly, `:-)')dnl diff --git a/static/Makefile b/static/GNUmakefile similarity index 100% rename from static/Makefile rename to static/GNUmakefile diff --git a/static/style.css b/static/style.css index 8527bc6..f86c4e4 100644 --- a/static/style.css +++ b/static/style.css @@ -173,7 +173,7 @@ code { } /* box effect */ -details, pre, code { +.box, details, pre, code { background-color: #f8f8f8; border: 1px solid #e6e6e6; border-radius: 4px; @@ -182,6 +182,10 @@ details, pre, code { details pre { border: none; } +p.box { + font-size: 0.95em; + padding: 0.3em 0.6em; +} table td { padding: 0.125em 0.3em; -- 2.20.1