Reorganise to make better use of use-package and bind-key

init.el

@@ -1,51 +1,17 @@
-(global-set-key (kbd "M-o") 'other-window)
-;; Thinkpad keyboards have PrtSc where right alt should be
-(global-set-key (kbd "<print>") 'execute-extended-command)
-;; OpenBSD prefixes gnu coreutils programs with g
-;; Requires installation of coreutils package
-(global-set-key (kbd "M-\\") 'cycle-spacing)
-
-(setq-default auto-fill-function 'do-auto-fill)
-
-(setq dired-chown-program "gchown"
-      dired-touch-program "gtouch"
-      dired-grep-program "ggrep"
-      insert-directory-program "gls")
-
-;; (setq custom-safe-themes
-;;       '("dde643b0efb339c0de5645a2bc2e8b4176976d5298065b8e6ca45bc4ddf188b7" default))
-
 (eval-when-compile
   (require 'use-package))
 
-(use-package magit
-  :ensure t
-  :bind (("C-x g" . magit-status)
-	 ("<f8>" . magit-status)))
+(bind-key "M-o" #'other-window)
+;; Thinkpad keyboards have PrtSc where right alt should be
+(bind-key "<print>" #'execute-extended-command)
+(bind-key "M-\\" #'cycle-spacing)
+(bind-key "<f6>" #'switch-to-buffer)
+(bind-key "S-<f6>" #'switch-to-buffer-other-window)
 
-(use-package vertico
-  :ensure t
-  :config
-  (vertico-mode))
-(use-package orderless
-  :ensure t)
-(use-package smartparens-config
-  :ensure smartparens
-  :config (progn (show-smartparens-global-mode t)))
-(use-package org-journal
-  :ensure t
-  :defer t)
-(use-package corfu
-  :ensure t
+(use-package diminish :ensure t)
+(use-package emacs
   :init
-  (global-corfu-mode))
-(use-package slime
-  :ensure t
-  :init
-  (setq inferior-lisp-program "sbcl")
-  :defer t)
-(use-package project
-  :ensure t)
+  (setq-default auto-fill-function 'do-auto-fill))
 (use-package consult
   :ensure t
   :bind (;; C-c bindings (mode-specific-map)
@@ -96,13 +62,49 @@
          ("M-s" . consult-history)                 ;; orig. next-matching-history-element
          ("M-r" . consult-history))                ;; orig. previous-matching-history-)
   )
-
+(use-package corfu
+  :ensure t
+  :init
+  (global-corfu-mode))
 (use-package expand-region
   :ensure t
   :bind ("C-=" . er/expand-region))
-
+(use-package magit
+  :ensure t
+  :bind (("C-x g" . magit-status)
+	 ("<f8>" . magit-status)))
+(use-package orderless
+  :ensure t)
+(use-package project
+  :ensure t)
 (use-package racket-mode
   :ensure t)
+(use-package slime
+  :ensure t
+  :init
+  (setq inferior-lisp-program "sbcl")
+  :defer t)
+(use-package smartparens-config
+  :ensure smartparens
+  :config (progn (show-smartparens-global-mode t)))
+(use-package vertico
+  :ensure t
+  :config
+  (vertico-mode))
+(use-package yafolding
+  :ensure t
+  :hook 'prog-mode)
+
+;; OS specific customisation
+;; OpenBSD prefixes gnu coreutils programs with g
+;; Requires installation of coreutils package
+
+(when (eq system-type 'berkely-unix)
+  (custom-set-variables
+   '(dired-chown-program "gchown")
+   '(dired-touch-program "gtouch")
+   '(dired-grep-program "ggrep")
+   '(insert-directory-program "gls")))
 
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
@@ -120,6 +122,7 @@
  '(custom-safe-themes
    '("2cc1b50120c0d608cc5064eb187bcc22c50390eb091fddfa920bf2639112adb6" "69f7e8101867cfac410e88140f8c51b4433b93680901bb0b52014144366a08c8" "eb50f36ed5141c3f702f59baa1968494dc8e9bd22ed99d2aaa536c613c8782db" "eb7cd622a0916358a6ef6305e661c6abfad4decb4a7c12e73d6df871b8a195f8" default))
  '(desktop-save-mode nil)
+ '(dired-chown-program "gchown")
  '(dired-dwim-target 'dired-dwim-target-next)
  '(display-buffer-alist '(("\\*Async" display-buffer-no-window (nil))))
  '(display-time-24hr-format t)
@@ -143,7 +146,7 @@
      ("gnu" . "https://elpa.gnu.org/packages/")
      ("nongnu" . "https://elpa.nongnu.org/nongnu/")))
  '(package-selected-packages
-   '(sicp eat which-key eglot haskell-mode undo-tree expand-region project consult pdf-tools slime corfu org-journal smartparens modus-themes orderless solarized-theme vertico use-package racket-mode magit))
+   '(yafold yafolding diminish sicp eat which-key eglot haskell-mode undo-tree expand-region project consult pdf-tools slime corfu smartparens modus-themes orderless solarized-theme vertico use-package racket-mode magit))
  '(prog-mode-hook
    '(flyspell-prog-mode display-line-numbers-mode turn-on-smartparens-strict-mode))
  '(save-place-mode t)
@@ -155,6 +158,7 @@
    '(turn-on-flyspell turn-on-auto-fill text-mode-hook-identify))
  '(tool-bar-mode nil)
  '(use-package-compute-statistics t)
+ '(use-package-verbose t)
  '(which-key-mode t)
  '(xref-show-definitions-function 'consult-xref)
  '(xref-show-xrefs-function 'consult-xref))