load font correctly when using emacs daemon

1 files changed, 12 insertions, 3 deletions

diff --git a/init.el b/init.el
index 317ccd3..a563a83 100644
--- a/init.el
+++ b/init.el
@@ -110,9 +110,18 @@
         completions-format 'one-column
         completions-auto-select t)
 
-(when (member "Iosevka" (font-family-list))
-  (set-face-attribute 'default nil :font "Iosevka" :height 124)
-  (set-face-attribute 'fixed-pitch nil :family "Iosevka"))
+;; Don't resize the frame when we change font size
+(setopt frame-inhibit-implied-resize t)
+
+(defun my-configure-font ()
+  (when (member "Iosevka" (font-family-list))
+    (set-face-attribute 'default nil :font "Iosevka" :height 124)
+    (set-face-attribute 'fixed-pitch nil :family "Iosevka")))
+
+;; Loads font correctly whether using emacs daemon or standalone process
+(if (daemonp)
+    (add-hook 'server-after-make-frame-hook #'my-configure-font)
+  (my-configure-font))
 
 ;; TRAMP performance tuning
 (setopt remote-file-name-inhibit-locks t