Implemented org changes, caldav changes and which-key works now.

3 files changed, 19 insertions, 8 deletions

diff --git a/.org-id-locations b/.org-id-locations
new file mode 100644
index 0000000..0917963
--- /dev/null
+++ b/.org-id-locations
@@ -0,0 +1,2 @@
+
+(("/linux-storage/Nextcloud/org/todo.org" "8d85e016-27c7-47c2-8c8a-7e5e1607c0b6" "d501d8ed-2cf9-418e-9ab9-e4dda10dbece" "7b2817e4-47e1-4bda-bd49-6c18a8a04a27" "885f1c77-c1ab-42e7-8bdd-af0a9637a316" "968c8d29-2b64-4783-a0b0-1aaa1807ad53" "ef73113e-629c-43f3-9b21-c25f73632a4c" "922d071e-925c-4f2f-b447-34e8558ebac9" "8d65c7da-5448-4a46-97a6-36de63170e99" "1709507a-830b-44eb-9826-b51c2015893e" "1c79573f-b83b-4515-b9ef-5fc4e1417158" "3cb9075d-c273-4c8d-a276-887896ccae0a" "5dd6bff6-421f-4193-bd5c-37b0a0bbe8c6" "0905a216-111a-40ab-8018-ce7eb4b7c8db" "82c39523-4e53-4b5e-a5b0-066d4ce30227" "ac8c43c1-f095-41cf-b1e6-ebd0308f4516" "56a15433-ca73-4c0d-ad89-fb70f2fd65a5" "8d42c25f-f660-428a-b5e1-0cfb2e2c227e" "8b57c16d-924c-4a51-800c-ffae59519dcc" "b9d34fb2-6802-43fd-8f73-4bea129f6444" "ab06fd63-5071-46f4-a404-7930b5a21a42" "013238c4-b1bf-4ad7-be31-6fc9bada3f5d" "050938d0-ca9d-41d6-862c-c56a167c41da" "66c513e0-1383-4e26-949a-325774526cd9" "5b208996-7c92-47cd-987e-dcd6bbbd8585" "7180847b-ec55-4830-9b88-d5938684a9ca" "4f5ee41d-956d-4456-a11a-fa285cbfbc29" "c760eb97-f1b6-4ec1-970d-ff152738f5da" "dec71639-e43b-4f65-8891-86d5a71eda28" "f95e72fe-8595-408c-bd16-657fd1eb5c7d" "f2ab9533-20fb-4b1c-9cb1-07150c18769f" "e1e282b6-9907-4d58-bc7e-a3253bca04c3" "af663e50-44d4-4c42-9195-d49abc3b6eb2" "5f14458b-d982-4d9e-a7f9-61a6bf5e555a" "08187aaf-c61b-4a9e-bc3c-cf4329d1c548" "e68da6b0-69ed-45ec-a2ba-045ac0ffad4d" "7f609104-ae7d-4be2-86e1-ee5a289b0e58" "ce119a2a-bcf9-4222-91f4-1dbc28a45a4c" "66c01906-b837-4885-9216-383fd2fe3b65") ("/linux-storage/Nextcloud/org/cal.org" "e69e5a31-412a-4dc9-b3d8-6d738acdfd58"))
diff --git a/custom-settings.el b/custom-settings.el
index 6bc6af1..d23eaf9 100644
--- a/custom-settings.el
+++ b/custom-settings.el
@@ -38,10 +38,10 @@
  '(nrepl-message-colors
    (quote
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
- '(org-sort-agenda-notime-is-late nil t)
+ '(org-sort-agenda-notime-is-late nil)
  '(package-selected-packages
    (quote
-    (which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
+    (org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
  '(pdf-view-midnight-colors (quote ("#fdf4c1" . "#282828")))
  '(pos-tip-background-color "#36473A")
  '(pos-tip-foreground-color "#FFFFC8")
diff --git a/init.el b/init.el
index 9b7d551..aa95f63 100644
--- a/init.el
+++ b/init.el
@@ -43,6 +43,14 @@
 (tooltip-mode -1)
 (menu-bar-mode -1)
 
+;; org-caldav
+(use-package org-caldav
+  :config
+  (setq org-caldav-url "https://ronver.xyz/remote.php/dav/calendars/mrlemon")
+  (setq org-caldav-calendar-id "org-home")
+  (setq org-caldav-inbox "~/Nextcloud/org/inbox_cal.org")
+  (setq org-caldav-files `("~/Nextcloud/org/cal.org")))
+
 ;; fonts
 (when (eq system-type 'gnu/linux)
   (set-frame-font "Fira Code Retina 13")
@@ -114,7 +122,7 @@
 
 ;; Don't ring the system bell
 (setq visible-bell t)
-
+p
 ;; Use a separation file for custom commands
 (setq custom-file "~/.emacs.d/custom-settings.el")
 (load custom-file t)
@@ -198,8 +206,10 @@
                  "* %?\nEntered on %U\n %i\n %a")
                 ("e" "Emacs Tip" entry (file+headline "~/Nextcloud/org/emacs-tips.org" "Emacs Tips")
                  "* %?\n %i\n %a"))))
+  ;; Put state transition logs into a drawer called LOGBOOK
+  (setq org-log-into-drawer t)
   (setq org-todo-keywords
-      (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
+      (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d@)")
               (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" "PHONE" "MEETING" "PROJECT"))))
   (setq org-todo-keyword-faces
         (quote (("TODO" :foreground "red" :weight bold)
@@ -226,7 +236,6 @@
         '((?A . (:foreground "#CC0000" :background "#FFE3E3"))
     (?B . (:foreground "#64992C" :background "#EBF4DD"))
     (?C . (:foreground "#64992C" :background "#FFFFFF"))))
-
   (setq org-ellipsis "...")
   )
 
@@ -239,8 +248,8 @@
 
 ;; Which key
 (use-package which-key
-  :hook ('org-mode-hook . 'which-key-mode)
-  :hook ('cider-mode-hook . 'which-key-mode))
+  :hook ((org-mode . which-key-mode)
+         (cider-mode . which-key-mode)))
 
 ;; Python programming
 (use-package elpy
@@ -269,7 +278,7 @@
   (add-to-list 'auto-mode-alist '("\\.go\\'" . go-mode)))
 
 (use-package lsp-ui
-  :hook (lsp-mode-hook . lsp-ui-mode)
+  :hook (lsp-mode . lsp-ui-mode)
   :commands lsp-ui-mode
   :init)