font stuff

custom-pkgs/default.nix

@@ -1,6 +1,5 @@
 pkgs: {
   cargo-bisect-rustc = import ./cargo-bisect-rustc/default.nix pkgs;
-  monaspace = import ./monaspace.nix pkgs;
   sl = import ./sl { inherit pkgs; };
   run = import ./run { inherit pkgs; };
   unpem = import ./unpem { inherit pkgs; };

custom-pkgs/monaspace.nix

@@ -1,50 +0,0 @@
-# Copied from https://github.com/NixOS/nixpkgs/blob/703b9db6c5154530264bd7b6b09552596d0e5ede/pkgs/by-name/mo/monaspace/package.nix,
-# in nixos-unstable soon
-{ lib, stdenv, fetchzip, ... }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "monaspace";
-  version = "1.000";
-
-  src = fetchzip {
-    url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip";
-    stripRoot = false;
-    hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A=";
-  };
-
-  outputs = [ "out" "woff" ];
-
-  installPhase = ''
-    runHook preInstall
-    pushd monaspace-v${finalAttrs.version}/fonts/
-    install -Dm644 otf/*.otf -t $out/share/fonts/opentype
-    install -Dm644 variable/*.ttf -t $out/share/fonts/truetype
-    install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff
-    popd
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "An innovative superfamily of fonts for code";
-    longDescription = ''
-      Since the earliest days of the teletype machine, code has been set in
-      monospaced type — letters, on a grid. Monaspace is a new type system that
-      advances the state of the art for the display of code on screen.
-      Every advancement in the technology of computing has been accompanied by
-      advancements to the display and editing of code. CRTs made screen editors
-      possible. The advent of graphical user interfaces gave rise to integrated
-      development environments.
-      Even today, we still have limited options when we want to layer additional
-      meaning on top of code. Syntax highlighting was invented in 1982 to help
-      children to code in BASIC. But beyond colors, most editors must
-      communicate with developers through their interfaces — hovers, underlines,
-      and other graphical decorations.
-      Monaspace offers a more expressive palette for code and the tools we use
-      to work with it.
-    '';
-    homepage = "https://monaspace.githubnext.com/";
-    license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.all;
-  };
-})

nixos/configuration.nix

@@ -1,11 +1,7 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
 
-{ inputs, lib, config, pkgs, ... }:
-let
-  customPkgs = import ../custom-pkgs/default.nix pkgs;
-in
-{
+{ inputs, lib, config, pkgs, ... }: {
   # You can import other NixOS modules here
   imports = [
     # If you want to use modules from other flakes (such as nixos-hardware):
@@ -171,7 +167,11 @@ in
     #media-session.enable = true;
   };
 
-  fonts.packages = with pkgs; [ fira-code customPkgs.monaspace ];
+  fonts = {
+    enableDefaultPackages = true;
+    packages = with pkgs; [ fira-code monaspace font-awesome ];
+  };
+
 
   services.nixseparatedebuginfod.enable = true;
 
@@ -236,7 +236,7 @@ in
     # inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin
     firefox
     git
-    (linuxKernel.packagesFor linuxKernel.kernels.linux_latest).perf
+    perf
     fish
     unzip
     (steam.override {
@@ -257,7 +257,6 @@ in
     alacritty
     fuzzel
     xwayland-satellite
-    font-awesome
     mpv
   ];