From 4a4ab6d89a833895e26effa213fbc0e64b5e16ac Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2023 19:08:34 +0200
Subject: emacs: fix icons in doom-modeline (breaking change in package)

---
 user/emacs/init.el      | 10 ++++++----
 user/settings/emacs.nix | 14 +++++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'user')

diff --git a/user/emacs/init.el b/user/emacs/init.el
index 6fa25e44..064517c0 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -111,6 +111,12 @@
 ;;; Chrome
 (column-number-mode -1)
 (line-number-mode -1)
+
+(use-package nerd-icons
+  :config (progn
+            (setq nerd-icons-color-icons nil
+                  nerd-icons-scale-factor 1.2)))
+
 (use-package doom-modeline
   :hook (emacs-startup . doom-modeline-mode)
   :config (progn
@@ -540,10 +546,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
             (setq company-shell-clean-manpage t)
             (add-to-list 'company-backends '(company-shell company-shell-env))))
 
-(use-package all-the-icons
-  :defer t
-  :config (setq all-the-icons-color-icons nil))
-
 (use-package tabnine-capf
   :commands (tabnine-completion-at-point)
   :after (company)
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 696ab267..5b41423e 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -80,9 +80,7 @@ in
     extraPackages = epkgs: (with epkgs;
       [
         ace-link
-        all-the-icons
         almost-mono-themes
-        all-the-icons
         apheleia
         avy
         capf-autosuggest
@@ -138,6 +136,7 @@ in
         markdown-mode
         marginalia
         modus-themes
+        nerd-icons
         doom-modeline
         posframe
         projectile
@@ -170,8 +169,17 @@ in
       (setq exec-path (parse-colon-path (setenv "PATH" "${pkgs.lib.readFile darwinPath}")))
     '';
   };
-  home.packages = [
+  home.packages = with pkgs; [
     editorScript
+    # see https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix
+    (nerdfonts.override {
+      fonts = [
+        "NerdFontsSymbolsOnly"
+        "JetBrainsMono"
+        "IBMPlexMono"
+        "iA-Writer"
+      ];
+    })
   ];
   xdg.configFile."emacs/early-init.el" = {
     source = ../emacs/early-init.el;
-- 
cgit 1.4.1