convert org-mode hooks to use-package format

elisp/extras.el

@@ -29,8 +29,15 @@
 
 ;; Org
 (use-package org
-  :config
-  (load "~/.emacs.d/elisp/org-setup.el"))
+  ;; The following binds are always needed. Why?
+  :bind (("\C-cl" . 'org-store-link)
+         ("\C-ca" . 'org-agenda)
+         ("\C-cc" . 'org-capture))
+  :hook ((org-shiftup-final . windmove-up)
+         (org-shiftleft-final . windmove-left)
+         (org-shiftdown-final-hook . windmove-down)
+         (org-shiftright-final . windmove-right))
+  :config (load "~/.emacs.d/elisp/org-setup.el"))
 (use-package org-ref)
 
 ;; Writing
@@ -91,8 +98,7 @@
 ;; TODO I'm only using demand so <f3> is set from the start
 (use-package treemacs
   :demand t
-  :config
-  (global-set-key (kbd "<f3>") 'treemacs))
+  :bind ("<f3>" . 'treemacs))
 
 ;; Javascript and React
 (use-package rjsx-mode
@@ -144,10 +150,8 @@
 
 (use-package eglot
   :straight (:type built-in)
-  :ensure t
   :defer t
-  :hook ((python-base-mode . eglot-ensure))
-  )
+  :hook ((python-base-mode . eglot-ensure)))
 
 ;; TRAMP
 (load "~/.emacs.d/elisp/tramp-setup.el")