From 4e58b89c8ba8a482c3cd39098a43996a9f9e2884 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 13 Sep 2021 21:30:26 -0600
Subject: [PATCH 1/4] [Emacs] Defer tex stuff

---
 dotfiles/emacs.d/README.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index a9d63c16..0e683613 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -3702,6 +3702,7 @@ alphanumeric characters only."
                     :branch "fork/1"
                     :files (:defaults (:exclude "doc/*.texi")))
   :commands TeX-mode
+  :defer t
   :preface
   (progn
     (defun imalison:TeX-mode-hook ()
@@ -3740,6 +3741,7 @@ alphanumeric characters only."
 #+BEGIN_SRC emacs-lisp
 (use-package company-auctex
   :after tex
+  :defer t
   :config
   (company-auctex-init))
 #+END_SRC

From 0bcaacf09570bfd842db5bacbcada0b0139151e8 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 29 Sep 2021 19:33:12 -0600
Subject: [PATCH 2/4] Bump submodules

---
 dotfiles/config/taffybar/taffybar     | 2 +-
 dotfiles/config/xmonad/xmonad-contrib | 2 +-
 nixos/nixpkgs                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 437f7307..6518ab20 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 437f73075261f5e0a018aa190f49d2f50d371aed
+Subproject commit 6518ab20d8e54f5452744617c1e7fbdf8bcb0745
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index 22a64f65..6e3a7388 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit 22a64f65ae61f86513f819b1e16fc2bec3326341
+Subproject commit 6e3a738862b3ecc9f93a8758e9f2d6179107a168
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index 022c300d..2ecae290 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit 022c300df10d5e90ea9738441fd3d978b80596e5
+Subproject commit 2ecae290935ae17fb40de76df7d778a3ed3523b0

From 7eb790f35b60273b9a60e035299a09fea351a3cc Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 29 Sep 2021 19:33:28 -0600
Subject: [PATCH 3/4] [NixOS] Add several fonts

---
 nixos/fonts.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/fonts.nix b/nixos/fonts.nix
index 4843a7e6..89703b36 100644
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -6,17 +6,19 @@
   fonts = {
     fonts = with pkgs; [
       dejavu_fonts
+      emacs-all-the-icons-fonts
       emojione
       fira-code
       fira-mono
       font-awesome-ttf
+      iosevka
       noto-fonts-emoji
       roboto
       source-code-pro
       source-sans-pro
       source-serif-pro
       twemoji-color-font
-      emacs-all-the-icons-fonts
+      (nerdfonts.override { fonts = [ "JetBrainsMono" "FantasqueSansMono" ]; })
     ];
     fontconfig = {
       allowBitmaps = true;

From 240000ab50c9c4d0ca8e61dec7fc40ae650d8060 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 29 Sep 2021 19:33:42 -0600
Subject: [PATCH 4/4] [NixOS] Add spicetify on non-arm

---
 nixos/essential-no-arm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/essential-no-arm.nix b/nixos/essential-no-arm.nix
index fc8e4bdd..b9e2ab70 100644
--- a/nixos/essential-no-arm.nix
+++ b/nixos/essential-no-arm.nix
@@ -5,5 +5,6 @@
     google-chrome
     pommed_light
     torbrowser
+    spicetify-cli
   ];
 }