fix(droid): get build to work again

2024-11-23 04:53:02 -05:00 · 2024-11-23 04:53:02 -05:00 · fd1ae4fa32
commit fd1ae4fa32
parent 097df2b8be
8 changed files with 174 additions and 132 deletions
--- a/nixosModules/base/locale/default.nix
+++ b/nixosModules/base/locale/default.nix
@ -1,45 +1,55 @@
-{pkgs, ...}: {
-  fonts = {
-    fontconfig = {
-      enable = true;
-      defaultFonts = {
-        emoji = ["Noto Color Emoji"];
-        monospace = ["JetBrainsMono Nerd Font"];
-        sansSerif = ["Noto Nerd Font"];
-        serif = ["Noto Nerd Font"];
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) attrValues mkIf;
+
+  cfg = config.roles.base;
+in
+  mkIf cfg.enable {
+    fonts = {
+      fontconfig = {
+        enable = true;
+        defaultFonts = {
+          emoji = ["Noto Color Emoji"];
+          monospace = ["JetBrainsMono Nerd Font"];
+          sansSerif = ["Noto Nerd Font"];
+          serif = ["Noto Nerd Font"];
+        };
      };
+
+      packages =
+        [
+          (pkgs.nerdfonts.override {
+            fonts = [
+              "JetBrainsMono"
+              "Go-Mono"
+              "Iosevka"
+              "NerdFontsSymbolsOnly"
+              "SpaceMono"
+              "Ubuntu"
+              "Noto"
+            ];
+          })
+        ]
+        ++ (attrValues {
+          inherit
+            (pkgs)
+            noto-fonts
+            noto-fonts-cjk-sans
+            noto-fonts-emoji
+            liberation_ttf
+            font-awesome
+            meslo-lgs-nf
+            jetbrains-mono
+            ubuntu_font_family
+            ;
+        });
    };

-    packages =
-      [
-        (pkgs.nerdfonts.override {
-          fonts = [
-            "JetBrainsMono"
-            "Go-Mono"
-            "Iosevka"
-            "NerdFontsSymbolsOnly"
-            "SpaceMono"
-            "Ubuntu"
-            "Noto"
-          ];
-        })
-      ]
-      ++ (builtins.attrValues {
-        inherit
-          (pkgs)
-          noto-fonts
-          noto-fonts-cjk-sans
-          noto-fonts-emoji
-          liberation_ttf
-          font-awesome
-          meslo-lgs-nf
-          jetbrains-mono
-          ubuntu_font_family
-          ;
-      });
-  };
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_CA.UTF-8";
-  console.useXkbConfig = true;
-}
+    # Select internationalisation properties.
+    i18n.defaultLocale = "en_CA.UTF-8";
+    console.useXkbConfig = true;
+  }