revamp bibliography

4 files changed, 42 insertions, 24 deletions

diff --git a/src/experience/default.nix b/src/experience/default.nix
index a095d3d..cf4dc5f 100644
--- a/src/experience/default.nix
+++ b/src/experience/default.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  experience = data.experience;
+  experience = data.experience.jobs;
 in {
   title = "Experience";
   priority = 0;
@@ -26,6 +26,6 @@ in {
           + lib.optionalString (item ? assets) (" "
             + cite
             (lib.concatStringsSep ","
-              (for (lib.filter (asset: asset.type == "Publications") assets)
+              (for (lib.filter (asset: asset.type == "Writings") assets)
                 (lib.getAttr "id"))))));
 }
diff --git a/src/publications/default.nix b/src/publications/default.nix
deleted file mode 100644
index c292890..0000000
--- a/src/publications/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  latex,
-  data,
-  ...
-}: let
-  publications = data.publications.all;
-  publicationsBIB = builtins.toFile "publications.bib" (latex.lines
-    (builtins.map (entry: entry.cite.biblatex)
-      (latex.sort.reverse.byPath ["issued" "date-parts"] publications)));
-in {
-  title = "Publications";
-  priority = 30;
-  extraHeader = ''
-    \usepackage[sorting=ydnt]{biblatex}
-    \addbibresource{${publicationsBIB}}
-  '';
-  content = ''
-    \nocite{*}
-    \printbibliography[heading=none]
-  '';
-}
diff --git a/src/research/default.nix b/src/research/default.nix
new file mode 100644
index 0000000..aa53634
--- /dev/null
+++ b/src/research/default.nix
@@ -0,0 +1,39 @@
+{
+  latex,
+  data,
+  lib,
+  ...
+}: 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]
+  '';
+}
diff --git a/src/sections.nix b/src/sections.nix
index 2778beb..af01252 100644
--- a/src/sections.nix
+++ b/src/sections.nix
@@ -17,5 +17,5 @@ in
     ./experience
     ./education
     ./languages
-    ./publications
+    ./research
   ]