Merge branch 'pocococop'

9 files changed, 88 insertions, 51 deletions

diff --git a/src/bibliography/default.nix b/src/bibliography/default.nix
new file mode 100644
index 0000000..b34ada4
--- /dev/null
+++ b/src/bibliography/default.nix
@@ -0,0 +1,42 @@
+{
+  data,
+  ...
+}:
+let
+  addBibResource = name: ''
+    \begin{filecontents*}{${name}.json}
+    ${builtins.toJSON data.research."${name}"}
+    \end{filecontents*}
+    \addbibresource{${name}.json}
+  '';
+in
+{
+  title = "Bibliography";
+  extraHeader = ''
+    \usepackage[style=ieee]{citation-style-language}
+    \cslsetup{bib-item-sep = 8 pt plus 4 pt minus 2 pt}
+  ''
+  + addBibResource "conferences"
+  + addBibResource "journals"
+  + addBibResource "misc"
+  + addBibResource "reports";
+  content = ''
+    \nocite{*}
+
+    \textbf{Conference papers}
+
+    \printbibliography[heading=none,type=paper-conference]
+
+    \textbf{Journal papers}
+
+    \printbibliography[heading=none,type=article-journal]
+
+    \textbf{Not peer-reviewed}
+
+    \printbibliography[heading=none,nottype=article-journal,nottype=paper-conference,nottype=report]
+
+    \textbf{Reports}
+
+    \printbibliography[heading=none,type=report]
+  '';
+}
diff --git a/src/default.nix b/src/default.nix
index dbc9fca..cd5c9cf 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -6,7 +6,7 @@
 }:
 with latex;
 let
-  sections = sort.byKey "priority" (make ./sections.nix { });
+  sections = make ./sections.nix { };
 in
 with data.basics;
 lines [
diff --git a/src/education/default.nix b/src/education/default.nix
index 8d373f8..b2e6289 100644
--- a/src/education/default.nix
+++ b/src/education/default.nix
@@ -10,7 +10,6 @@ let
 in
 {
   title = "Education";
-  priority = 10;
   content =
     with latex;
     for (sortByStartDate education) (
diff --git a/src/experience/default.nix b/src/experience/default.nix
index cf025bb..288dd37 100644
--- a/src/experience/default.nix
+++ b/src/experience/default.nix
@@ -9,7 +9,6 @@ let
 in
 {
   title = "Experience";
-  priority = 0;
   content =
     with latex;
     for (sort.reverse.byFun (x: with x.date.start; day + 100 * month + 10000 * year) experience) (
@@ -20,7 +19,7 @@ in
         institution.location
         (
           if item ? supervisors then
-            "supervised by "
+            "with "
             + lib.concatStringsSep " \\& " (for supervisors (supervisor: with supervisor; href url name))
           else
             ""
diff --git a/src/languages/default.nix b/src/languages/default.nix
index b00efc6..9f86c89 100644
--- a/src/languages/default.nix
+++ b/src/languages/default.nix
@@ -5,7 +5,6 @@
   ...
 }:
 let
-  languages = data.languages;
   sortByProficiency = lib.sort (
     lang1: lang2:
     let
@@ -17,14 +16,16 @@ let
 in
 {
   title = "Languages";
-  priority = 20;
   extraHeader = ''
     \usepackage{emoji}
     \setemojifont{NotoColorEmoji.ttf}[Path=./fonts/]
+    \usepackage{multicol}
   '';
   content =
     with latex;
-    for (sortByProficiency languages) (
-      lang: with lang; moderncv.cvline "${name} \\emoji{${icon.shortcode}}" proficiency
+    environmentWithOpts "multicols" [ "2" ] (
+      for (sortByProficiency data.languages) (
+        lang: with lang; moderncv.cvline "${name} \\emoji{${icon.shortcode}}" proficiency
+      )
     );
 }
diff --git a/src/research/content.tex b/src/research/content.tex
new file mode 100644
index 0000000..52e77a2
--- /dev/null
+++ b/src/research/content.tex
@@ -0,0 +1,24 @@
+$4$ conference papers: CALCO 2025~\cite{aristoteActiveLearningUpwardClosed2025};
+CSL 2024~\cite{aristoteActiveLearningDeterministic2024}; LICS
+2025~\cite{aristoteMonotoneWeakDistributive2025}; STACS
+2025~\cite{aristoteLearningWeightedAutomata2025}.
+
+$1$ paper accepted to an upcoming conference (FoSSaCS 2026).
+
+\smallskip
+
+$>23$ talks given. $5$ invited talks: Oxford University, Université
+Aix-Marseille ($\times 2$), Université de Rouen, Université Savoie-Mont-Blanc
+
+\smallskip
+
+\textbf{Awards:}
+
+\smallskip
+
+\cventry{CSL 2024~\cite{aristoteActiveLearningDeterministic2024}}{Helena
+Rasiowa Award}{Best Student Paper}{}{}{}
+
+\cventry{CSL 2024~\cite{aristoteActiveLearningDeterministic2024}}{Selected
+Paper}{for publication in a special issue of the LMCS
+journal~\cite{aristoteActiveLearningDeterministic2025}}{}{}{}
diff --git a/src/research/default.nix b/src/research/default.nix
index db70f5a..99c6f0d 100644
--- a/src/research/default.nix
+++ b/src/research/default.nix
@@ -1,43 +1,7 @@
 {
-  data,
   ...
 }:
-let
-  addBibResource = name: ''
-    \begin{filecontents*}{${name}.json}
-    ${builtins.toJSON data.research."${name}"}
-    \end{filecontents*}
-    \addbibresource{${name}.json}
-  '';
-in
 {
-  title = "Research";
-  priority = 30;
-  extraHeader = ''
-    \usepackage[style=ieee]{citation-style-language}
-    \cslsetup{bib-item-sep = 8 pt plus 4 pt minus 2 pt}
-  ''
-  + addBibResource "conferences"
-  + addBibResource "journals"
-  + addBibResource "misc"
-  + addBibResource "reports";
-  content = ''
-    \nocite{*}
-
-    \textbf{Conference papers}
-
-    \printbibliography[heading=none,type=paper-conference]
-
-    \textbf{Journal papers}
-
-    \printbibliography[heading=none,type=article-journal]
-
-    \textbf{Not peer-reviewed}
-
-    \printbibliography[heading=none,nottype=article-journal,nottype=paper-conference,nottype=report]
-
-    \textbf{Reports}
-
-    \printbibliography[heading=none,type=report]
-  '';
+  title = "Research output";
+  content = builtins.readFile ./content.tex;
 }
diff --git a/src/sections.nix b/src/sections.nix
index 1c5fbd4..aa2c527 100644
--- a/src/sections.nix
+++ b/src/sections.nix
@@ -5,8 +5,8 @@
 }:
 let
   sectionTemplate = section: {
-    inherit (section) title priority;
-    extraHeader = if section ? extraHeader then section.extraHeader else "";
+    inherit (section) title;
+    extraHeader = section.extraHeader or "";
     content = latex.section section.title section.content;
   };
   makeSection = path: sectionTemplate (make path { });
@@ -14,7 +14,16 @@ in
 builtins.map makeSection [
   ./experience
   ./education
+  ./research
   ./service
   ./languages
-  ./research
+]
+++ [
+  {
+    extraHeader = "";
+    content = ''
+      \newpage
+    '';
+  }
+  (makeSection ./bibliography)
 ]
diff --git a/src/service/default.nix b/src/service/default.nix
index 7dd1ca8..6e183c9 100644
--- a/src/service/default.nix
+++ b/src/service/default.nix
@@ -9,7 +9,6 @@ let
 in
 {
   title = "Academic service";
-  priority = 15;
   content = [
     (
       with service.reviews;
@@ -18,7 +17,7 @@ in
           name: years: "${name} ${lib.concatMapStringsSep ", " builtins.toString years}"
         ) conferences.names;
       in
-      "I have reviewed ${builtins.toString conferences.number} conference papers (${conferenceList})."
+      "${builtins.toString conferences.number} conference papers reviews: ${conferenceList}. \\\\"
     )
     (
       with latex;