Reorder package configuration

Also found that I had two package definitions for `project.el` … oops.

init.el

@@ -306,7 +306,9 @@
               proced-enable-color-flag t))
 
 (use-package project
-  :init (setq project-list-file (expand-file-name "projects" emacs-d-userdata))
+  :init (setq project-list-file (expand-file-name "projects" emacs-d-userdata)
+              project-switch-commands 'project-dired
+              project-vc-merge-submodules nil)
   :config (progn
 
             ;; Sort known projects before persisting, to reduce committer noise
@@ -376,6 +378,14 @@
                            (window-height . 0.33)
                            (window-parameters . ((no-other-window . t)))))))
 
+(use-package which-key
+  :ensure t
+  :commands (which-key-mode)
+  :diminish which-key-mode
+  :init (setq which-key-side-window-max-width 0.33
+              which-key-side-window-max-height 0.25)
+  :config (which-key-setup-side-window-bottom))
+
 (use-package winner
   :commands (winner-mode winner-undo winner-redo))
 
@@ -2029,6 +2039,13 @@ Note that this workaround is incomplete, as explained in this comment."
 (use-package smiley
   :init (setq smiley-style 'emoji))
 
+(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)))
+
 
 ;; * File Handling
 
@@ -2261,27 +2278,6 @@ Note that this workaround is incomplete, as explained in this comment."
                      "Cannot load `helm-global-bindings', please check your helm installation for completeness. "
                      "(Have you installed it from melpa?)")))))
 
-(use-package ivy
-  :diminish ivy-mode
-  :init (setq ivy-use-virtual-buffers t
-              ivy-magic-tilde nil
-              ivy-count-format "(%d/%d) "
-              ivy-initial-inputs-alist '((counsel-describe-function . "^")
-                                         (counsel-describe-variable . "^")
-                                         (man . "^")
-                                         (woman . "^"))
-              ivy-use-selectable-prompt t
-              ivy-do-completion-in-region t
-              ivy-re-builders-alist '((t . ivy--regex-ignore-order)))
-  :config (progn
-            ;; Since we are using `ivy--regex-ignore-order' for completion
-            ;; anyway, providing an individual restriction in the ivy buffer is
-            ;; not necessary anymore.  Since I often mistype S-SPC for SPC,
-            ;; loosing the current candidate and annoying myself, removing this
-            ;; shortcut is both helpful and not removing necessary
-            ;; functionality.
-            (define-key ivy-minibuffer-map (kbd "S-SPC") nil)))
-
 (use-package recentf
   :commands (recentf-mode recentf-save-list)
   :init (setq recentf-max-saved-items 1000
@@ -2386,7 +2382,10 @@ eventuelly be set to nil, however)."
 (use-package bm
   ;; Taken from https://protesilaos.com/dotemacs/ and adapted slightly
   :ensure t
-  :commands (bm-toggle bm-next bm-previous bm-toggle-buffer-persistence)
+  :commands (bm-toggle
+             bm-next
+             bm-previous
+             bm-toggle-buffer-persistence)
   :init (setq bm-restore-repository-on-load t
               bm-annotate-on-create nil
               bm-buffer-persistence t
@@ -2396,7 +2395,7 @@ eventuelly be set to nil, however)."
               bm-marker 'bm-marker-right
               bm-in-lifo-order nil
               bm-recenter t
-              bm-repository-file "~/.emacs.d/bm-bookmarks"
+              bm-repository-file (expand-file-name "bm-bookmarks" emacs-d-userdata)
               bm-repository-size 100
               bm-show-annotations t
               bm-wrap-immediately t
@@ -2869,10 +2868,6 @@ eventuelly be set to nil, however)."
               plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
               plantuml-indent-level 2))
 
-(use-package project
-  :init (setq project-switch-commands 'project-dired
-              project-vc-merge-submodules nil))
-
 (use-package python
   :config (progn
             (add-hook 'python-mode-hook #'highlight-indentation-mode)
@@ -2896,13 +2891,6 @@ eventuelly be set to nil, however)."
   :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 remember
   :init (setq remember-data-file db/org-default-refile-file))
 
@@ -2930,14 +2918,6 @@ eventuelly be set to nil, however)."
   :ensure t
   :commands (vlf))
 
-(use-package which-key
-  :ensure t
-  :commands (which-key-mode)
-  :diminish which-key-mode
-  :init (setq which-key-side-window-max-width 0.33
-              which-key-side-window-max-height 0.25)
-  :config (which-key-setup-side-window-bottom))
-
 (use-package yaml-mode
   :ensure t
   :config (progn