diff --git a/common.nix b/common.nix index 94f3d5f..fef5517 100644 --- a/common.nix +++ b/common.nix @@ -139,15 +139,6 @@ with builtins; { nixpkgs.config.packageOverrides = pkgs: { sudo = pkgs.sudo.override {withInsults = true;}; - google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: { - src = pkgs.fetchFromGitHub { - owner = "google"; - repo = "fonts"; - rev = "c06520efccd2c99d970b536d4f62cb4d95b4e6b2"; - sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; - }; - installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; - }); }; security.sudo.extraConfig = "Defaults insults"; diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index df6d522..b686e8d 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -1,4 +1,15 @@ {pkgs, ...}: { + nixpkgs.config.packageOverrides = pkgs: { + google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: { + src = pkgs.fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "8a0041ea7b92e339a7ce13e4e1dadcc85cb8f5df"; + sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; + }; + installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; + }); + }; fonts.packages = with pkgs; [ nerd-fonts.fira-code nerd-fonts.departure-mono