From eff555a2e144586a1cf2b733afae1f14702ca281 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Sun, 23 Aug 2020 11:45:55 -0500
Subject: [PATCH] Change org agenda root folder

---
 config-org.org                         | 4 ++--
 lisp/org-config/my-org-agenda-files.el | 2 +-
 my-bookmarks                           | 2 +-
 my-redefs.org                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config-org.org b/config-org.org
index a918613..b483e52 100644
--- a/config-org.org
+++ b/config-org.org
@@ -772,7 +772,7 @@
         (setq gitwatch-process
               (start-process-shell-command "gitwatch"
                                            nil
-                                           "~/bin/gitwatch -r origin -b laptop -m 'Gitwatch commit: %d' ~/MEGA/org/2019-05-agenda"))))
+                                           "~/bin/gitwatch -r origin -b laptop -m 'Gitwatch commit: %d' ~/MEGA/org/agenda"))))
     (defun kill-gitwatch ()
       (interactive)
       (when (and gitwatch-process
@@ -798,7 +798,7 @@
 
   (defun org-update-main ()
     (interactive)
-    (let ((default-directory "~/MEGA/org/2019-05-agenda"))
+    (let ((default-directory "~/MEGA/org/agenda"))
       (kill-gitwatch)
       ;; Make sure local changes are committed
       (when (magit-changed-files "HEAD")
diff --git a/lisp/org-config/my-org-agenda-files.el b/lisp/org-config/my-org-agenda-files.el
index ffd22aa..3bf028f 100644
--- a/lisp/org-config/my-org-agenda-files.el
+++ b/lisp/org-config/my-org-agenda-files.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 (defconst my/org-folder "~/MEGA/org")
-(defconst my/agenda-folder (expand-file-name "2019-05-agenda" my/org-folder))
+(defconst my/agenda-folder (expand-file-name "agenda" my/org-folder))
 
 (defun my/org-file (str)
   (expand-file-name str my/org-folder))
diff --git a/my-bookmarks b/my-bookmarks
index 92733de..629933e 100644
--- a/my-bookmarks
+++ b/my-bookmarks
@@ -23,7 +23,7 @@
  (rear-context-string)
  (position . 1))
 ("Refile Location"
- (filename . "~/MEGA/org/2019-05-agenda/refile.org")
+ (filename . "~/MEGA/org/agenda/refile.org")
  (front-context-string)
  (rear-context-string . "6-07 Fri 16:15]\n")
  (position . 5681))
diff --git a/my-redefs.org b/my-redefs.org
index 2baeb01..64fa230 100644
--- a/my-redefs.org
+++ b/my-redefs.org
@@ -448,7 +448,7 @@ https://github.com/org-trello/org-trello/issues/258
 * Auto commit when saving org files
 #+begin_src emacs-lisp
   (defvar org-agenda-auto-commit nil)
-  (defconst org-agenda-git-repo-path (expand-file-name "~/MEGA/org/2019-05-agenda"))
+  (defconst org-agenda-git-repo-path (expand-file-name "~/MEGA/org/agenda"))
 
   (defun my/toggle-auto-commit ()
     (interactive)