feat(fonts): add new SIL

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/d14adb99f3fb562ec74ad18c032efc154b438034' (2022-04-26)
  → 'github:nix-community/home-manager/d93d56ab8c1c6aa575854a79b9d2f69d491db7d0' (2022-05-02)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/feea25c58657fa81d16e0e51f80e1a02ef4cbd49' (2022-04-27)
  → 'github:NixOS/nixpkgs/5656d7f92aa8264eb06ba68ad94c87ac5b5312e8' (2022-05-06)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/05ced71757730406ca3eb3e58503f05334a6057d' (2022-05-01)
  → 'github:NixOS/nixpkgs/d707e510df39cdd8fe1d3e244371a3a9f23051d2' (2022-05-08)
• Updated input 'retiolum':
    'github:krebs/retiolum/de6d7dc9bd671e65f2ee3004b6807625e7553e84' (2022-03-16)
  → 'github:krebs/retiolum/2bafba9621b83529b78fb2db34b351fd19411c0e' (2022-05-04)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=master&rev=92d5eacd6d9e530c4d1ea0dec2652417b0fde78a' (2022-04-15)
  → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=376b92c877442ec3be476ea5f4c89f8a715426dd' (2022-05-04)

ci.nix

@@ -36,6 +36,7 @@
     "mail/gmail/amroplay"
     "mail/gmail/kieran.meinhardt"
     "mail/meinhaki"
+    "mail/dslalewa"
     "mail/posteo"
     "nextcloud-fysi/password"
     "nextcloud/password"

configs/cloud.nix

@@ -47,6 +47,12 @@ in {
       enable = true;
       startInBackground = true;
     };
+    systemd.user.services.nextcloud-client = {
+      Unit = {
+        Wants = ["gnome-keyring.service"];
+        After = ["gnome-keyring.service"];
+      };
+    };
   };
 
   environment.systemPackages = [

configs/default.nix

@@ -144,8 +144,8 @@ in {
         wcd = "source ${wcd}";
         im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
         where = "source ${where}";
-        yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
-        yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
+        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
       };
     }
     {i18n.defaultLocale = "en_DK.UTF-8";}

configs/fonts.nix

@@ -1,4 +1,6 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
+in {
   nixpkgs.config.joypixels.acceptLicense = true;
   fonts = {
     enableDefaultFonts = true;
@@ -7,14 +9,17 @@
       alegreya
       alegreya-sans
       amiri
+      nixpkgs-unstable.annapurna-sil
       cantarell-fonts
       charis-sil
       corefonts
       crimson
       eb-garamond
       etBook
+      nixpkgs-unstable.ezra-sil
       fira
       font-awesome-ttf
+      nixpkgs-unstable.galatia-sil
       gentium
       gfs-fonts
       gyre-fonts
@@ -26,7 +31,6 @@
       libre-bodoni
       lmodern
       merriweather
-      noto-fonts
       ocr-a
       roboto
       roboto-mono

configs/keyboard.nix

@@ -5,9 +5,12 @@
 }: let
   commaSep = builtins.concatStringsSep ",";
 in {
+  # man 7 xkeyboard-config
   services.xserver = {
-    layout = commaSep ["de" "gr"];
-    xkbVariant = commaSep ["T3" "polytonic"];
+    layout = commaSep ["de" "gr" "ru" "ara"];
+    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
+    # buckwalter: http://www.qamus.org/transliteration.htm
+    xkbVariant = commaSep ["T3" "polytonic" "phonetic" "buckwalter"];
     xkbOptions =
       commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
     libinput.enable = true;
@@ -17,4 +20,15 @@ in {
 
   # improve held key rate
   services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
+
+  systemd.user.services.gxkb = {
+    wantedBy = ["graphical-session.target"];
+    serviceConfig = {
+      SyslogIdentifier = "gxkb";
+      ExecStart = "${pkgs.gxkb}/bin/gxkb";
+      Restart = "always";
+      RestartSec = "15s";
+      StartLimitBurst = 0;
+    };
+  };
 }

configs/mpv.nix

@@ -21,6 +21,7 @@ in {
         ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
         ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
         screenshot-template = "%F-%wH%wM%wS-%#04n";
+        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
       };
       bindings = {
         "Alt+RIGHT" = "add video-rotate 90";

configs/neomutt.nix

@@ -47,6 +47,20 @@
     };
   };
 
+  accounts.work-admin = {
+    user = "dslalewa";
+    password = lib.strings.fileContents <secrets/mail/dslalewa>;
+    address = "admin.alew.vglsprwi@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
   accounts.work-fysi = rec {
     user = "kieran@fysi.tech";
     address = user;
@@ -131,6 +145,7 @@ in {
         application/pdf; ${pkgs.zathura}/bin/zathura %s ;
         application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
         application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
+        application/vnd.openxmlformats*; ${pkgs.libreoffice}/bin/soffice '%s';
       ''
     }:$mailcap_path
 

configs/newsboat.nix

@@ -5,7 +5,7 @@
 }: let
   ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
 
-  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata";
+  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
 
   newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
   linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";

configs/packages.nix

@@ -137,6 +137,7 @@ in {
     pdfpc # presenter console for pdf slides
     hc # print files as qr codes
     youtubeDL
+    yt-dlp
     espeak
     bc # calculator
     pari # gp -- better calculator

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648834319,
-        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
+        "lastModified": 1651519540,
+        "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
+        "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649490789,
-        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
+        "lastModified": 1651848520,
+        "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
+        "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1649541735,
-        "narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
+        "lastModified": 1651970800,
+        "narHash": "sha256-6mDxz6fD7fgBC1TY5OMcU/Qubf+OlAyeVR8YCoNKD2A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
+        "rev": "d707e510df39cdd8fe1d3e244371a3a9f23051d2",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1647444524,
-        "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
+        "lastModified": 1651665107,
+        "narHash": "sha256-/fKmwakb9E8ctILu5RNUrjzq7gls0tqn8Oup3Y1xmzY=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
+        "rev": "2bafba9621b83529b78fb2db34b351fd19411c0e",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1648400983,
-        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
+        "lastModified": 1650993582,
+        "narHash": "sha256-cKcdHzyy6Y4H9+KcnCgk/Tt1Zqd8lhfiXv4LClcETLc=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
+        "rev": "c1aaeb4339e9c41057d362667554835a0f49850f",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1649089964,
-        "narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
+        "lastModified": 1651664500,
+        "narHash": "sha256-KYGx877YzpWQWk++YqnUQK4pu8JYJnSdMSUU9r2/xGU=",
         "ref": "master",
-        "rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
-        "revCount": 10500,
+        "rev": "376b92c877442ec3be476ea5f4c89f8a715426dd",
+        "revCount": 10527,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

packages/scripts/default.nix

@@ -307,16 +307,11 @@ in
       packages = [pkgs.xdo];
     };
 
-    ipa =
-      pkgs.writers.writeHaskellBin "ipa" {
-        libraries = with pkgs; [haskellPackages.text haskellPackages.ipa];
-      } ''
-        import Data.Maybe (fromJust)
-        import Language.IPA
-        import qualified Data.Text as T
-        import qualified Data.Text.IO as T
-        main = T.interact (T.unwords . map (unIPA . fromJust . (xSampaToIpa =<<) . mkXSampa) . T.words)
-      '';
+    ipa = wrapScript {
+      script = ./ipa.py;
+      name = "ipa";
+      packages = [pkgs.python3];
+    };
 
     default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
       ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'

systems/makanek/monitoring/default.nix

@@ -220,7 +220,7 @@ in {
             "tarot.kmein.de"
             "cloud.xn--kiern-0qa.de"
             "grafana.kmein.r"
-            "names.kmein.r"
+            # "names.kmein.r"
             "rrm.r"
             "graph.r"
           ];

systems/makanek/names.nix

@@ -4,8 +4,8 @@
   ...
 }: let
   port = 5703;
-  geogen-src = "${<scripts>}/onomastics";
-  geogen = pkgs.callPackage geogen-src {};
+  onomap-src = "${<scripts>}/onomastics-ng";
+  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
 in {
   systemd.services.names = {
     wants = ["network-online.target"];
@@ -13,12 +13,11 @@ in {
     description = "Better clone of geogen.stoepel.net";
     serviceConfig = {
       DynamicUser = true;
+      ExecStart = "${onomap}/bin/onomap-web";
+      Restart = "on-failure";
+      RestartSec = "15s";
     };
-    script = ''
-      cd $(mktemp -d)
-      ln -s "${geogen-src}/wsgi.py" wsgi.py
-      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
-    '';
+    environment.PORT = toString port;
   };
 
   services.nginx = {

systems/zaatar/moodle-dl-meinhark.nix

@@ -69,6 +69,16 @@ in {
         108283 # Digital Classicist
         109211 # Altlitauisch
         109185 # Etymologie
+
+        # SS 2022
+        112606 # Avestisch
+        111761 # Griechische Wissenschaftsliteratur
+        111515 # H. Furens
+        110914 # Apostelgeschichte
+        112225 # Gr. Paläographie
+        113275 # ALEW
+        112783 # Akzent und Silbenstruktur
+        113493 # Papyrologie
       ];
       download_submissions = true;
       download_descriptions = true;

systems/zaatar/tuna.nix

@@ -74,8 +74,8 @@ in {
 
   systemd.tmpfiles.rules = let
     tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
-    tagStreams = tag: map (lib.getAttr "stream") (lib.filter ({tags ? [], ...}: lib.elem tag tags) streams);
-    makePlaylist = name: urls: pkgs.writeText "${name}.m3u" (lib.concatStringsSep "\n" urls);
+    tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+    makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
   in
     map (tag:
       tmpfilesConfig {
@@ -87,7 +87,7 @@ in {
         argument = makePlaylist tag (tagStreams tag);
       })
     tags
-    + [
+    ++ [
       (tmpfilesConfig {
         type = "L+";
         mode = "0644";