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)

configs/cloud.nix

@@ -47,11 +47,12 @@ in {
       enable = true;
       startInBackground = true;
     };
-  };
+    systemd.user.services.nextcloud-client = {
-
+      Unit = {
-  systemd.user.services.nextcloud-client = {
+        Wants = ["gnome-keyring.service"];
-    wants = ["gnome-keyring.service"];
+        After = ["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
+        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
-        yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
+        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/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/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";

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651007218,
+        "lastModified": 1651519540,
-        "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=",
+        "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d14adb99f3fb562ec74ad18c032efc154b438034",
+        "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651093906,
+        "lastModified": 1651848520,
-        "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=",
+        "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49",
+        "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1651365995,
+        "lastModified": 1651970800,
-        "narHash": "sha256-fHKY8+nfPuVMDjSih8j/xoaTLpngW6b4QxJbICBLQmc=",
+        "narHash": "sha256-6mDxz6fD7fgBC1TY5OMcU/Qubf+OlAyeVR8YCoNKD2A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "05ced71757730406ca3eb3e58503f05334a6057d",
+        "rev": "d707e510df39cdd8fe1d3e244371a3a9f23051d2",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1647444524,
+        "lastModified": 1651665107,
-        "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
+        "narHash": "sha256-/fKmwakb9E8ctILu5RNUrjzq7gls0tqn8Oup3Y1xmzY=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
+        "rev": "2bafba9621b83529b78fb2db34b351fd19411c0e",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1650040948,
+        "lastModified": 1651664500,
-        "narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=",
+        "narHash": "sha256-KYGx877YzpWQWk++YqnUQK4pu8JYJnSdMSUU9r2/xGU=",
         "ref": "master",
-        "rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a",
+        "rev": "376b92c877442ec3be476ea5f4c89f8a715426dd",
-        "revCount": 10516,
+        "revCount": 10527,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

packages/scripts/default.nix

@@ -307,16 +307,11 @@ in
       packages = [pkgs.xdo];
     };
 
-    ipa =
+    ipa = wrapScript {
-      pkgs.writers.writeHaskellBin "ipa" {
+      script = ./ipa.py;
-        libraries = with pkgs; [haskellPackages.text haskellPackages.ipa];
+      name = "ipa";
-      } ''
+      packages = [pkgs.python3];
-        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)
-      '';
 
     default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
       ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'