                (concat today "::* Archived From %s")))
     (org-archive-subtree 0)))
 
+(defun pjones:org-attach (file)
+  "Attach a FILE then insert link to it."
+  (interactive "f")
+  (org-attach-attach file)
+  (if org-attach-store-link-p
+      (org-insert-last-stored-link 1)))
+
 ;;; Key Bindings:
 (let ((map org-mode-map))
+  ;; Reset this so I can use it as a prefix:
+  (define-key map (kbd "C-c C-a") nil)
+
   (define-key map (kbd "<f12>") #'org-tree-slide-mode)
   (define-key map (kbd "C-'") nil)
-  (define-key map (kbd "C-o") #'pjones:org-open-line)
+  (define-key map (kbd "C-<return>") #'pjones:org-insert-heading)
   (define-key map (kbd "C-c 0") #'pjones:org-hide-all)
   (define-key map (kbd "C-c 1") #'pjones:org-hide-others)
+  (define-key map (kbd "C-c C-a a") #'pjones:org-attach)
+  (define-key map (kbd "C-c C-a d") #'org-attach-reveal-in-emacs)
+  (define-key map (kbd "C-c C-a u") #'org-attach-url)
   (define-key map (kbd "C-c C-x a") #'pjones:org-archive-subtree-to-daily)
   (define-key map (kbd "C-c C-x A") #'pjones:org-archive-subtree-to-daily)
-  (define-key map (kbd "C-<return>") #'pjones:org-insert-heading)
-  (define-key map (kbd "M-<return>") #'pjones:org-insert-item)
   (define-key map (kbd "C-M-n") #'org-next-visible-heading)
   (define-key map (kbd "C-M-p") #'pjones:org-up-or-prev)
+  (define-key map (kbd "C-o") #'pjones:org-open-line)
+  (define-key map (kbd "M-<return>") #'pjones:org-insert-item)
   (define-key map (kbd "M-n") #'org-forward-heading-same-level)
   (define-key map (kbd "M-N") #'org-metadown)
   (define-key map (kbd "M-p") #'org-backward-heading-same-level)

      :section-numbers t
      :with-broken-links t
      :with-toc 2
      :archived-trees nil)
     ("wiki"
      :base-directory "~/notes/wiki/"
      :base-extension "org"

;; Silence compiler warnings
(declare-function dbus-send-signal "dbus")
(declare-function org-appear-mode "org-appear")
(declare-function org-attach-attach "org-attach")
(declare-function org-attach-reveal-in-emacs "org-attach")
(declare-function org-attach-url "org-attach")
(declare-function org-bookmark-jump-unhide "org")
(declare-function org-clock-sum-current-item "org-clock")
(declare-function org-clocking-p "org-clock")
(declare-function org-insert-last-stored-link "ol")
(declare-function org-roam-dailies-goto-date "org-roam")
(declare-function org-superstar-mode "org-superstar")
(declare-function org-tree-slide-mode "org-tree-slide")
(declare-function pjones:open-line-above "../list/interactive")
(declare-function whitespace-mode "whitespace")

(defvar dbus-interface-emacs)
(defvar dbus-path-emacs)
(defvar org-attach-store-link-p)
(defvar org-clock-start-time)
(defvar whitespace-style)

(defun pjones:org-parse-effort-tag (tag)
  "Convert an effort TAG to a number of seconds."
