diff --git a/machines/thaylen-city/default.nix b/machines/thaylen-city/default.nix
index e3bedc8f..a0acf488 100644
--- a/machines/thaylen-city/default.nix
+++ b/machines/thaylen-city/default.nix
@@ -13,6 +13,16 @@
   };
   networking.computerName = "Thaylen City";
 
+  fonts.packages = with pkgs; [
+    hack-font
+    font-awesome
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    noto-fonts-extra
+    roboto
+  ];
+
   homebrew = {
     enable = true;
     casks = [
diff --git a/modules/nixos/base/emacs/linux-init.el b/modules/nixos/base/emacs/linux-init.el
index 346e4dbb..a352d301 100644
--- a/modules/nixos/base/emacs/linux-init.el
+++ b/modules/nixos/base/emacs/linux-init.el
@@ -2,20 +2,11 @@
   :ensure nil ;; Not a real package, but a place to collect global settings for linux
   :demand t
   :config
-  ;; Font configuration
-  (defun font-settings ()
-    "Setup font settings."
-    (when window-system (set-frame-font "Hack 9"))
-    (set-fontset-font t 'symbol "Noto Color Emoji")
-    (set-fontset-font t 'symbol "Symbola" nil 'append))
   ;; Make sure DISPLAY is set correctly in env.
   (defun display-env-hack ()
     "Hack DISPLAY env variable back into env."
     (setenv "DISPLAY" ":0")
     )
   (if (daemonp)
-      (progn
-        (add-hook 'server-after-make-frame-hook #'font-settings)
-        (add-hook 'server-after-make-frame-hook #'display-env-hack))
-    (font-settings))
+      (add-hook 'server-after-make-frame-hook #'display-env-hack))
   )
diff --git a/modules/shared/base/emacs/base-init.el b/modules/shared/base/emacs/base-init.el
index bbb0b504..db97b10b 100644
--- a/modules/shared/base/emacs/base-init.el
+++ b/modules/shared/base/emacs/base-init.el
@@ -179,6 +179,15 @@
   (comp-deferred-compilation nil "Don't do native-comp at runtime")
   (project-vc-merge-submodules nil "Don't consider submodules as the same project")
   :config
+  (defun font-settings ()
+    "Setup font settings."
+    (when window-system
+      (progn (set-frame-font "Hack 9")
+             (set-fontset-font t 'symbol "Noto Color Emoji"))))
+
+  (if (daemonp)
+      (add-hook 'server-after-make-frame-hook #'font-settings)
+    (font-settings))
 
   ;; Always display column number in mode line
   (column-number-mode)