emacs: fight with package management

1 files changed, 5 insertions, 7 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 9890e68..c2c5604 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -78,8 +78,9 @@
 ;; This is also nice because I can do event-base programming for what
 ;; to do once a package is loaded, using :after.
 
-(add-to-list 'package-archives '("ELPA" . "http://tromey.com/elpa/"))
-(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
+;; For some reason, el-get adds a bunch of 3rd-party repos to
+;; package-archives.  I guess I'm ok with that?  I don't have to
+;; manage them.
 (setq package-enable-at-startup nil)
 
 ;; What packages el-get should get from ELPA (if it gets them at all)
@@ -88,11 +89,8 @@
   (:name dtrt-indent :type elpa ;; Detect indent style for existing files
    :after (dtrt-indent-mode 1))
   (:name page-break-lines :type elpa ;; Display form-feeds pretty
-   :after (progn
-            (define-global-minor-mode global-page-break-lines-mode
-              page-break-lines-mode page-break-lines-mode
-              :group 'page-break-lines)
-            (global-page-break-lines-mode 1)))
+   :before (advice-add 'page-break-lines-mode-maybe :override #'page-break-lines-mode)
+   :after (global-page-break-lines-mode 1))
   (:name smart-tabs-mode :type elpa ;; Indent with tabs, align with spaces
    :after (progn
            (smart-tabs-mode 1)