commit 0e2fd777096167aac7363da2f962374fde5ead76 · kitten.sh/system

+1 -1

flake.nix

···

       95
       95
        
             inputs.language-servers.overlays.default

     

       96
       96
        
             (self: super: {

     

       97
       97
        
               zen-browser = inputs.zen-browser.packages.${self.system}.beta;

     

       98
       98
       -
             })

     

       98
       98
       +
             } // (import ./lib/pkgs self))

     

       99
       99
        
           ];

     

       100
       100
        
         in {

     

       101
       101
        
           darwinConfigurations."sprite" = mkSystem {

+4 -1

lib/pkgs/default.nix

···

       1
       1
       -
       pkgs: { }

     

       1
       1
       +
       pkgs: {

     

       2
       2
       +
         sf-pro = import ./sf-pro.nix pkgs;

     

       3
       3
       +
         sf-pro-mono = import ./sf-pro-mono.nix pkgs;

     

       4
       4
       +
       }

+24

lib/pkgs/sf-pro-mono.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         unzip,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }: stdenv.mkDerivation rec {

     

       8
       8
       +
         pname = "SF-Pro-mono";

     

       9
       9
       +
         version = "v3.0.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "shaunsingh";

     

       13
       13
       +
           repo = "SFMono-Nerd-Font-Ligaturized";

     

       14
       14
       +
           rev = "main";

     

       15
       15
       +
           sha256 = "sha256-AYjKrVLISsJWXN6Cj74wXmbJtREkFDYOCRw1t2nVH2w=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [unzip];

     

       19
       19
       +
       

     

       20
       20
       +
         installPhase = ''

     

       21
       21
       +
           mkdir -p $out/share/fonts/opentype

     

       22
       22
       +
           cp *.otf $out/share/fonts/opentype/

     

       23
       23
       +
         '';

     

       24
       24
       +
       }

+26

lib/pkgs/sf-pro.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         unzip,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }: stdenv.mkDerivation rec {

     

       8
       8
       +
         pname = "SF-Pro";

     

       9
       9
       +
         version = "v3.0.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "sahibjotsaggu";

     

       13
       13
       +
           repo = "San-Francisco-Pro-Fonts";

     

       14
       14
       +
           rev = "master";

     

       15
       15
       +
           sha256 = "sha256-mAXExj8n8gFHq19HfGy4UOJYKVGPYgarGd/04kUIqX4=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [unzip];

     

       19
       19
       +
       

     

       20
       20
       +
         installPhase = ''

     

       21
       21
       +
           mkdir -p $out/share/fonts/opentype

     

       22
       22
       +
           mkdir -p $out/share/fonts/truetype

     

       23
       23
       +
           cp *.otf $out/share/fonts/opentype

     

       24
       24
       +
           cp *.ttf $out/share/fonts/truetype

     

       25
       25
       +
         '';

     

       26
       26
       +
       }

+7 -2

modules/desktop/fonts.nix

···

       15
       15
        
       

     

       16
       16
        
         config = mkIf cfg.fonts.enable {

     

       17
       17
        
           fonts = {

     

       18
       18
       -
             fontDir.enable = true;

     

       18
       18
       +
             fontDir = {

     

       19
       19
       +
               enable = true;

     

       20
       20
       +
               decompressFonts = true;

     

       21
       21
       +
             };

     

       19
       22
        
       

     

       20
       23
        
             packages = with pkgs; [

     

       24
       24
       +
               sf-pro

     

       25
       25
       +
               sf-pro-mono

     

       21
       26
        
               noto-fonts

     

       22
       27
        
               noto-fonts-cjk-sans

     

       23
       28
        
               noto-fonts-emoji

     
···

       27
       32
        
       

     

       28
       33
        
             fontconfig.defaultFonts = {

     

       29
       34
        
               serif = [ "Noto Serif" "Noto Color Emoji" ];

     

       30
       30
       -
               sansSerif = [ "Inter" "Noto Color Emoji" ];

     

       35
       35
       +
               sansSerif = [ "SF Pro Display" "Noto Color Emoji" ];

     

       31
       36
        
               monospace = [ "Dank Mono" "Roboto Mono" "Noto Color Emoji" ];

     

       32
       37
        
               emoji = [ "Noto Color Emoji" ];

     

       33
       38
        
             };