Merge remote-tracking branch 'origin/master'

nixos/base.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./users.nix
-    # ./fonts.nix
+    ./fonts.nix
     ./essential.nix
     ./flakes.nix
   ];

nixos/flake.lock

@@ -74,10 +74,8 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1625977875,
-        "narHash": "sha256-rI9IhR2aKTQoknUXAa13/OlVzmthN3Ai7YNYzVvslO4=",
-        "path": "/nix/store/hw96qq9d96lj003rg6vqy2w8p6ycr2jn-source",
-        "rev": "b6eeca1e7322e74520eb518cebda8c9596dd55b9",
+        "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=",
+        "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },
       "original": {
@@ -87,10 +85,8 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1625977875,
-        "narHash": "sha256-rI9IhR2aKTQoknUXAa13/OlVzmthN3Ai7YNYzVvslO4=",
-        "path": "/nix/store/hw96qq9d96lj003rg6vqy2w8p6ycr2jn-source",
-        "rev": "b6eeca1e7322e74520eb518cebda8c9596dd55b9",
+        "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=",
+        "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },
       "original": {
@@ -113,7 +109,7 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "narHash": "sha256-ZqfLW/FYY3XpvfOR18Tmu/TxqZLjkUQ4n2yuTB9zhkw=",
+        "narHash": "sha256-ulmlBKbUqYhFz7CDFrZAEjP677bpwTVXkYcPBo4rzIs=",
         "path": "../dotfiles/config/taffybar/taffybar",
         "type": "path"
       },
@@ -141,7 +137,7 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "narHash": "sha256-zFAhbrj7kW5oEY6EhZAAcic9b8biSezTQEb3F3m0afA=",
+        "narHash": "sha256-U+FcJ5c1EDc1ce0gbHyhiK5XFI1e9+HTwfRqxktPJts=",
         "path": "../dotfiles/config/xmonad/xmonad-contrib",
         "type": "path"
       },

nixos/fonts.nix

@@ -14,7 +14,8 @@
       source-code-pro
       source-sans-pro
       source-serif-pro
-      # twemoji-color-font
+      twemoji-color-font
+      emacs-all-the-icons-fonts
     ];
     fontconfig = {
       allowBitmaps = true;