1 files changed, 32 insertions, 8 deletions
diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el
index eb5a63d..001dbe0 100644
--- a/emacs/.emacs.d/init/ycp-org.el
+++ b/emacs/.emacs.d/init/ycp-org.el
@@ -306,6 +306,7 @@
   (setq org-clock-idle-time 15)
   (setq org-clock-mode-line-total 'auto)
   (setq org-clock-persist 'history)
+  (setq org-clock-continuously t)
   (org-clock-persistence-insinuate))
 
 (my-package org-refile
@@ -441,12 +442,16 @@
   (add-to-list 'org-protocol-protocol-alist
                '("grok"
                  :protocol "grok"
-                 :function my-org-protocol-grok)))
+                 :function my-org-protocol-grok))
+  (add-to-list 'org-protocol-protocol-alist
+               '("browse-url"
+                 :protocol "browse-url"
+                 :function my-org-protocol-browse-url)))
 
 ;; org man links
 (my-package ol-man
   (:delay 30)
-  (setq org-man-command 'woman))
+  (setq org-man-command 'man))
 
 (my-package ol
   (:delay 10)
@@ -504,12 +509,12 @@
 (my-package my-org
   (:delay 30)
   (require 'my-web)
-  (org-link-set-parameters "http" :follow (lambda (url arg)
-                                            (my-browse-url
-                                             (concat "http:" url) arg)))
-  (org-link-set-parameters "https" :follow (lambda (url arg)
-                                             (my-browse-url
-                                              (concat "https:" url) arg)))
+  (org-link-set-parameters "http" :follow
+ 			                     (lambda (url arg)
+			                       (browse-url (concat "http:" url) arg)))
+  (org-link-set-parameters "https" :follow
+			                     (lambda (url arg)
+			                       (browse-url (concat "http:" url) arg)))
   (require 'eww)
   (define-key eww-mode-map (kbd "C-'") 'my-eww-org-protocol-grok)
   )
@@ -518,5 +523,24 @@
   (:delay 60)
   (require 'my-ox-jira))
 
+(my-package org-remark
+  (:install t)
+  (:delay 60)
+  (require 'my-org-remark)
+  (setq org-remark-notes-display-buffer-action
+        '(display-buffer-reuse-mode-window))
+  (setq org-remark-notes-file-name
+        (locate-user-emacs-file "margin.org"))
+  (my-override org-remark-highlight-add-or-update-highlight-headline)
+  (require 'nov)
+  (my-keybind nov-mode-map
+    "M-n" #'org-remark-next
+    "M-p" #'org-remark-prev
+    "M" #'my-org-remark-open-or-create
+    "o" #'org-remark-view
+    "d" #'org-remark-delete)
+  (with-eval-after-load 'nov
+    (org-remark-nov-mode +1)))
+
 (provide 'ycp-org)
 ;;; ycp-org.el ends here