Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

early-init.el

@@ -281,8 +281,11 @@ When set to non-nil, Emacs will automatically call `package-initialize' and
                                                       ("stable" . 70)
                                                       ("melpa"  . 0)))
 
-;;; Load post-early-init.el
-(minimal-emacs-load-user-init "post-early-init.el")
+(push '(font . "MonoLisa-12") default-frame-alist)
+(push '(fullscreen . maximized) default-frame-alist)
+(if (eq system-type 'gnu/linux)
+    (push '(undecorated . t) default-frame-alist)
+  (push '(undecorated . nil) default-frame-alist))
 
 (provide 'early-init)
 

init.el

@@ -15,20 +15,6 @@
 
 ;; (load "bundle--general")
 
-(setq default-frame-alist
-      `((font . "MonoLisa-12")
-        (width . 85)
-        (height . 50)
-        (vertical-scroll-bars . nil)
-        (fullscreen . maximized)
-        ,(if (eq system-type 'gnu/linux) '(undecorated . t) '(undecorated . nil))))
-
-(setq package-archives
-      '(("melpa" . "https://melpa.org/packages/")
-        ("org" . "https://orgmode.org/elpa/")
-        ("elpa" . "https://elpa.gnu.org/packages/")
-        ("nongnu" . "https://elpa.nongnu.org/nongnu/")))
-
 (package-initialize)
 
 (unless package-archive-contents
@@ -919,6 +905,12 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
                 slime-company-after-completion 'slime-company-just-one-space)
   (add-to-list 'slime-contribs 'slime-company))
 
+(use-package ielm
+  :ensure nil
+  :hook ((ielm-mode . (lambda ()
+                        (paredit-mode -1)
+                        (company-mode -1)))))
+
 (use-package elisp-mode
   :ensure nil
   :hook ((emacs-lisp-mode . prettify-symbols-mode)
@@ -1206,7 +1198,6 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
 (use-package paredit
   :hook ((emacs-lisp-mode . paredit-mode)
          (eval-expression-minibuffer-setup . paredit-mode)
-         (ielm-mode . paredit-mode)
          (lisp-mode . paredit-mode)
          (lisp-interaction-mode . paredit-mode)
          (scheme-mode . paredit-mode))