init.el

@@ -469,8 +469,6 @@
 
 ;; * Basic Builtin Packages
 
-;; All packages configured here should be part of Emacs core.
-
 (use-package abbrev
   :init (setq save-abbrevs 'silently
               abbrev-file-name (expand-file-name "private/abbrev_defs"))
@@ -533,13 +531,6 @@
               diary-show-holidays-flag t
               calendar-view-holidays-initially-flag nil))
 
-(use-package dictionary
-  :init (setq dictionary-server "dict.org"))
-
-(use-package eww
-  :init (setq eww-bookmarks-directory
-              (expand-file-name "private/" emacs-d)))
-
 (use-package ffap
   ;; Inhibit Emacs from pinging hostnames; see
   ;; https://www.n16f.net/blog/investigating-a-ffap-issue-in-emacs/
@@ -590,13 +581,6 @@
   :commands (re-builder)
   :init (setq reb-re-syntax 'string))
 
-(use-package shr
-  :init (setq shr-use-fonts nil
-              shr-use-colors nil
-              shr-max-image-proportion 0.7
-              shr-image-animate nil
-              shr-width (current-fill-column)))
-
 (use-package server
   :commands (server-running-p server-start)
   :init (setq server-log t))
@@ -1512,9 +1496,6 @@ point to the beginning of buffer first."
 
 ;; * General Programming
 
-;; Configuration that pertains to programming in general, without referring to
-;; any programming language in particular.
-
 (use-package ediff
   :init (setq ediff-diff-options "-w"
               ediff-window-setup-function 'ediff-setup-windows-plain
@@ -1528,11 +1509,6 @@ point to the beginning of buffer first."
 
             (add-hook 'ediff-after-quit-hook-internal 'winner-undo)))
 
-(use-package flycheck
-  :ensure t
-  :commands (global-flycheck-mode flycheck-mode)
-  :init (setq flycheck-emacs-lisp-load-path 'inherit))
-
 (use-package git-commit
   :commands (global-git-commit-mode)
   :ensure t
@@ -1547,26 +1523,9 @@ point to the beginning of buffer first."
                                                 "Tested-by"
                                                 "Reviewed-by")))
 
-(use-package highlight-indentation
-  :commands highlight-indentation-mode)
-
-(use-package iedit
-  :ensure t
-  :commands (iedit-mode))
-
-(use-package lsp-mode
-  :ensure t
-  :init (setq lsp-keymap-prefix "C-c C-l")
-  :commands (lsp lsp-deferred))
-
-(use-package lsp-ui
-  :ensure t
-  :commands (lsp-ui-mode))
-
 (use-package magit
   :ensure t
-  :commands (magit-status
-             magit-list-repositories)
+  :commands (magit-status)
   :init (setq magit-diff-refine-hunk nil
               magit-commit-show-diff nil)
   :config (progn
@@ -1576,10 +1535,8 @@ point to the beginning of buffer first."
 
             (db/sync-magit-repos-from-projectile)))
 
-(use-package page-break-lines
-  :pin "melpa-stable"
-  :commands (page-break-lines-mode)
-  :diminish page-break-lines-mode)
+(use-package magit-repos
+  :commands (magit-list-repositories))
 
 (use-package projectile
   :ensure t
@@ -1594,6 +1551,35 @@ point to the beginning of buffer first."
                                                                emacs-d))
   :diminish projectile-mode)
 
+(use-package counsel-projectile
+  :commands counsel-projectile)
+
+(use-package highlight-indentation
+  :commands highlight-indentation-mode)
+
+(use-package iedit
+  :ensure t
+  :commands (iedit-mode))
+
+(use-package page-break-lines
+  :pin "melpa-stable"
+  :commands (page-break-lines-mode)
+  :diminish page-break-lines-mode)
+
+(use-package flycheck
+  :ensure t
+  :commands (global-flycheck-mode flycheck-mode)
+  :init (setq flycheck-emacs-lisp-load-path 'inherit))
+
+(use-package lsp-mode
+  :ensure t
+  :init (setq lsp-keymap-prefix "C-c C-l")
+  :commands (lsp lsp-deferred))
+
+(use-package lsp-ui
+  :ensure t
+  :commands (lsp-ui-mode))
+
 
 ;; * Mail
 
@@ -3041,8 +3027,8 @@ With given ARG, display files in `db/important-document-path’."
 
 ;; * Various Mode Configurations
 
-;; These are external packages that are not essential, but still nice to have.
-;; They provide optional functionality and may redefine builtin commands.
+;; These are packages that are not essential, but still nice to have.  They
+;; provide optional functionality and may redefine builtin commands.
 
 (use-package cperl-mode
   :ensure t
@@ -3078,6 +3064,9 @@ With given ARG, display files in `db/important-document-path’."
   :commands (dictcc)
   :config (require 'gnutls))
 
+(use-package dictionary
+  :init (setq dictionary-server "dict.org"))
+
 (use-package edit-list
   :ensure t
   :commands edit-list)
@@ -3096,6 +3085,10 @@ With given ARG, display files in `db/important-document-path’."
                         #'(lambda ()
                             (eproject-mode -1))))))
 
+(use-package eww
+  :init (setq eww-bookmarks-directory
+              (expand-file-name "private/" emacs-d)))
+
 (use-package haskell-mode
   :config (progn
             (add-hook 'haskell-mode-hook 'haskell-doc-mode)
@@ -3158,6 +3151,13 @@ With given ARG, display files in `db/important-document-path’."
             ;; `pyvenv-deactivate', though.
             (add-hook 'pyvenv-post-activate-hooks #'pyvenv-restart-python)))
 
+(use-package shr
+  :init (setq shr-use-fonts nil
+              shr-use-colors nil
+              shr-max-image-proportion 0.7
+              shr-image-animate nil
+              shr-width (current-fill-column)))
+
 (use-package sh-script
   :init (setq sh-basic-offset 2))