Add cloud-utils and Apple Fonts

This commit is contained in:
Bart van der Braak 2025-02-10 22:45:49 +01:00
parent 6199951145
commit 28e93cba13
4 changed files with 72 additions and 4 deletions

View file

@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1738804720,
"narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=",
"lastModified": 1739161281,
"narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1",
"rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801",
"type": "github"
},
"original": {

View file

@ -18,13 +18,13 @@
./packages.nix
./services.nix
./modules/bootloader.nix
./modules/apple-fonts.nix
];
};
qemu = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hardware/qemu.nix
./modules/kde.nix
./modules/configuration.nix
./modules/display-manager.nix

View file

@ -0,0 +1,67 @@
{ pkgs, ... }:
let
# Define Apple font sources
fontSources = {
sf-pro = {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg";
hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88=";
};
sf-compact = {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg";
hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk=";
};
sf-mono = {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg";
hash = "sha256-bUoLeOOqzQb5E/ZCzq0cfbSvNO1IhW1xcaLgtV2aeUU=";
};
sf-arabic = {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg";
hash = "sha256-J2DGLVArdwEsSVF8LqOS7C1MZH/gYJhckn30jRBRl7k=";
};
ny = {
url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg";
hash = "sha256-HC7ttFJswPMm+Lfql49aQzdWR2osjFYHJTdgjtuI+PQ=";
};
};
# Function to create Apple font packages
makeAppleFont = name: pkgName: source:
pkgs.stdenv.mkDerivation {
inherit name;
src = pkgs.fetchurl {
inherit (source) url hash;
};
version = "0.3.0";
unpackPhase = ''
undmg $src
7z x '${pkgName}'
7z x 'Payload~'
'';
buildInputs = [
pkgs.undmg
pkgs.p7zip
];
setSourceRoot = "sourceRoot=`pwd`";
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/fonts/truetype
find -name \*.otf -exec mv {} $out/share/fonts/opentype/ \;
find -name \*.ttf -exec mv {} $out/share/fonts/truetype/ \;
'';
};
in {
environment.systemPackages = [
(makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro)
(makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact)
(makeAppleFont "sf-mono" "SF Mono Fonts.pkg" fontSources.sf-mono)
(makeAppleFont "sf-arabic" "SF Arabic Fonts.pkg" fontSources.sf-arabic)
(makeAppleFont "ny" "NY Fonts.pkg" fontSources.ny)
];
}

View file

@ -32,6 +32,7 @@
inkscape
gimp
nixfmt-rfc-style
cloud-utils
];
};