fix(*): replace ligatured hack with plain nerdfont hack font

hashes.nix

@@ -9,10 +9,6 @@
     hash = "sha256-mdkRuEzfWhdbX0DD6uwc1o8kXjqk1Y0+FFKHrM2m81w=";
     cargoHash = "sha256-5nhtGqukZ8tp7gPV+JiUEHTzWUj6JtsB2i7bODcXJSc=";
   };
-  hack = {
-    version = "v3.003+Nerdv2.1+FC3.1+JBMv2.242";
-    hash = "sha256-nCOH+48w7nEm7mXXPCsDuaRlId2hNyYdV01IbVNWuME=";
-  };
   pexel-bg.hash = "sha256-Su2UwFpZKj5sa80UrcDSX9O2GuVI6XR2gSLpp4gJZP0=";
   youtubePlugin = {
     hash = "sha256-gJ7RGB0pSG/iLdpmXHpQOoQTisXnMl1Mgd0KYFgg2qI=";

hosts/helix-texta/default.nix

@@ -116,10 +116,10 @@
     # Use some fonts
     fonts = {
       enableDefaultPackages = true;
-      packages = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
+      packages = with pkgs; [hack-nerdfont noto-fonts noto-fonts-cjk joypixels];
       fontconfig = {
         enable = true;
-        defaultFonts.monospace = ["Hack NF FC Ligatured"];
+        defaultFonts.monospace = ["Hack Nerd Font Mono"];
       };
     };
 

hosts/murex-pecten/default.nix

@@ -90,10 +90,10 @@
 
     fonts = {
       enableDefaultPackages = true;
-      packages = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
+      packages = with pkgs; [hack-nerdfont noto-fonts noto-fonts-cjk joypixels];
       fontconfig = {
         enable = true;
-        defaultFonts.monospace = ["Hack NF FC Ligatured"];
+        defaultFonts.monospace = ["Hack Nerd Font Mono"];
       };
     };
 

hosts/polymita-picta/default.nix

@@ -58,10 +58,10 @@
     # Use some fonts
     fonts = {
       enableDefaultPackages = true;
-      packages = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
+      packages = with pkgs; [hack-nerdfont noto-fonts noto-fonts-cjk joypixels];
       fontconfig = {
         enable = true;
-        defaultFonts.monospace = ["Hack NF FC Ligatured"];
+        defaultFonts.monospace = ["Hack Nerd Font Mono"];
       };
     };
 

hosts/trochulus-hispidus/default.nix

@@ -89,7 +89,7 @@
 
     fonts = {
       enableDefaultPackages = true;
-      packages = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
+      packages = with pkgs; [hack-nerdfont noto-fonts noto-fonts-cjk joypixels];
       fontconfig = {enable = true;};
     };
 

modules/base-system.nix

@@ -45,9 +45,8 @@ in {
       (_: super: {
         "2i-emulator" = super.callPackage ../pkgs/2i-emulator.nix {};
         boilr = super.callPackage ../pkgs/boilr.nix {};
-        # Add fonts
-        hackNerdLigatures = super.callPackage ../pkgs/hack.nix {};
         darkman = super.callPackage ../pkgs/darkman.nix {};
+        hack-nerdfont = super.nerdfonts.override {fonts = ["Hack"];};
       })
     ];
     # This includes the firmware, oc

pkgs/bemenu-configured.nix

@@ -1,8 +1,7 @@
 {
   writeShellApplication,
   bemenu,
-  hack-font,
+  hack-nerdfont,
-  hackNerdLigatures ? hack-font,
   # Color config
   color ? {
     base00 = "000000";
@@ -18,11 +17,11 @@ writeShellApplication {
   name = "bemenu-run-configured";
   runtimeInputs = [
     bemenu
-    hackNerdLigatures
+    hack-nerdfont
   ];
   text = ''
     exec ${cmd} -inl80 \
-         --fn 'Hack NF FC Ligatured 11' \
+         --fn 'Hack Nerd Font Mono 11' \
          --tb=#${color.base08} \
          --tf=#${color.base00} \
          --fb=#${color.base00} \

pkgs/hack.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  fetchzip,
-  stdenvNoCC,
-  ...
-}: let
-  pname = "Ligatured-Hack";
-  hashes = (builtins.import ../hashes.nix).hack;
-in
-  stdenvNoCC.mkDerivation {
-    inherit pname;
-    inherit (hashes) version;
-
-    src = fetchzip {
-      inherit (hashes) hash;
-      url = "https://github.com/gaplo917/Ligatured-Hack/releases/download/v3.003%2BNv2.1.0%2BFC%2BJBMv2.242/HackLigatured-v3.003+FC3.1+JBMv2.242.zip";
-      stripRoot = false;
-    };
-
-    installPhase = ''
-      mkdir -p $out/share/fonts/truetype/${pname}
-      cp *.ttf $out/share/fonts/truetype/${pname}
-    '';
-
-    meta = with lib; {
-      description = "Automatically patch latest Hack Font with latest JetBrains Mono / FiraCode Ligatures";
-      homepage = "https://github.com/gaplo917/Ligatured-Hack";
-      license = licenses.gpl3;
-      maintainers = [];
-    };
-  }

users/malte/modules/kitty.nix

@@ -15,8 +15,8 @@ in {
     enable = true;
 
     font = {
-      name = "Hack NF FC Ligatured";
+      name = "Hack Nerd Font Mono";
-      package = pkgs.hackNerdLigatures;
+      package = pkgs.hack-nerdfont;
       size = 9;
     };
 

users/malte/modules/mako.nix

@@ -9,7 +9,7 @@ in {
   services.mako = {
     enable = true;
     anchor = "top-right";
-    font = "Hack NF FC Ligatured 11";
+    font = "Hack Nerd Font Mono 11";
     backgroundColor = colDark "base05";
     textColor = colDark "base00";
     borderColor = colDark "base00";
@@ -79,7 +79,7 @@ in {
   };
 
   home.packages = [
-    pkgs.hackNerdLigatures
+    pkgs.hack-nerdfont
     doNotDisturb
   ];
 }

users/malte/modules/pass.nix

@@ -49,5 +49,5 @@ in {
   # Install pass-ff extension required file:
   home.file.".mozilla/native-messaging-hosts/passff.json".source = "${pkgs.passff-host}/share/passff-host/passff.json";
 
-  home.packages = [passmenu-bemenu pkgs.hackNerdLigatures];
+  home.packages = [passmenu-bemenu pkgs.hack-nerdfont];
 }

users/malte/modules/shell.nix

@@ -72,7 +72,7 @@ in {
 
     functions = {
       to-image = ''
-        wl-paste | silicon -f 'Hack Nerd Font FC Ligatured' --pad-horiz 40 --pad-vert 50 --theme gruvbox --shadow-blur-radius 30 -b '#ebdbb2' --shadow-color '#282828' --no-window-controls --output /tmp/image.png $argv && wl-copy < /tmp/image.png
+        wl-paste | silicon -f 'Hack Nerd Font Mono' --pad-horiz 40 --pad-vert 50 --theme gruvbox --shadow-blur-radius 30 -b '#ebdbb2' --shadow-color '#282828' --no-window-controls --output /tmp/image.png $argv && wl-copy < /tmp/image.png
       '';
       nonix = "sed 's:/nix/store/[^-]\\+-\\([^/ ]*\\):< \\1>:g'";
       c = ''

users/malte/modules/waybar.nix

@@ -69,7 +69,7 @@
       fi
     '';
 in {
-  home.packages = [pkgs.hackNerdLigatures];
+  home.packages = [pkgs.hack-nerdfont];
 
   programs.waybar = {
     enable = true;
@@ -161,7 +161,7 @@ in {
       * {
           border: none;
           border-radius: 0;
-          font-family: Hack NF FC Ligatured;
+          font-family: Hack Nerd Font;
           font-size: 11px;
           min-height: 20px;
       }

users/malte/modules/zathura.nix

@@ -11,13 +11,13 @@
   lightTheme = config.myLib.mkZathuraTheme config.colorsLight;
   darkTheme = config.myLib.mkZathuraTheme config.colorsDark;
 in {
-  home.packages = [pkgs.hackNerdLigatures];
+  home.packages = [pkgs.hack-nerdfont];
   programs.zathura = {
     enable = true;
 
     options = {
       selection-clipboard = "clipboard";
-      font = "Hack NF FC Ligatured 9";
+      font = "Hack Nerd Font Mono 9";
       render-loading = "true";
       recolor = "true";
       recolor-keephue = "true";