1 files changed, 40 insertions, 7 deletions
diff --git a/.emacs.d/rul-lisp/packages/rul-org.el b/.emacs.d/rul-lisp/packages/rul-org.el
index 9439b86..7c33922 100644
--- a/.emacs.d/rul-lisp/packages/rul-org.el
+++ b/.emacs.d/rul-lisp/packages/rul-org.el
@@ -51,10 +51,9 @@
 (global-set-key (kbd "C-c c") #'org-capture)
 (global-set-key (kbd "C-c s") #'org-schedule)
 
-
-(global-set-key (kbd "<f9>") 'bh/punch-in)
-(global-set-key (kbd "<f10>") 'bh/punch-out)
-(global-set-key (kbd "<f11>") 'org-clock-goto)
+(global-set-key (kbd "<f6>") 'org-clock-goto)
+(global-set-key (kbd "<f9>") 'org-clock-in-last)
+(global-set-key (kbd "<f10>") 'org-clock-out)
 (global-set-key (kbd "<f12>") 'org-agenda)
 
 ;; ORG STATES ;;
@@ -77,6 +76,7 @@
 (setq org-log-done (quote time))
 (setq org-log-redeadline (quote time))
 (setq org-log-reschedule (quote time))
+(setq org-log-into-drawer t)
 
 ;; CAPTURE ;;
 (setq org-capture-templates
@@ -101,13 +101,12 @@
 
         ("L" "Web Link" entry
          (file+headline org-refile-path "Read later")
-         "* %?[[%:link][%:description]] \"\")\n %:initial\n \nCaptured On: %U"
+         "* %?[[%:link][%:description]]\n %:initial\n \nCaptured On: %U"
          )
 
         ("l" "Web Link with Selection" entry
          (file+headline org-refile-path "Read later")
-         "* [[%:link][%:description]] \n %:initial\n \nCaptured On: %U")
-
+         "* [[%:link][%:description]]\n %:initial\n \nCaptured On: %U")
         )))
 
 ;; REFILE ;;
@@ -173,4 +172,38 @@
 ;; Honor ATTR_ORG attribute. Defaults to image's width if not set.
 (setq org-image-actual-width nil)
 
+(setq org-clock-mode-line-total 'today)
+
+;; org-tempus
+(unless (package-installed-p 'org-tempus)
+  (package-vc-install "https://github.com/rul/org-tempus.git"))
+
+(use-package org-tempus
+  :init
+  (org-tempus-mode 1))
+
+(use-package org-remark-global-tracking
+  ;; It is recommended that `org-remark-global-tracking-mode' be
+  ;; enabled when Emacs initializes. You can set it in
+  ;; `after-init-hook'.
+  :hook after-init
+  :config
+  ;; Selectively keep or comment out the following if you want to use
+  ;; extensions for Info-mode, EWW, and NOV.el (EPUB) respectively.
+  (use-package org-remark-eww  :after eww  :config (org-remark-eww-mode +1))
+  (use-package org-remark-nov  :after nov  :config (org-remark-nov-mode +1)))
+
+(use-package org-remark
+  :bind (;; :bind keyword also implicitly defers org-remark itself.
+         ;; Keybindings before :map is set for global-map. Adjust the keybinds
+         ;; as you see fit.
+         ("C-c n m" . org-remark-mark)
+         ("C-c n l" . org-remark-mark-line)
+         :map org-remark-mode-map
+         ("C-c n o" . org-remark-open)
+         ("C-c n ]" . org-remark-view-next)
+         ("C-c n [" . org-remark-view-prev)
+         ("C-c n r" . org-remark-remove)
+         ("C-c n d" . org-remark-delete)))
+
 (provide 'rul-org)