         (buffer-list))
   (helm-org-rifle-agenda-files))
 
-(defun sa/org-return ()
-  "If at the end of a line, do something special based on the
-information about the line by calling `sa/org-special-return',
-otherwise, just call `org-return' as usual."
-  (interactive)
-  (if (eolp)
-      (sa/org-special-return)
-    (org-return)))
-
-;; From https://gitlab.com/howardabrams/spacemacs.d/
-(defun sa/org-special-return (&optional ignore)
-  "Add new list item, heading or table row with RET.
-A double return on an empty element deletes it.
-Use a prefix arg to get regular RET. "
-  (interactive "P")
-  (if ignore
-      (org-return)
-    (cond
-     ;; Open links like usual
-     ((eq 'link (car (org-element-context)))
-      (org-return))
-
-     ;; lists end with two blank lines, so we need to make sure
-     ;; we are also not at the beginning of a line to avoid a
-     ;; loop where a new entry gets created with only one blank
-     ;; line.
-     ((and (org-really-in-item-p) (not (bolp)))
-      (if (org-element-property :contents-begin (org-line-element-context))
-          (progn
-            (end-of-line)
-            (org-insert-item))
-        (delete-region (line-beginning-position) (line-end-position))
-        ))
-
-     ((org-at-heading-p)
-      (if (string= "" (org-element-property :title (org-element-context)))
-          (delete-region (line-beginning-position) (line-end-position))
-        (org-insert-heading-after-current)))
-
-     ((org-at-table-p)
-      (if (-any?
-           (lambda (x) (not (string= "" x)))
-           (nth
-            (- (org-table-current-dline) 1)
-            (org-table-to-lisp)))
-          (org-return)
-        ;; empty row
-        (beginning-of-line)
-        (setf (buffer-substring
-               (line-beginning-position) (line-end-position)) "")
-        (org-return)))
-
-     (t
-      (org-return)))))
-
 
 (defun sa/setup-org-mode (orgdir)
   """Setup org-mode configuration."""


;; Make the frame contain a single window. by default org-capture
;; splits the window.
(add-hook 'org-capture-mode-hook
          'delete-other-windows)

(defun sa/make-capture-frame ()
  "Create a new frame and run org-capture."
  (interactive)
  (make-frame '((name . "capture")
                (width . 120)
                (height . 15)))

          (format "[%s/%s (%s)" work-done-str effort-str org-clock-heading))
      (format "[%s : %s]" work-done-str org-clock-heading))))

(defun sa/clock-in ()
  (sa/local-shell-command "touch /tmp/org-clock-flag")
  (sa/notify "ORG CLOCK-IN" (sa/task-clocked-time)))
