From 7c30c450e0dadf137e5273515b40c24b791433d1 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 2 Jan 2025 10:03:09 +0100
Subject: [PATCH] fix: fix eval error on nerdfonts

---
 home-manager-modules/kitty/default.nix |   2 +-
 machines/gallifrey/home-julien.nix     | 113 +++++++++++++------------
 2 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/home-manager-modules/kitty/default.nix b/home-manager-modules/kitty/default.nix
index 27af898..66fcd3b 100644
--- a/home-manager-modules/kitty/default.nix
+++ b/home-manager-modules/kitty/default.nix
@@ -26,7 +26,7 @@ with lib;
       };
       font = {
         name = "FiraCode Nerd Font Mono Reg";
-        package = with pkgs; (nerdfonts.override { fonts = [ "FiraCode" ]; });
+        package = pkgs.nerd-fonts.fira-code;
       };
       themeFile = "Catppuccin-Mocha";
 
diff --git a/machines/gallifrey/home-julien.nix b/machines/gallifrey/home-julien.nix
index 88d6814..69c26af 100644
--- a/machines/gallifrey/home-julien.nix
+++ b/machines/gallifrey/home-julien.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
 
   luj.hmgr.julien = {
@@ -60,60 +60,62 @@
       ];
     };
 
-    home.packages = with pkgs; [
-      du-dust
-      kitty
-      jq
-      lazygit
-      fira-code
-      feh
-      meld
-      nerdfonts
-      jetbrains-mono
-      cantarell-fonts
-      unstable.nixd
-      libreoffice
-      signal-desktop
-      font-awesome
-      nodejs
-      htop
-      evince
-      mosh
-      flameshot
-      kitty
-      networkmanagerapplet
-      element-desktop
-      xdg-utils
-      step-cli
-      scli
-      jftui
-      texlive.combined.scheme-full
-      inochi-creator
-      inochi-session
-      gh
-      ouch
-      spotify
-      nautilus
-      pika-backup
-      mpv
-      zotero
-      emacsPackages.jinx
-      hunspellDicts.en_US
-      rstudio
-      forge-sparks
-      citations
-      blanket
-      fragments
-      metadata-cleaner
-      gnome-obfuscate
-      warp
-      tuba
-      resources
-      notify-client
-      emacs-lsp-booster
-      pyright
-      nixfmt-rfc-style
-    ];
+    home.packages =
+      with pkgs;
+      [
+        du-dust
+        kitty
+        jq
+        lazygit
+        fira-code
+        feh
+        meld
+        jetbrains-mono
+        cantarell-fonts
+        unstable.nixd
+        libreoffice
+        signal-desktop
+        font-awesome
+        nodejs
+        htop
+        evince
+        mosh
+        flameshot
+        kitty
+        networkmanagerapplet
+        element-desktop
+        xdg-utils
+        step-cli
+        scli
+        jftui
+        texlive.combined.scheme-full
+        inochi-creator
+        inochi-session
+        gh
+        ouch
+        spotify
+        nautilus
+        pika-backup
+        mpv
+        zotero
+        emacsPackages.jinx
+        hunspellDicts.en_US
+        rstudio
+        forge-sparks
+        citations
+        blanket
+        fragments
+        metadata-cleaner
+        gnome-obfuscate
+        warp
+        tuba
+        resources
+        notify-client
+        emacs-lsp-booster
+        pyright
+        nixfmt-rfc-style
+      ]
+      ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 
     fonts.fontconfig.enable = true;
 
@@ -150,6 +152,7 @@
         ".config/dconf"
         ".local/share/keyrings"
         ".cache/mu"
+        "Maildir"
       ];
       allowOther = true;
     };