diff --git a/config/dunst.conf b/config/dunst.conf index b6cb480..328b280 100644 --- a/config/dunst.conf +++ b/config/dunst.conf @@ -33,7 +33,7 @@ history_length = 20 show_age_threshold = 60 markup = "full" - font = "Atkinson Hyperlegible 10" + font = "Atkinson Hyperlegible Pro 10" word_wrap = "yes" sort = "yes" shrink = "no" diff --git a/config/nwg-drawer.css b/config/nwg-drawer.css index b1b365c..fa7cf4b 100644 --- a/config/nwg-drawer.css +++ b/config/nwg-drawer.css @@ -2,7 +2,7 @@ window { /*background: @base;*/ background: alpha(@base, 0.3); color: @text; - font-family: 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK; + font-family: 'Atkinson Hyperlegible Pro', 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK; font-size: 14px; font-style: normal; } diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index d459064..e23dccf 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -31,13 +31,13 @@ in { fonts = { sans = mkFontOption "sans" { - package = pkgs.atkinson-hyperlegible; - family = "Atkinson Hyperlegible"; + package = pkgs.my.atkinson-hyperlegible-pro; + family = "Atkinson Hyperlegible Pro"; size = 11; }; sansSerif = mkFontOption "sans-serif" { - package = pkgs.atkinson-hyperlegible; - family = "Atkinson Hyperlegible"; + package = pkgs.my.atkinson-hyperlegible-pro; + family = "Atkinson Hyperlegible Pro"; size = 11; }; monospace = mkFontOption "monospace" { @@ -106,7 +106,7 @@ in { twemoji-color-font noto-fonts-color-emoji noto-fonts-monochrome-emoji - #font-awesome + font-awesome ]; }); } \ No newline at end of file diff --git a/packages/atkinson-hyperlegible-pro/default.nix b/packages/atkinson-hyperlegible-pro/default.nix new file mode 100644 index 0000000..2dfda78 --- /dev/null +++ b/packages/atkinson-hyperlegible-pro/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { + pname = "atkinson-hyperlegible-pro"; + version = "1.5.1-unstable"; + + src = fetchFromGitHub { + owner = "jacobxperez"; + repo = "atkinson-hyperlegible-pro"; + rev = "2576e71d09f57eac8d5e7d9d42b9e7ce49f759e1"; + hash = lib.fakeHash; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + + runHook postInstall + ''; + + meta = with lib; { + description = "Maintained version of Atkinson Hyperlegible"; + homepage = "https://jacobxperez.github.io/atkinson-hyperlegible-pro/"; + license = licenses.ofl; + platforms = platforms.all; + }; +} \ No newline at end of file