diff options
| -rw-r--r-- | flake.lock | 125 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | options.nix | 4 | ||||
| -rw-r--r-- | system/default.nix | 9 |
4 files changed, 137 insertions, 4 deletions
@@ -1,5 +1,33 @@ { "nodes": { + "apple-fonts": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "ny": "ny", + "sf-arabic": "sf-arabic", + "sf-armenian": "sf-armenian", + "sf-compact": "sf-compact", + "sf-georgian": "sf-georgian", + "sf-hebrew": "sf-hebrew", + "sf-mono": "sf-mono", + "sf-pro": "sf-pro" + }, + "locked": { + "lastModified": 1748299691, + "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=", + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00", + "type": "github" + }, + "original": { + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -475,6 +503,18 @@ "type": "github" } }, + "ny": { + "flake": false, + "locked": { + "narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -500,6 +540,7 @@ }, "root": { "inputs": { + "apple-fonts": "apple-fonts", "astal": "astal", "home-manager": "home-manager", "hy3": "hy3", @@ -511,6 +552,90 @@ "unofficial-homestuck-collection": "unofficial-homestuck-collection" } }, + "sf-arabic": { + "flake": false, + "locked": { + "narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + } + }, + "sf-armenian": { + "flake": false, + "locked": { + "narHash": "sha256-rRoDkbNMYkzOHZmQm96Zv80TZvRlAeoxkv4pMHP5nUg=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" + } + }, + "sf-compact": { + "flake": false, + "locked": { + "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + } + }, + "sf-georgian": { + "flake": false, + "locked": { + "narHash": "sha256-IevVNOC28IiR45YfI3PsZzXLMRxuB5u7UiE53Zn6tRU=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" + } + }, + "sf-hebrew": { + "flake": false, + "locked": { + "narHash": "sha256-Dw84kYwMpCtKKKqm8cZcQ9TZ7GayU5MO7W0LJw0Rcwk=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" + } + }, + "sf-mono": { + "flake": false, + "locked": { + "narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + } + }, + "sf-pro": { + "flake": false, + "locked": { + "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -28,6 +28,9 @@ # unofficial-homestuck-collection unofficial-homestuck-collection.url = "git+https://g.freya.cat/freya/unofficial-homestuck-collection-nix"; unofficial-homestuck-collection.inputs.nixpkgs.follows = "nixpkgs"; + # apple-fonts + apple-fonts.url= "github:Lyndeno/apple-fonts.nix"; + apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = {nixpkgs, ...} @ inputs: let diff --git a/options.nix b/options.nix index b11e14b..0906758 100644 --- a/options.nix +++ b/options.nix @@ -10,8 +10,8 @@ font = { size = 14; monospace = "monospace"; - regular = "JetBrains Mono"; - header = "JetBrains Mono ExtraBold"; + regular = "SF Pro Text"; + header = "SF Pro Display Bold"; icon = "Font Awesome 6 Pro"; }; diff --git a/system/default.nix b/system/default.nix index df60ef5..6cf0e9d 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, ... @@ -145,7 +146,7 @@ ]; # fonts - fonts.packages = with pkgs; [ + fonts.packages = (with pkgs; [ corefonts dejavu_fonts fira-code @@ -158,7 +159,11 @@ noto-fonts-emoji twemoji-color-font vistafonts - ]; + ]) ++ (with inputs.apple-fonts.packages.${pkgs.system}; [ + sf-pro + sf-mono + sf-compact + ]); fonts.fontconfig = { enable = true; |