From 68b83624de48bc6d00369f9c8141b5607b5ac93c Mon Sep 17 00:00:00 2001 From: aristote Date: Sun, 21 Dec 2025 17:26:16 +0100 Subject: languages: add german --- src/languages/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/languages') diff --git a/src/languages/default.nix b/src/languages/default.nix index b00efc6..16d2f26 100644 --- a/src/languages/default.nix +++ b/src/languages/default.nix @@ -5,7 +5,13 @@ ... }: let - languages = data.languages; + languages = data.languages ++ [ + { + name = "German"; + proficiency = "basic"; + icon.shortcode = "flag-germany"; + } + ]; sortByProficiency = lib.sort ( lang1: lang2: let -- cgit v1.3.1 From f653caa3e9bcc0ff5af450dfdf231d361347adbf Mon Sep 17 00:00:00 2001 From: aristote Date: Mon, 29 Dec 2025 20:20:14 +0100 Subject: languages: multicol --- lib/latex.nix | 7 ++++++- src/languages/default.nix | 14 +++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/languages') diff --git a/lib/latex.nix b/lib/latex.nix index e3d0597..ec83059 100644 --- a/lib/latex.nix +++ b/lib/latex.nix @@ -47,9 +47,14 @@ let ${lines content} \end{${name}} ''; + environmentWithOpts = name: args: content: '' + \begin{${name}}{${lib.concatStringsSep "}{" args}} + ${lines content} + \end{${name}} + ''; latex = { - inherit macro environment; + inherit macro environment environmentWithOpts; comment = content: "% ${content}"; document = environment "document"; diff --git a/src/languages/default.nix b/src/languages/default.nix index 16d2f26..067ba83 100644 --- a/src/languages/default.nix +++ b/src/languages/default.nix @@ -5,13 +5,6 @@ ... }: let - languages = data.languages ++ [ - { - name = "German"; - proficiency = "basic"; - icon.shortcode = "flag-germany"; - } - ]; sortByProficiency = lib.sort ( lang1: lang2: let @@ -27,10 +20,13 @@ in 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 + ) ); } -- cgit v1.3.1 From f4c78d6dd3b05d4adeeb0cb7a0d6fd4a0bd07cdf Mon Sep 17 00:00:00 2001 From: aristote Date: Wed, 31 Dec 2025 12:23:03 +0100 Subject: sections: remove priority system --- src/bibliography/default.nix | 1 - src/default.nix | 2 +- src/education/default.nix | 1 - src/experience/default.nix | 1 - src/languages/default.nix | 1 - src/research/default.nix | 1 - src/sections.nix | 14 +++++++++++--- src/service/default.nix | 1 - 8 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/languages') diff --git a/src/bibliography/default.nix b/src/bibliography/default.nix index bf4bc27..b34ada4 100644 --- a/src/bibliography/default.nix +++ b/src/bibliography/default.nix @@ -12,7 +12,6 @@ let in { title = "Bibliography"; - priority = 30; extraHeader = '' \usepackage[style=ieee]{citation-style-language} \cslsetup{bib-item-sep = 8 pt plus 4 pt minus 2 pt} 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 96bf847..7cc3a39 100644 --- a/src/experience/default.nix +++ b/src/experience/default.nix @@ -9,7 +9,6 @@ let in { title = "Experience"; - priority = 15; content = with latex; for (sort.reverse.byFun (x: with x.date.start; day + 100 * month + 10000 * year) experience) ( diff --git a/src/languages/default.nix b/src/languages/default.nix index 067ba83..9f86c89 100644 --- a/src/languages/default.nix +++ b/src/languages/default.nix @@ -16,7 +16,6 @@ let in { title = "Languages"; - priority = 20; extraHeader = '' \usepackage{emoji} \setemojifont{NotoColorEmoji.ttf}[Path=./fonts/] diff --git a/src/research/default.nix b/src/research/default.nix index f8b1363..99c6f0d 100644 --- a/src/research/default.nix +++ b/src/research/default.nix @@ -3,6 +3,5 @@ }: { title = "Research output"; - priority = 1; content = builtins.readFile ./content.tex; } diff --git a/src/sections.nix b/src/sections.nix index fc749d7..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 { }); @@ -17,5 +17,13 @@ builtins.map makeSection [ ./research ./service ./languages - ./bibliography +] +++ [ + { + extraHeader = ""; + content = '' + \newpage + ''; + } + (makeSection ./bibliography) ] diff --git a/src/service/default.nix b/src/service/default.nix index 0b40956..6e183c9 100644 --- a/src/service/default.nix +++ b/src/service/default.nix @@ -9,7 +9,6 @@ let in { title = "Academic service"; - priority = 2; content = [ ( with service.reviews; -- cgit v1.3.1