1.1--- a/.emacs.d/ellis.el	Fri Aug 23 19:12:13 2024 -0400
     1.2+++ b/.emacs.d/ellis.el	Fri Aug 30 17:07:30 2024 -0400
     1.3@@ -30,12 +30,10 @@
     1.4 
     1.5 (defalias 'make #'compile)
     1.6 
     1.7-(setopt default-theme 'ef-dream
     1.8+(setq default-theme 'ef-dark
     1.9         user-lab-directory (join-paths user-home-directory "lab")
    1.10         company-source-directory (join-paths user-home-directory "comp"))
    1.11 
    1.12-;; (unless (display-graphic-p) (setq default-theme 'wheatgrass))
    1.13-
    1.14 (when (linux-p) (setq dired-listing-switches "-alsh"))
    1.15 
    1.16 (defvar emacs-config-source (join-paths company-source-directory "core/emacs"))
    1.17@@ -88,8 +86,8 @@
    1.18 ;; (add-hook 'prog-mode-hook #'company-mode)
    1.19 
    1.20 (add-hook 'notmuch-message-mode-hook #'turn-on-orgtbl)
    1.21-(
    1.22-ouse-package ef-themes :ensure t)
    1.23+
    1.24+(use-package ef-themes :ensure t)
    1.25 
    1.26 (use-package markdown-mode :ensure t)
    1.27 
    1.28@@ -240,9 +238,10 @@
    1.29 (use-package sh-script
    1.30   :hook (sh-mode . flymake-mode))
    1.31 
    1.32+;;; Diary
    1.33+(setq diary-list-include-blanks t)
    1.34 ;;; Org Config
    1.35 (setq publish-dir "/ssh:rurik:/srv/http/compiler.company")
    1.36-(keymap-set user-map "t" #'org-todo)
    1.37 
    1.38 ;; populate org-babel
    1.39 (org-babel-do-load-languages
    1.40@@ -261,6 +260,20 @@
    1.41 			     (python . t)
    1.42 			     (lua . t)
    1.43 			     (lilypond . t)))
    1.44+
    1.45+;; timeline
    1.46+(use-package org-timeline
    1.47+  :load-path user-emacs-lib-directory
    1.48+  :hook (org-agenda-finalize . org-timeline-insert-timeline)
    1.49+  :init
    1.50+  (setq
    1.51+   org-timeline-insert-before-text "›"
    1.52+   org-timeline-beginning-of-day-hour 8
    1.53+   org-timeline-keep-elapsed 2
    1.54+   org-timeline-start-hour 5
    1.55+   org-timeline-show-text-in-blocks t
    1.56+   org-timeline-prepend t))
    1.57+
    1.58 ;;; IRC
    1.59 (setq erc-format-nick-function 'erc-format-@nick)
    1.60 
    1.61@@ -565,23 +578,21 @@
    1.62      files)
    1.63     files))
    1.64 
    1.65-(defvar org-agenda-directories (list org-directory
    1.66-                                     ;; (join-paths user-lab-directory "org")
    1.67-                                     (join-paths company-source-directory "org/*")
    1.68-                                     (join-paths company-source-directory "org/*/*"))
    1.69+(defvar org-agenda-directories (list (join-paths company-source-directory "org/plan")
    1.70+                                     (join-paths company-source-directory "org/plan/tasks"))
    1.71   "List of directories containing org files.")
    1.72+
    1.73 (defvar org-agenda-extensions '(".org")
    1.74   "List of extensions of agenda files")
    1.75 
    1.76 (defun org-set-agenda-files ()
    1.77   (interactive)
    1.78   (setq org-agenda-files
    1.79-        (cl-remove-if (lambda (x) (or
    1.80-                                   (string= "archive.org" (file-name-nondirectory x))
    1.81-                                   (string= "archive" (file-name-directory x))))
    1.82-        (org-list-files
    1.83-         org-agenda-directories
    1.84-         org-agenda-extensions))))
    1.85+        (cons org-inbox-file
    1.86+              (cl-remove-if (lambda (x) (string= "readme.org" (file-name-nondirectory x)))
    1.87+                            (org-list-files
    1.88+                             org-agenda-directories
    1.89+                             org-agenda-extensions)))))
    1.90 
    1.91 (with-eval-after-load 'org
    1.92   (org-set-agenda-files))
    1.93@@ -751,5 +762,32 @@
    1.94 ;;   (cl-pushnew '("Terms" . glossary) org-glossary-headings)
    1.95 ;;   (cl-pushnew '("Acronyms" . acronym) org-glossary-headings))
    1.96 
    1.97+;;; Calc
    1.98+(setq calc-highlight-selections-with-faces t)
    1.99+(cl-pushnew '(lisp-mode "#| " "|#
   1.100+") calc-embedded-open-close-mode-alist)
   1.101+(cl-pushnew '(emacs-lisp-mode ";; " "
   1.102+") calc-embedded-open-close-mode-alist)
   1.103+
   1.104+(defun calc-eval-region (arg beg end)
   1.105+  "Calculate the region and display the result in the echo area.
   1.106+With prefix ARG non-nil, insert the result at the end of region."
   1.107+  (interactive "P\nr")
   1.108+  (let* ((expr (buffer-substring-no-properties beg end))
   1.109+         (result (calc-eval expr)))
   1.110+    (if (null arg)
   1.111+        (message "%s = %s" expr result)
   1.112+      (goto-char end)
   1.113+      (save-excursion
   1.114+        (insert result)))))
   1.115+
   1.116+(defun calc-embedded-formula-to-stack ()
   1.117+  (interactive)
   1.118+  (save-excursion
   1.119+    (save-match-data
   1.120+     (calc-embedded-find-bounds)))
   1.121+  (let ((eq-str (buffer-substring calc-embed-top calc-embed-bot)))
   1.122+    (calc-eval eq-str 'push)))
   1.123+
   1.124 (provide 'ellis)
   1.125 ;; ellis.el ends here