From 57100dcead4cf5f511e0cc31780ad156bfbccb1e Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sat, 23 Nov 2024 23:56:07 +0100 Subject: [PATCH] treewide: replace apple-color-emoji with noto-color-emoji --- pkgs/apple-emoji-color.nix | 16 ---------------- pkgs/default.nix | 1 - system/programs/fonts.nix | 10 +++------- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 pkgs/apple-emoji-color.nix diff --git a/pkgs/apple-emoji-color.nix b/pkgs/apple-emoji-color.nix deleted file mode 100644 index f7fa735..0000000 --- a/pkgs/apple-emoji-color.nix +++ /dev/null @@ -1,16 +0,0 @@ -{pkgs, ...}: let - version = "v17.4"; -in - pkgs.stdenv.mkDerivation { - inherit version; - name = "apple-color-emoji"; - src = pkgs.fetchurl { - url = "https://github.com/samuelngs/apple-emoji-linux/releases/download/${version}/AppleColorEmoji.ttf"; - sha256 = "sha256-SG3JQLybhY/fMX+XqmB/BKhQSBB0N1VRqa+H6laVUPE="; - }; - phases = ["installPhase"]; - installPhase = '' - mkdir -p $out/share/fonts/truetype/apple-color-emoji - cp $src $out/share/fonts/truetype/apple-color-emoji/AppleColorEmoji.ttf - ''; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index 6ad84c8..0cf4299 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,5 +12,4 @@ }) .callPackage ./bolt-launcher.nix {}; - apple-emoji-color = pkgs.callPackage ./apple-emoji-color.nix {}; } diff --git a/system/programs/fonts.nix b/system/programs/fonts.nix index 8ce3ebb..5475d7a 100644 --- a/system/programs/fonts.nix +++ b/system/programs/fonts.nix @@ -4,19 +4,15 @@ ... }: { fonts = { - fontDir = { - enable = true; - decompressFonts = true; - }; + enableDefaultPackages = false; packages = [ pkgs.noto-fonts pkgs.noto-fonts-cjk-sans pkgs.noto-fonts-extra pkgs.intel-one-mono - inputs.self.packages.${pkgs.system}.apple-emoji-color + pkgs.noto-fonts-color-emoji (pkgs.nerdfonts.override {fonts = ["IntelOneMono" "NerdFontsSymbolsOnly"];}) ]; - enableDefaultPackages = false; fontconfig = { enable = true; @@ -24,7 +20,7 @@ serif = ["Noto Serif"]; sansSerif = ["Inter Medium"]; monospace = ["IntoneMono NF"]; - emoji = ["Apple Color Emoji"]; + emoji = ["Noto Color Emoji"]; }; }; };