diff options
| author | Matthew Lemon <matt@matthewlemon.com> | 2022-10-27 20:31:42 +0100 |
|---|---|---|
| committer | Matthew Lemon <matt@matthewlemon.com> | 2022-10-27 20:31:42 +0100 |
| commit | 3577c3d4b9bee411631a28b96249696f8df865e0 (patch) | |
| tree | d9129d427fb452346dbff9588545cc45a57fc97c | |
| parent | 906f403fd7fe56480c8e89b3aa86cc763263ad45 (diff) | |
| parent | e417544faeb59bd173a43147737d7214d8ac9bdc (diff) | |
fixed merge
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | myinit.org | 5 | ||||
| -rw-r--r-- | org-clock-save.el | 2 |
3 files changed, 4 insertions, 5 deletions
@@ -32,7 +32,7 @@ '("6b5c518d1c250a8ce17463b7e435e9e20faa84f3f7defba8b579d4f5925f60c1" default)) '(ledger-binary-path "hledger") '(org-agenda-files - '("~/org/journal.org" "/home/lemon/org/home.org" "/home/lemon/org/projects.org" "/home/lemon/org/work.org" "/home/lemon/org/notes.org" "/home/lemon/org/habits.org" "/home/lemon/org/calendar/cal.org")) + '("~/org/home.org" "~/org/projects.org" "~/org/journal.org" "~/org/work.org" "~/org/notes.org" "~/org/habits.org" "~/org/calendar/cal.org")) '(package-selected-packages '(elfeed-score yasnippet-snippets yasnippet browse-kill-ring expand-region ace-window amx flycheck ace-jump-mode gruvbox-theme company helm auto-package-update ledger-mode magit elfeed-org which-key use-package rainbow-delimiters paredit evil counsel))) (custom-set-faces @@ -41,12 +41,11 @@ Some agenda configuration. (setq org-directory "~/org") (setq org-agenda-files (quote ("~/org/home.org" "~/org/projects.org" + "~/org/journal.org" "~/org/work.org" "~/org/notes.org" "~/org/habits.org" - "~/org/calendar/cal.org" - "~/org/calendar/home-cal.org" - "~/org/calendar/work-cal.org"))) + "~/org/calendar/cal.org"))) (setq org-default-notes-file (concat org-directory "/notes.org")) (setq org-agenda-window-setup 'current-window) (setq org-agenda-start-with-log-mode t) diff --git a/org-clock-save.el b/org-clock-save.el index 4cf80ed..079e53a 100644 --- a/org-clock-save.el +++ b/org-clock-save.el @@ -1,2 +1,2 @@ -;; org-clock-save.el - pop-os at <2022-10-27 Thu 09:49> +;; org-clock-save.el - pop-os at <2022-10-27 Thu 19:11> (setq org-clock-stored-history '(("/home/lemon/org/archive.org" . 24934) ("/home/lemon/org/archive.org" . 61601) ("/home/lemon/org/work.org" . 1) ("/home/lemon/org/home.org" . 1))) |