Merge remote-tracking branch 'origin/master'

2021-09-29 22:23:43 -06:00
parent 32a736621f 240000ab50
commit ce6ef6abda
5 changed files with 8 additions and 3 deletions
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -3701,6 +3701,7 @@ alphanumeric characters only."
                    :branch "fork/1"
                    :files (:defaults (:exclude "doc/*.texi")))
  :commands TeX-mode
+  :defer t
  :preface
  (progn
    (defun imalison:TeX-mode-hook ()
@@ -3739,6 +3740,7 @@ alphanumeric characters only."
 #+BEGIN_SRC emacs-lisp
 (use-package company-auctex
  :after tex
+  :defer t
  :config
  (company-auctex-init))
 #+END_SRC
--- a/nixos/essential-no-arm.nix
+++ b/nixos/essential-no-arm.nix
@@ -5,5 +5,6 @@
    google-chrome
    pommed_light
    torbrowser
+    spicetify-cli
  ];
 }
--- 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;