From 10874028f3b1e503286ef1d856b363c90a82889d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 24 Jan 2020 10:08:15 +0100 Subject: [PATCH] chore: be diplomatic with scardanelli shas --- configs/default.nix | 4 +++- configs/packages/default.nix | 2 +- configs/packages/writing.nix | 13 ++++++++++--- packages/gfs-fonts.nix | 22 +++++++++++++++++----- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index b4d502c..ccb5e71 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -117,7 +117,9 @@ in text2pdf = super.callPackage {}; iolanguage = super.callPackage {}; nix-git = super.callPackage {}; - gfs-fonts = super.callPackage {}; + gfs-fonts = super.callPackage { + scardanelli = config.networking.hostName == "scardanelli"; + }; fzf-wrappers = super.callPackage {}; }) ]; diff --git a/configs/packages/default.nix b/configs/packages/default.nix index aafb2d3..9bdeb99 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -114,7 +114,7 @@ kmein.n kmein.odyssey kmein.wttr - kmein.slide + # kmein.slide kmein.tolino-screensaver memo nix-git diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index 8017e03..f880a31 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, config, ... }: let zoteroStyle = { name, sha256 }: { name = "${name}.csl"; @@ -7,6 +7,7 @@ let inherit sha256; }; }; + scardanelli = config.networking.hostName == "scardanelli"; in { environment.variables.CITATIONSTYLES = toString (pkgs.linkFarm "citation-styles" [ @@ -16,11 +17,17 @@ in }) (zoteroStyle { name = "din-1505-2"; - sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq"; + sha256 = + if scardanelli + then "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq" + else "150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi"; }) (zoteroStyle { name = "apa"; - sha256 = "0g8vhp7gnd315h5b60r3zqp49kaq3fkxqnz2v7j2a0zp6s3cisdk"; + sha256 = + if scardanelli + then "0g8vhp7gnd315h5b60r3zqp49kaq3fkxqnz2v7j2a0zp6s3cisdk" + else "1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8"; }) ]); diff --git a/packages/gfs-fonts.nix b/packages/gfs-fonts.nix index 0fbacc1..0ae991c 100644 --- a/packages/gfs-fonts.nix +++ b/packages/gfs-fonts.nix @@ -1,4 +1,4 @@ -{ fetchzip, symlinkJoin, lib }: +{ fetchzip, symlinkJoin, lib, scardanelli ? false }: let gfs-font = name: sha256: fetchzip { inherit name sha256; @@ -20,15 +20,27 @@ in symlinkJoin { GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl"; GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm"; GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c"; - GFS_Didot_Display = "0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7"; + GFS_Didot_Display = + if scardanelli + then "0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7" + else "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1"; GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2"; GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w"; GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9"; GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3"; GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d"; - GFS_Orpheus = "18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz"; - GFS_Orpheus_Classic = "1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps"; - GFS_Orpheus_Sans = "02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg"; + GFS_Orpheus = + if scardanelli + then "18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz" + else "1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax"; + GFS_Orpheus_Classic = + if scardanelli + then "1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps" + else "0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a"; + GFS_Orpheus_Sans = + if scardanelli + then "02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg" + else "1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb"; GFS_Philostratos = "0zh3d0cn6b2fjbwnvmg379z20zh7w626w2bnj19xcazjvqkwhzx1"; GFS_Porson = "0r3snwgxkdx7h34sg3s0hr8fac3rnpllq62bk44m266hj6a80a5k"; GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";