fix two links

[~bandali/bndl.org] / index.m4

diff --git a/index.m4 b/index.m4
index ad3d902..a760e7f 100644 (file)
--- a/index.m4
+++ b/index.m4
@@ -1,134 +1,62 @@
 dnl -*- html -*-
 dnl -*- html -*-

-define(__title, `Amin Bandali''`s Personal Site')dnl
+define(__title, __site__title)dnl

 define(__slug, `home')dnl
 define(__nts)dnl
 include(header.html)dnl
 
 <section id="intro">
 define(__slug, `home')dnl
 define(__nts)dnl
 include(header.html)dnl
 
 <section id="intro">

-<p>Hi, I'm Amin.  I am currently a graduate student at the
-<a href="//watform.uwaterloo.ca">Waterloo Formal Methods</a>
-group at the University of Waterloo, supervised by
-<a href="//cs.uwaterloo.ca/~nday/">Nancy&nbsp;Day</a>.
-The main goal of my research is
-improving <strong>software and systems reliability</strong>
-through application of
-<a href="//en.wikipedia.org/wiki/Formal_methods">formal
-methods</a>.</p>
-
-<p>My research at WatForm focuses on formal logic, model checking, and
-verification.  I am also interested in programming languages, proof
-assistants, and their type systems.</p>
+<p>I am a <a href="https://www.gnu.org/philosophy/free-sw.html">free
+software</a> activist and <a href="mmath.html">computing
+scientist</a>.  I'm a GNU maintainer
+of <a href="https://jami.net">Jami</a>
+and <a href="https://www.gnu.org/software/gnuzilla/">GNUzilla and
+IceCat</a>, and I wear a few other hats around GNU, like helping run
+the Savannah forge for GNU and non-GNU projects as a Savannah hacker.
+My current <code>$dayjob</code> is working on Jami as a Free Software
+Consultant, which includes hacking on various parts of Jami and its
+packaging for various GNU/Linux distributions.</p>

 
 <p>On the side, I enjoy
 
 <p>On the side, I enjoy

-<a href="//stallman.org/articles/on-hacking.html">hacking</a> on
-<a href="//www.gnu.org/software/emacs/manual/elisp.html">elisp</a>
-and <a href="//www.gnu.org/software/guile/">guile</a>.  I am a
-GNU <a href="//www.gnu.org/people/#bandali">maintainer</a>,
-<a href="//www.gnu.org/people/webmeisters.html#bandali">webmaster</a>,
-and <a href="//savanna.gnu.org/maintenance/SavannahHacker/">Savannah
-hacker</a>.  I am also a
-<a href="//www.gnu.org/philosophy/free-sw.html">free software</a>
-activist, and an <a href="//www.fsf.org/associate/">associate
-member</a> of the <a href="///www.fsf.org">Free Software
-Foundation</a>.  I'm the chief organizer of
-the <a href="//emacsconf.org">EmacsConf</a> conference, and the
-co-host of the <a href="//emacsel.com">Emacs.el</a> podcast with
-<a href="//www.pygopar.com">Daniel Gopar</a>.  I am also a member of
-the Systems Committee of the
-<a href="//csclub.uwaterloo.ca">Computer Science Club</a> of the
-University of Waterloo.</p>
-</section>
-
-<section id="papers">
-<h2>Papers</h2>
-<dl>
-<dt>A Comparison of the Declarative Modelling Languages B, DASH, and
-TLA<sup>+</sup>
-<small>
-[ <a href="//p.bndl.org/modre2018-declarative.pdf">pdf</a>
-| <a href="//p.bndl.org/modre2018-declarative.bib">bib</a>
-]
-</small>
-</dt>
-<dd>
-Ali Abbassi, <a href="//bandali.eu.org">Amin Bandali</a>,
-<a href="//cs.uwaterloo.ca/~nday/">Nancy A. Day</a>, Jose Serna<br/>
-<em>2018 IEEE 8th International Model-Driven Requirements Engineering
-Workshop (MoDRE)</em><br/>
-Copyright &copy; 2018 IEEE.  All Rights Reserved.  Sadly.
-</dd>
-</dl>
-</section>
-
-<section id="talks">
-<h2>Talks</h2>
-<dl>
-<dt>The Magic of Specifications and Type Systems
-<small>
-[ <a href="//p.bndl.org/cucsc-2017-slides.pdf"
-     title="presented at the Canadian Undergraduate Computer Science Conference 2017,
-University of Toronto, Canada, June 15–17, 2017">slides</a>
-| <a href="//p.bndl.org/eecs4080-poster.pdf"
-     title="presented at the Lassonde Undergraduate Summer Student Research Conference,
-York University, Toronto, Canada, August 15, 2017">poster</a>
-]
-</small>
-</dt>
-<dd>
-<a href="//bandali.eu.org">Amin Bandali</a>,
-<a href="//github.com/cipher1024">Simon Hudon</a>,
-<a href="//www.cse.yorku.ca/~jonathan/">Jonathan S. Ostroff</a>
-</dd>
-</dl>
-</section>
-
-<section id="projects">
-<h2>Projects</h2>
-<p>Here are some of my recent free software projects:</p>
-<dl>
-<dt><a href="//git.emacsconf.org/bandali/refinery-theme">refinery-theme</a></dt>
-<dd>A refined, minimalist, layered colour theme for GNU Emacs</dd>
-
-<dt><a href="//git.emacsconf.org/bandali/george-mode">george-mode</a></dt>
-<dd>Emacs major mode for editing George files</dd>
-
-<dt><a href="//git.emacsconf.org/bandali/alloy-catalyst">alloy-catalyst</a></dt>
-<dd>Framework for performance analysis of Alloy models</dd>
-
-<dt><a href="//github.com/unitb/unitb-web">unitb-web</a></dt>
-<dd>Web interface for Unit-B</dd>
-
-<dt><a href="//github.com/unitb/tex2png-hs">tex2png-hs</a></dt>
-<dd>Library and CLI for converting TeX and LaTeX to PNG images</dd>
-</dl>
+<a href="https://stallman.org/articles/on-hacking.html">hacking on</a>
+GNU Emacs and Emacs Lisp.  I'm the current maintainer of
+<a href="https://www.gnu.org/software/emacs/erc.html">ERC</a> the
+powerful and modular IRC client built into GNU Emacs, an organizer of
+the <a href="https://emacsconf.org">EmacsConf</a> conference, and
+co-host of the <a href="https://emacsel.com">Emacs.el</a> podcast with
+<a href="https://www.pygopar.com">Gopar</a>.</p>

 </section>
 
 <section id="notes">
 </section>
 
 <section id="notes">

-<h2>Notes</h2>
-<p>Here are notes about a variety of topics and issues I care
-about.<br/>
-They are also available via
-<a href="notes.atom">
-<img class="feed-icon" src="icon-12px.png"
-     alt="subscribe to Atom feed">Atom</a>
-and
-<a href="notes.rss">
-<img class="feed-icon" src="icon-12px.png"
-     alt="subscribe to RSS feed">RSS</a> feeds.</p>
+<h2>notes __anc(`notes')</h2>
+<p>Here are notes about various topics or issues I care about.
+You can also read them via
+<a class="feed-icon" href="notes.atom">Atom</a> or
+<a class="feed-icon" href="notes.rss">RSS</a>.</p>

 
 <table class="post-list">
 <tbody>
 <tr>
 
 <table class="post-list">
 <tbody>
 <tr>

-<td><a href="computing">How I do my Computing</a></td>
-<td><small>September 14, 2019</small></td>
+<td><a href="lp2021.html">LibrePlanet 2021: Jami and how it empowers
+users</a></td>
+<td><small>March 20, 2021</small></td>
+</tr>
+<tr>
+<td><a href="fsf-internship-beyond.html">My internship with the FSF
+tech team and beyond</a> (concluding)</td>
+<td><small>December 18, 2020</small></td>
+</tr>
+<tr>
+<td><a href="fsf-internship-intro.html">Internship with the FSF tech
+team</a> (intro)</td>
+<td><small>May 29, 2020</small></td>

 </tr>
 <tr>
 </tr>
 <tr>

-<td><a href="arch-macbook-air">Arch GNU/Linux on MacBook Air 2013</a></td>
-<td><small>November 1, 2016</small></td>
+<td><a href="computing.html">How I do my Computing</a></td>
+<td><small>September 14, 2019</small></td>

 </tr>
 </tbody>
 </table>
 </section>
 
 </tr>
 </tbody>
 </table>
 </section>
 

-define(__copy, `2016&ndash;2019')dnl
+define(__copy, `2016&ndash;2021')dnl

 include(footer.html)dnl
 include(footer.html)dnl