about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2022-09-05 19:00:02 +0200
committeraszlig <aszlig@nix.build>2022-09-05 19:00:02 +0200
commitfb6cc81caf5a836b9443ed7277ea71f94d1f16fb (patch)
tree977e4f25b978edc244cd5495a6e307f453f97f11 /modules
parent2b0672ae35e0edf2a829abec23ab97cf72988611 (diff)
workstation: Use oldschool font pack from nixpkgs
Back then when I added the font pack in 0171f8d895efd46300ba01c6adeb7aa,
version 2.0 was not yet merged to nixpkgs. This has happened in the
meantime and the current version is version 2.2 and I also do not see
any reason to keep the 2.0 version in Vuizvui.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index bfc86c9e..aff89628 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -67,17 +67,7 @@ in {
       fontDir.enable = true;
       enableGhostscriptFonts = true;
       fontconfig.useEmbeddedBitmaps = true;
-      # TODO: Switch to nixpkgs version once version 2.0 lands.
-      fonts = lib.singleton (pkgs.fetchzip {
-        name = "oldschool-pc-font-pack-2.0";
-        url = "https://int10h.org/oldschool-pc-fonts/download/"
-            + "oldschool_pc_font_pack_v2.0_ttf.zip";
-        sha256 = "0z0fw6ni7iq806y4m83xrfx46r14xxxql09ch2gxjqi062awqyh8";
-        postFetch= ''
-          mkdir -p $out/share/fonts/truetype
-          unzip -j $downloadedFile \*.ttf -d "$out/share/fonts/truetype"
-        '';
-      });
+      fonts = lib.singleton pkgs.ultimate-oldschool-pc-font-pack;
     };
 
     vuizvui.user.aszlig.services.i3.enable = true;