From b0c27853bd05173b5a6c8d707ba419c31cafdbfe Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Tue, 10 Aug 2021 11:31:25 -0400
Subject: [PATCH] Swap iosevka for fira-code

---
 README.org        | 13 +++++++++----
 modules/emacs.nix |  1 +
 modules/x11.nix   |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index 5d35238..a56d4ef 100644
--- a/README.org
+++ b/README.org
@@ -274,8 +274,7 @@ mkShell {
 
 ** Java
 
-OpenJDK is a free and open-source implementation of the Java Platform, Standard Edition. It is the result of an effort Sun Microsystems began in 2006. The implementation is licensed under the GNU General Public License
-Version 2 with a linking exception[fn:15].
+OpenJDK[fn:15] is a free and open-source implementation of the Java Platform, Standard Edition. It is the result of an effort Sun Microsystems began in 2006. The implementation is licensed under the GNU General Public License Version 2 with a linking exception.
 
 Import this shell with ~nix-shell /etc/dotfiles/shells/java.nix~.
 
@@ -1002,7 +1001,8 @@ X11, or X[fn:30] is the generic name for the X Window System Display Server. All
   services.printing.enable = true;
 
   fonts.fonts = with pkgs; [
-    iosevka-bin
+    fira-code
+    fira-code-symbols
     emacs-all-the-icons-fonts
   ];
 }
@@ -2075,13 +2075,14 @@ epkgs.magit
 #+NAME: emacs-fonts-package
 #+BEGIN_SRC nix
 epkgs.hydra
+epkgs.fira-code-mode
 #+END_SRC
 
 #+NAME: emacs-fonts-elisp
 #+BEGIN_SRC emacs-lisp
 ;; Configure the font when running as `emacs-server'.
 (custom-set-faces
-  '(default ((t (:inherit nil :height 120 :family "Iosevka")))))
+  '(default ((t (:inherit nil :height 120 :family "Fira Code")))))
 
 ;; Set all three of Emacs' font faces.
 ;; NOTE: This only works without `emacs-server'.
@@ -2089,6 +2090,10 @@ epkgs.hydra
 ;; (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 96)
 ;; (set-face-attribute 'variable-pitch nil :font "Iosevka" :height 96)
 
+;; Enable the global minor-mode.
+(require 'fira-code-mode)
+(global-fira-code-mode)
+
 ;; Define a `hydra' function for scaling the text interactively.
 (defhydra hydra-text-scale (:timeout 4)
   "Scale text"
diff --git a/modules/emacs.nix b/modules/emacs.nix
index f3f7352..e946334 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -39,6 +39,7 @@ let
       epkgs.vterm
       epkgs.magit
       epkgs.hydra
+      epkgs.fira-code-mode
       epkgs.elfeed
       epkgs.nix-mode
       epkgs.projectile
diff --git a/modules/x11.nix b/modules/x11.nix
index 341552b..73255fb 100644
--- a/modules/x11.nix
+++ b/modules/x11.nix
@@ -33,7 +33,8 @@
   services.printing.enable = true;
 
   fonts.fonts = with pkgs; [
-    iosevka-bin
+    fira-code
+    fira-code-symbols
     emacs-all-the-icons-fonts
   ];
 }