diff --git a/flake.lock b/flake.lock index f07bd3b..357b474 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,19 @@ "nodes": { "devshell": { "inputs": { + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1701787589, - "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", + "lastModified": 1705332421, + "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", "owner": "numtide", "repo": "devshell", - "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", + "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", "type": "github" }, "original": { @@ -32,11 +34,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702261362, - "narHash": "sha256-HfqACilfmnXli3G+t6lxqniL/Z6OwRBplR/CRU+d9oM=", + "lastModified": 1705423993, + "narHash": "sha256-kZtmuGdBzKT6vFbzVZqe9vm7ckkowSQz1Ln1ItvU3+A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "61c35019e3080f199aae18b978c06ffdc4153e32", + "rev": "0272f04189d187055b300c77178cce855382cc55", "type": "github" }, "original": { @@ -47,14 +49,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -65,11 +67,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -81,16 +83,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701805708, - "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -117,21 +119,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 93a9602..d684c7d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,10 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; devshell = { url = "github:numtide/devshell"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; }; emacs-overlay = { url = "github:nix-community/emacs-overlay"; @@ -26,7 +29,8 @@ }; full-texlive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-full; inherit ugent2016; }; build-diffed = pkgs.writeShellScriptBin "build-diffed" '' - PATH=$PATH:${pkgs.python3.withPackages (ps: [ ps.pygments ]).bin} + export OSFONTDIR=./fonts/ + PATH=$PATH:${pkgs.python3.withPackages (ps: [ ps.pygments ])}/bin set -E atexit() { git worktree remove -f .sent @@ -107,6 +111,12 @@ pkgs.nixpkgs-fmt (pkgs.python3.withPackages (ps: [ ps.pygments ])) ]; + env = [ + { + name = "OSFONTDIR"; + value = "./fonts"; + } + ]; commands = [ { name = "clean"; diff --git a/fonts/UGentPannoText.ttf b/fonts/UGentPannoText.ttf new file mode 100644 index 0000000..9ffe8a6 Binary files /dev/null and b/fonts/UGentPannoText.ttf differ diff --git a/fonts/UGentPannoTextMedium.ttf b/fonts/UGentPannoTextMedium.ttf new file mode 100644 index 0000000..7ed6cbf Binary files /dev/null and b/fonts/UGentPannoTextMedium.ttf differ diff --git a/fonts/UGentPannoTextSemiBold.ttf b/fonts/UGentPannoTextSemiBold.ttf new file mode 100644 index 0000000..23de5a7 Binary files /dev/null and b/fonts/UGentPannoTextSemiBold.ttf differ diff --git a/fonts/UGentPannoTextSemiLight.ttf b/fonts/UGentPannoTextSemiLight.ttf new file mode 100644 index 0000000..b6817b2 Binary files /dev/null and b/fonts/UGentPannoTextSemiLight.ttf differ