1 files changed, 41 insertions, 41 deletions

@@ -34,11 +34,12 @@
       inhibit-x-resources t)
 (acdw/gc-disable)
 
-(hook-defun post-init-reset after-init-hook
-  (acdw/gc-enable)
-  (dolist (handler file-name-handler-alist)
-    (add-to-list 'orig-file-name-handler-alist handler))
-  (setq file-name-handler-alist orig-file-name-handler-alist))
+(add-hook 'after-init-hook
+          (defun after-init@reset ()
+            (acdw/gc-enable)
+            (dolist (handler file-name-handler-alist)
+              (add-to-list 'orig-file-name-handler-alist handler))
+            (setq file-name-handler-alist orig-file-name-handler-alist)))
 
 ;;; Frame settings
 (setq default-frame-alist               ; Remove most UI
@@ -60,42 +61,41 @@
       inhibit-x-resources t             ; Don't load ~/.Xresources
       )
 
-(hook-defun disable-ui-modes after-init-hook
-  (dolist (mode ;; each mode is of the form (MODE . FRAME-ALIST-VAR)
-           '((tool-bar-mode . tool-bar-lines)
-             (menu-bar-mode . menu-bar-lines)
-             (scroll-bar-mode . vertical-scroll-bars)
-             (horizontal-scroll-bar-mode . horizontal-scroll-bars)
-             ))
-    (let ((setting (alist-get (cdr mode) default-frame-alist)))
-      (when (or (not setting)
-                (= 0 setting))
-        (funcall (car mode) -1)))))
-
-(add-function :after after-focus-change-function
-              (defun acdw/first-frame-setup ()
-                ;; fonts
-                (require 'acdw-fonts)
-                (setq acdw-fonts/monospace (acdw/system
-                                            (:home "DejaVu Sans Mono")
-                                            (:work "Consolas")
-                                            (:other "monospace"))
-                      acdw-fonts/monospace-size 10
-                      acdw-fonts/variable (acdw/system
-                                           (:home "DejaVu Sans")
-                                           (:work "Calibri")
-                                           (:other "sans-serif"))
-                      acdw-fonts/variable-size 12)
-                (acdw-fonts/set)
-                (acdw-fonts/setup-emoji-fonts "Segoe UI Emoji"
-                                              "Noto Color Emoji"
-                                              "Apple Color Emoji"
-                                              "Symbola")
-                ;; fringes
-                (acdw/setup-fringes)
-                ;; only run this once
-                (remove-function after-focus-change-function
-                                 'acdw/first-frame-setup)))
+(add-hook 'after-init-hook
+          (defun after-init@disable-ui-modes ()
+            (dolist (mode ;; each mode is of the form (MODE . FRAME-ALIST-VAR)
+                     '((tool-bar-mode . tool-bar-lines)
+                       (menu-bar-mode . menu-bar-lines)
+                       (scroll-bar-mode . vertical-scroll-bars)
+                       (horizontal-scroll-bar-mode . horizontal-scroll-bars)
+                       ))
+              (let ((setting (alist-get (cdr mode) default-frame-alist)))
+                (when (or (not setting)
+                          (= 0 setting))
+                  (funcall (car mode) -1))))))
+
+(add-hook 'after-make-frame-functions
+          (defun acdw/frame-setup (&rest args)
+            (ignore args)
+            ;; fonts
+            (require 'acdw-fonts)
+            (setq acdw-fonts/monospace (acdw/system
+                                        (:home "DejaVu Sans Mono")
+                                        (:work "Consolas")
+                                        (:other "monospace"))
+                  acdw-fonts/monospace-size 10
+                  acdw-fonts/variable (acdw/system
+                                       (:home "DejaVu Sans")
+                                       (:work "Calibri")
+                                       (:other "sans-serif"))
+                  acdw-fonts/variable-size 12)
+            (acdw-fonts/set)
+            (acdw-fonts/setup-emoji-fonts "Segoe UI Emoji"
+                                          "Noto Color Emoji"
+                                          "Apple Color Emoji"
+                                          "Symbola")
+            ;; fringes
+            (acdw/setup-fringes)))
 
 
 ;;; Bootstrap package manager (`straight.el')