From 5efd05924d28e01b03330cd4679e87c417a62843 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Wed, 8 May 2024 09:06:27 +0200
Subject: [PATCH] Tidy up init and early init

---
 .emacs.d/early-init.el |  2 +-
 .emacs.d/init.el       | 62 ++++++++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/.emacs.d/early-init.el b/.emacs.d/early-init.el
index 60438b5..0db1bbb 100644
--- a/.emacs.d/early-init.el
+++ b/.emacs.d/early-init.el
@@ -1,4 +1,4 @@
-(setq gc-cons-threshold (* 50 1000 1000))
+;; early-init.el --- -*- no-byte-compile: t -*-
 
 (setq byte-compile-warnings '(not obsolete))
 (setq warning-suppress-log-types '((comp) (bytecomp)))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 44f5ea0..664be20 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3,10 +3,6 @@
             (message "tobmacs loaded in %s."
                      (emacs-init-time))))
 
-(set-default-coding-systems 'utf-8)
-(customize-set-variable 'visible-bell 1)
-(customize-set-variable 'large-file-warning-threshold 100000000)
-
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 (load custom-file 'noerror)
 
@@ -23,18 +19,15 @@
 (setq use-package-enable-imenu-support t)
 (setq use-package-always-ensure t)
 (setq use-package-compute-statistics t)
+;; (setq use-package-verbose t)
 
 (eval-when-compile
   (require 'use-package))
 (require 'bind-key)
 
-(setq gc-cons-threshold (* 2 1000 1000))
-
 (add-to-list 'load-path (expand-file-name "to/" user-emacs-directory))
 (require 'utils)
 
-;; -----------------------------------------------------------------
-
 (use-package ace-window
   :bind
   ("M-o" . ace-window)
@@ -121,7 +114,8 @@
             (setq-local corfu-auto nil)
             (corfu-mode))))
 
-(use-package dash)
+(use-package dash
+  :defer 3)
 
 (use-package diff-hl
   :hook ((magit-pre-refresh . diff-hl-magit-pre-refresh)
@@ -147,7 +141,8 @@
   (add-hook 'dired-mode-hook #'dired-hide-details-mode)
   (add-hook 'dired-mode-hook #'hl-line-mode))
 
-(use-package dockerfile-mode)
+(use-package dockerfile-mode
+  :defer t)
 
 (use-package ef-themes
   :config
@@ -169,7 +164,8 @@
    ediff-split-window-function 'split-window-horizontally
    ediff-window-setup-function 'ediff-setup-windows-plain))
 
-(use-package editorconfig)
+(use-package editorconfig
+  :defer 3)
 
 (use-package eglot
   :hook
@@ -182,10 +178,19 @@
   (add-to-list 'eglot-server-programs '(nix-mode . ("rnix-lsp"))))
 
 (use-package emacs
+  :ensure nil
+  :custom
+  (visible-bell t)
+  (global-auto-revert-non-file-buffers t)
+  (kill-do-not-save-duplicates t)
+  (fast-but-imprecise-scrolling t)
+  (scroll-conservatively 101)
+  (scroll-margin 0)
+  (scroll-preserve-screen-position t)
   :config
   (minibuffer-electric-default-mode)
   (repeat-mode)
-  (fset 'yes-or-no-p 'y-or-n-p)
+  ;; (fset 'yes-or-no-p 'y-or-n-p)
   (delete-selection-mode)
   (pixel-scroll-precision-mode)
 
@@ -258,16 +263,10 @@
       (exec-path-from-shell-initialize)))
 
   (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
-  (add-hook 'package-menu-mode-hook #'hl-line-mode)
-  :custom
-  (global-auto-revert-non-file-buffers t)
-  (kill-do-not-save-duplicates t)
-  (fast-but-imprecise-scrolling t)
-  (scroll-conservatively 101)
-  (scroll-margin 0)
-  (scroll-preserve-screen-position t))
+  (add-hook 'package-menu-mode-hook #'hl-line-mode))
 
-(use-package flycheck)
+(use-package flycheck
+  :defer 3)
 
 (use-package flycheck-swiftlint
   :after flycheck
@@ -316,7 +315,8 @@
 (use-package git-link
   :defer t)
 
-(use-package graphql-mode)
+(use-package graphql-mode
+  :defer t)
 
 (use-package helpful
   :bind (("C-h f" . helpful-callable)
@@ -333,7 +333,8 @@
   (js-chain-indent t)
   (js-indent-level 2))
 
-(use-package json-mode)
+(use-package json-mode
+  :defer t)
 
 (use-package ligature
   :after fontaine
@@ -412,6 +413,7 @@
                 ("p" . mc/mark-previous-like-this))))
 
 (use-package nerd-icons
+  :defer 2
   :if window-system
   :config
   (use-package nerd-icons-dired
@@ -424,7 +426,8 @@
     :config
     (nerd-icons-completion-mode)))
 
-(use-package nix-mode)
+(use-package nix-mode
+  :defer t)
 
 (use-package ob
   :after org
@@ -437,6 +440,7 @@
 
 (use-package ob-restclient
   :after org
+  :defer t
   :config
   (org-babel-do-load-languages
    'org-babel-load-languages
@@ -445,6 +449,7 @@
 
 (use-package ob-swift
   :after org
+  :defer 3
   :config
     (org-babel-do-load-languages
      'org-babel-load-languages
@@ -452,7 +457,8 @@
              '((swift . t)))))
 
 (use-package ob-swiftui
-  :after org)
+  :after org
+  :defer t)
 
 (use-package olivetti
   :hook (org-mode markdown-mode)
@@ -513,9 +519,11 @@
   :hook (after-init . recentf-mode)
   :ensure nil)
 
-(use-package restclient)
+(use-package restclient
+  :defer t)
 
-(use-package s)
+(use-package s
+  :defer 3)
 
 (use-package savehist
   :init