From 3cfc5ac5a69b21f4eac17fc47596eb565d77e563 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sun, 22 Sep 2024 21:01:31 +0200
Subject: [PATCH] Use regular Fira Code package

---
 home/config/nil/founts.nix |  2 +-
 package/fira-code.nix      | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 package/fira-code.nix

diff --git a/home/config/nil/founts.nix b/home/config/nil/founts.nix
index 95ea90b..c8aa3f5 100644
--- a/home/config/nil/founts.nix
+++ b/home/config/nil/founts.nix
@@ -30,9 +30,9 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
   };
 
   home.packages = with pkgs; [
+    fira-code
     julia-mono
     lato
-    self.packages.${pkgs.system}.fira-code
     mplus-outline-fonts.githubRelease
     (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
     noto-fonts
diff --git a/package/fira-code.nix b/package/fira-code.nix
deleted file mode 100644
index d7ec83c..0000000
--- a/package/fira-code.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }: { stdenv, lib, fetchzip }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "fira-code";
-  version = "unstable-2024-08-27";
-
-  src = fetchzip {
-    url = "https://github.com/illdefined/FiraCode/releases/download/unstable-2024-08-27/Fira_Code_8557c11.zip";
-    stripRoot = false;
-    hash = "sha256-pcxwlqTntP+/tNOX+MPG+YTiSv1odX4fa3zBfJViQGQ=";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m 0644 -t "$out/share/fonts" \
-      "variable_ttf/Fira Code/FiraCode-VF.ttf"
-
-    runHook postInstall
-  '';
-})