reformat code

21 files changed, 147 insertions, 162 deletions

diff --git a/basics/default.nix b/basics/default.nix
index 8769314..03058cf 100644
--- a/basics/default.nix
+++ b/basics/default.nix
@@ -1,6 +1,8 @@
-{ href, file, ... }:
-
-let
+{
+  href,
+  file,
+  ...
+}: let
   institution = {
     position = "PhD student in Theoretical Computer Science";
     name = "IRIF";
@@ -47,12 +49,14 @@ in {
   };
   keys = let
     getKeyFiles = type: keys: {
-      "${type}" = builtins.foldl'
-        (tmp: name: tmp // { "${name}" = file "keys/${type}/${name}.pub"; }) { }
+      "${type}" =
+        builtins.foldl'
+        (tmp: name: tmp // {"${name}" = file "keys/${type}/${name}.pub";}) {}
         keys;
     };
-  in getKeyFiles "pgp" [ "DFC1660846EEA97C059F18534EF515441E635D36" ]
-  // getKeyFiles "ssh" [ "qaristote@latitude-7490" ];
+  in
+    getKeyFiles "pgp" ["DFC1660846EEA97C059F18534EF515441E635D36"]
+    // getKeyFiles "ssh" ["qaristote@latitude-7490"];
   name = {
     first = "Quentin";
     last = "Aristote";
diff --git a/default.nix b/default.nix
index 325cc58..11fd374 100644
--- a/default.nix
+++ b/default.nix
@@ -1,21 +1,26 @@
-{ markup, pkgs, ... }:
-
-let
+{
+  markup,
+  pkgs,
+  ...
+}: let
   files = ./files;
-  commonArgs = markup // {
-    inherit files make pkgs;
-    inherit (pkgs) lib;
-  };
-  make = path: overrides:
-    let f = import path;
-    in f ((builtins.intersectAttrs (builtins.functionArgs f) commonArgs)
+  commonArgs =
+    markup
+    // {
+      inherit files make pkgs;
+      inherit (pkgs) lib;
+    };
+  make = path: overrides: let
+    f = import path;
+  in
+    f ((builtins.intersectAttrs (builtins.functionArgs f) commonArgs)
       // overrides);
 in {
   inherit files;
-  basics = make ./basics { };
-  publications = make ./publications { };
-  experience = make ./experience { };
-  languages = make ./languages { };
-  education = make ./education { };
-  software = make ./software { };
+  basics = make ./basics {};
+  publications = make ./publications {};
+  experience = make ./experience {};
+  languages = make ./languages {};
+  education = make ./education {};
+  software = make ./software {};
 }
diff --git a/education/2016-09_llg.nix b/education/2016-09_llg.nix
index 3ec5e41..195f927 100644
--- a/education/2016-09_llg.nix
+++ b/education/2016-09_llg.nix
@@ -1,6 +1,4 @@
-{ href, ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2016;
diff --git a/education/2018-09_ens/2018-09_l3.nix b/education/2018-09_ens/2018-09_l3.nix
index d02c9e3..aba9e82 100644
--- a/education/2018-09_ens/2018-09_l3.nix
+++ b/education/2018-09_ens/2018-09_l3.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2018;
@@ -39,6 +37,5 @@
       "Information Theory"
     ];
   };
-  description =
-    "Graduated with highest honors in Computer Science (17.80/20), with honors in Mathematics (14.74/20).";
+  description = "Graduated with highest honors in Computer Science (17.80/20), with honors in Mathematics (14.74/20).";
 }
diff --git a/education/2018-09_ens/2019-09_m1.nix b/education/2018-09_ens/2019-09_m1.nix
index 40ca4d1..9c85316 100644
--- a/education/2018-09_ens/2019-09_m1.nix
+++ b/education/2018-09_ens/2019-09_m1.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2019;
diff --git a/education/2018-09_ens/2021-09_m2.nix b/education/2018-09_ens/2021-09_m2.nix
index 02ebc0b..a60e3e4 100644
--- a/education/2018-09_ens/2021-09_m2.nix
+++ b/education/2018-09_ens/2021-09_m2.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2021;
@@ -39,6 +37,5 @@
       "Probabilistic Programming"
     ];
   };
-  description =
-    "Graduated with highest honors (18.43/20), second of a highly-selective class of 70 students.";
+  description = "Graduated with highest honors (18.43/20), second of a highly-selective class of 70 students.";
 }
diff --git a/education/2018-09_ens/default.nix b/education/2018-09_ens/default.nix
index 4adeee8..426b8e7 100644
--- a/education/2018-09_ens/default.nix
+++ b/education/2018-09_ens/default.nix
@@ -1,6 +1,4 @@
-{ make, ... }:
-
-{
+{make, ...}: {
   date = {
     start = {
       year = 2018;
@@ -19,11 +17,10 @@
     location = "Paris, France";
   };
   studyType = "Master's degree in Theoretical Computer Science";
-  years = builtins.map (path: make path { }) [
+  years = builtins.map (path: make path {}) [
     ./2018-09_l3.nix
     ./2019-09_m1.nix
     ./2021-09_m2.nix
   ];
-  description =
-    "Took two gap years: one to follow additional postgraduate courses in Mathematics; one to do additional internships.";
+  description = "Took two gap years: one to follow additional postgraduate courses in Mathematics; one to do additional internships.";
 }
diff --git a/education/default.nix b/education/default.nix
index ffe5dd9..f8489d2 100644
--- a/education/default.nix
+++ b/education/default.nix
@@ -1,3 +1,2 @@
-{ make, ... }:
-
-builtins.map (path: make path { }) [ ./2016-09_llg.nix ./2018-09_ens ]
+{make, ...}:
+builtins.map (path: make path {}) [./2016-09_llg.nix ./2018-09_ens]
diff --git a/experience/2019-06_lis.nix b/experience/2019-06_lis.nix
index 32d8ddd..6b2612f 100644
--- a/experience/2019-06_lis.nix
+++ b/experience/2019-06_lis.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2019;
@@ -19,10 +17,12 @@
     url = "https://www.lis-lab.fr/en/home/";
     location = "Luminy, France";
   };
-  supervisors = [{
-    name = "Giuseppe di Molfetta";
-    url = "https://www.giuseppe-dimolfetta.com";
-  }];
+  supervisors = [
+    {
+      name = "Giuseppe di Molfetta";
+      url = "https://www.giuseppe-dimolfetta.com";
+    }
+  ];
   assets = [
     {
       name = "internship report";
@@ -35,6 +35,5 @@
       type = "Publications";
     }
   ];
-  description =
-    "Developed a quantum walker model whose density changes its own environment.";
+  description = "Developed a quantum walker model whose density changes its own environment.";
 }
diff --git a/experience/2020-03_nii.nix b/experience/2020-03_nii.nix
index e86fbee..68357fa 100644
--- a/experience/2020-03_nii.nix
+++ b/experience/2020-03_nii.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2020;
@@ -29,11 +27,12 @@
       url = "https://group-mmm.org/~dubut/";
     }
   ];
-  assets = [{
-    name = "internship report";
-    id = "aristoteFibrationalFrameworkNested2020";
-    type = "Publications";
-  }];
-  description =
-    "Generalized a greatest-fixed-points- and safety-games-based fibrational framework for bisimulations to nested fixed points and parity games.";
+  assets = [
+    {
+      name = "internship report";
+      id = "aristoteFibrationalFrameworkNested2020";
+      type = "Publications";
+    }
+  ];
+  description = "Generalized a greatest-fixed-points- and safety-games-based fibrational framework for bisimulations to nested fixed points and parity games.";
 }
diff --git a/experience/2022-03_irif.nix b/experience/2022-03_irif.nix
index 3094556..531c0d8 100644
--- a/experience/2022-03_irif.nix
+++ b/experience/2022-03_irif.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2022;
@@ -19,15 +17,18 @@
     url = "https://www.irif.fr/en/index";
     location = "Paris, France";
   };
-  supervisors = [{
-    name = "Daniela Petrişan";
-    url = "https:/www.irif.fr/~petrisan/";
-  }];
-  assets = [{
-    name = "internship report";
-    id = "aristoteApplicationsCategoricalFramework2022";
-    type = "Publications";
-  }];
-  description =
-    "Generalized a categorical framework for the minimization and active learning of transition systems and instanciated it to develop new such algorithms.";
+  supervisors = [
+    {
+      name = "Daniela Petrişan";
+      url = "https:/www.irif.fr/~petrisan/";
+    }
+  ];
+  assets = [
+    {
+      name = "internship report";
+      id = "aristoteApplicationsCategoricalFramework2022";
+      type = "Publications";
+    }
+  ];
+  description = "Generalized a categorical framework for the minimization and active learning of transition systems and instanciated it to develop new such algorithms.";
 }
diff --git a/experience/2022-09_tweag.nix b/experience/2022-09_tweag.nix
index 9b2732e..0836be3 100644
--- a/experience/2022-09_tweag.nix
+++ b/experience/2022-09_tweag.nix
@@ -1,6 +1,4 @@
-{ href, code, ... }:
-
-{
+{href, ...}: {
   date = {
     start = {
       year = 2022;
@@ -19,10 +17,12 @@
     url = "https://www.tweag.io/";
     location = "Paris, France";
   };
-  supervisors = [{
-    name = "Tweag's HAS group";
-    url = "https://www.tweag.io/group/high-assurance-software/";
-  }];
+  supervisors = [
+    {
+      name = "Tweag's HAS group";
+      url = "https://www.tweag.io/group/high-assurance-software/";
+    }
+  ];
   assets = [
     {
       name = "blog post";
@@ -36,6 +36,6 @@
     }
   ];
   description = "Sped-up ${
-      href "https://github.com/tweag/pirouette" "Pirouette"
-    } (a symbolic evaluator using incorrectness logic) by optimizing its interactions with SMT solvers.";
+    href "https://github.com/tweag/pirouette" "Pirouette"
+  } (a symbolic evaluator using incorrectness logic) by optimizing its interactions with SMT solvers.";
 }
diff --git a/experience/2023-03_irif.nix b/experience/2023-03_irif.nix
index 0a92d17..9abaa11 100644
--- a/experience/2023-03_irif.nix
+++ b/experience/2023-03_irif.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2023;
@@ -19,15 +17,18 @@
     url = "https://www.irif.fr/en/index";
     location = "Paris, France";
   };
-  supervisors = [{
-    name = "Daniela Petrişan";
-    url = "https:/www.irif.fr/~petrisan/";
-  }];
-  assets = [{
-    type = "Publications";
-    id = "aristoteFunctorialApproachMinimizing2023";
-    name = "paper";
-  }];
-  description =
-    "Follow-up to my M2's internship: wrote a paper and further explored some open questions as a preparation for my PhD.";
+  supervisors = [
+    {
+      name = "Daniela Petrişan";
+      url = "https:/www.irif.fr/~petrisan/";
+    }
+  ];
+  assets = [
+    {
+      type = "Publications";
+      id = "aristoteFunctorialApproachMinimizing2023";
+      name = "paper";
+    }
+  ];
+  description = "Follow-up to my M2's internship: wrote a paper and further explored some open questions as a preparation for my PhD.";
 }
diff --git a/experience/2023-09_irif.nix b/experience/2023-09_irif.nix
index c9a6235..0ba0040 100644
--- a/experience/2023-09_irif.nix
+++ b/experience/2023-09_irif.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{...}: {
   date = {
     start = {
       year = 2023;
@@ -19,10 +17,11 @@
     url = "https://www.irif.fr/en/index";
     location = "Paris, France";
   };
-  supervisors = [{
-    name = "Daniela Petrişan";
-    url = "https:/www.irif.fr/~petrisan/";
-  }];
-  description =
-    "Ongoing. Studying compositionality of monads and its application to effectful programming, in particular within automata theory.";
+  supervisors = [
+    {
+      name = "Daniela Petrişan";
+      url = "https:/www.irif.fr/~petrisan/";
+    }
+  ];
+  description = "Ongoing. Studying compositionality of monads and its application to effectful programming, in particular within automata theory.";
 }
diff --git a/experience/default.nix b/experience/default.nix
index 9f2cfae..11f3e9c 100644
--- a/experience/default.nix
+++ b/experience/default.nix
@@ -1,6 +1,5 @@
-{ make, ... }:
-
-builtins.map (path: make path { }) [
+{make, ...}:
+builtins.map (path: make path {}) [
   ./2019-06_lis.nix
   ./2020-03_nii.nix
   ./2022-03_irif.nix
diff --git a/languages/default.nix b/languages/default.nix
index 7813f50..c874b17 100644
--- a/languages/default.nix
+++ b/languages/default.nix
@@ -1,3 +1,2 @@
-{ make, ... }:
-
-builtins.map (path: make path { }) [ ./french.nix ./english.nix ./japanese.nix ]
+{make, ...}:
+builtins.map (path: make path {}) [./french.nix ./english.nix ./japanese.nix]
diff --git a/languages/english.nix b/languages/english.nix
index 6bc7a1e..08a925f 100644
--- a/languages/english.nix
+++ b/languages/english.nix
@@ -1,10 +1,8 @@
-{ ... }:
-
-{
+{...}: {
   name = "English";
   proficiency = "fluent";
   icon = {
-    codepoints = [ "1F1EC" "1F1E7" ];
+    codepoints = ["1F1EC" "1F1E7"];
     shortcode = "flag-united-kingdom";
   };
 }
diff --git a/languages/french.nix b/languages/french.nix
index 0dd9541..2091241 100644
--- a/languages/french.nix
+++ b/languages/french.nix
@@ -1,10 +1,8 @@
-{ ... }:
-
-{
+{...}: {
   name = "French";
   proficiency = "native";
   icon = {
-    codepoints = [ "1F1EB" "1F1F7" ];
+    codepoints = ["1F1EB" "1F1F7"];
     shortcode = "flag-france";
   };
 }
diff --git a/languages/japanese.nix b/languages/japanese.nix
index ce9065b..53f770f 100644
--- a/languages/japanese.nix
+++ b/languages/japanese.nix
@@ -1,10 +1,8 @@
-{ ... }:
-
-{
+{...}: {
   name = "Japanese";
   proficiency = "intermediate";
   icon = {
-    codepoints = [ "1F1EF" "1F1F5" ];
+    codepoints = ["1F1EF" "1F1F5"];
     shortcode = "flag-japan";
   };
 }
diff --git a/publications/default.nix b/publications/default.nix
index 2c85dff..4c7189f 100644
--- a/publications/default.nix
+++ b/publications/default.nix
@@ -1,29 +1,30 @@
-{ pkgs, lib, ... }:
-
-let
+{
+  pkgs,
+  lib,
+  ...
+}: let
   csl = lib.importJSON ./publications.json;
-  export = id: publication: format:
-    let
-      publicationJSON =
-        builtins.toFile "${id}.json" (builtins.toJSON [ publication ]);
-      publicationOut = pkgs.runCommand "${id}.${format}" { } ''
-        "${pkgs.pandoc}/bin/pandoc" "${publicationJSON}" --from csljson --to "${format}" --output "$out"
-      '';
-    in builtins.readFile publicationOut;
-  tryInherit = inheritFrom: attrs:
-    with lib;
-    foldl' (tmp: next:
-      tmp ++ optional (hasAttr next inheritFrom) (getAttr next inheritFrom)) [ ]
-    attrs;
-in builtins.map (publication:
-  with publication;
-  let exportThisTo = export id publication;
-  in publication // {
-    year = with builtins; toString (head (head issued.date-parts));
-    url = URL;
-    cite = {
-      bibtex = exportThisTo "bibtex";
-      biblatex = exportThisTo "biblatex";
-      csljson = exportThisTo "csljson";
-    };
-  }) csl
+  export = id: publication: format: let
+    publicationJSON =
+      builtins.toFile "${id}.json" (builtins.toJSON [publication]);
+    publicationOut = pkgs.runCommand "${id}.${format}" {} ''
+      "${pkgs.pandoc}/bin/pandoc" "${publicationJSON}" --from csljson --to "${format}" --output "$out"
+    '';
+  in
+    builtins.readFile publicationOut;
+in
+  builtins.map (publication:
+    with publication; let
+      exportThisTo = export id publication;
+    in
+      publication
+      // {
+        year = with builtins; toString (head (head issued.date-parts));
+        url = URL;
+        cite = {
+          bibtex = exportThisTo "bibtex";
+          biblatex = exportThisTo "biblatex";
+          csljson = exportThisTo "csljson";
+        };
+      })
+  csl
diff --git a/software/default.nix b/software/default.nix
index b08f3ec..6555657 100644
--- a/software/default.nix
+++ b/software/default.nix
@@ -1,4 +1,2 @@
-{ lib, ... }:
-
+{lib, ...}:
 lib.importJSON ./software.json
-