diff --git a/config.el b/config.el index de3716c..985a792 100644 --- a/config.el +++ b/config.el @@ -42,10 +42,6 @@ ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/Nextcloud/org/") -(after! org - ;; Store org links to info pages - (add-to-list 'org-modules 'ol-info)) - ;; (defun max/org-gtd--incubate () ;; "Process GTD inbox item by incubating it. ;; Allow the user apply user-defined tags from @@ -366,26 +362,6 @@ ;; (setq ns-auto-hide-menu-bar t) -(defun max/org-clock-get-clock-string () - "Form a clock string that will be shown in polybar. -Adapted from `org-clock-get-clock-string'." - (require 'org-clock) - (when (org-clocking-p) - (let* ((currently-clocked-time - (floor (org-time-convert-to-integer - (time-since org-clock-start-time)) - 60)) - (clocked-time (org-clock-get-clocked-time)) - (current-work-done-str (org-duration-from-minutes currently-clocked-time))) - (if org-clock-effort - (let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort)) - (work-done-str (org-duration-from-minutes clocked-time)) - (effort-str (org-duration-from-minutes effort-in-minutes))) - (format "%s (%s/%s) %s" - current-work-done-str work-done-str effort-str org-clock-heading)) - (format "%s %s" - current-work-done-str - org-clock-heading))))) ;; (defun my/toggle-org-agenda () ;; "Toggle my custom org agenda view" @@ -503,3 +479,4 @@ Adapted from `org-clock-get-clock-string'." ;; load personal modules (load! "email") (load! "gtd") +(load! "org") diff --git a/org.el b/org.el new file mode 100644 index 0000000..1b7cd66 --- /dev/null +++ b/org.el @@ -0,0 +1,31 @@ +;;; org.el -*- lexical-binding: t; -*- + +(defun max/org-clock-get-clock-string () + "Form a clock string that will be shown in polybar. +Adapted from `org-clock-get-clock-string'." + (require 'org-clock) + (when (org-clocking-p) + (let* ((currently-clocked-time + (floor (org-time-convert-to-integer + (time-since org-clock-start-time)) + 60)) + (clocked-time (org-clock-get-clocked-time)) + (current-work-done-str (org-duration-from-minutes currently-clocked-time))) + (if org-clock-effort + (let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort)) + (work-done-str (org-duration-from-minutes clocked-time)) + (effort-str (org-duration-from-minutes effort-in-minutes))) + (format "%s (%s/%s) %s" + current-work-done-str work-done-str effort-str org-clock-heading)) + (format "%s %s" + current-work-done-str + org-clock-heading))))) + +(after! org + ;; Store org links to info pages + (add-to-list 'org-modules 'ol-info)) + +(map! :after org + :map org-mode-map + :localleader + "Y" #'ox-clip-image-to-clipboard)