From 3eede969e90055f77042bb0831ec97fc51dd6f3c Mon Sep 17 00:00:00 2001
From: Vedang Manerikar <ved.manerikar@gmail.com>
Date: Thu, 12 Dec 2024 21:22:18 +0530
Subject: [PATCH] Move personal settings to vedang-personal
And fallback to defaults for other users.
---
custom-lisp/vedang-personal.el | 14 +++++++++++++
init.el | 2 ++
unravel-emacs.org | 35 +++++++++++++++++++++++++++++---
unravel-modules/unravel-langs.el | 3 ++-
unravel-modules/unravel-org.el | 4 ++--
5 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/custom-lisp/vedang-personal.el b/custom-lisp/vedang-personal.el
index 1ad14ee..50576cd 100644
--- a/custom-lisp/vedang-personal.el
+++ b/custom-lisp/vedang-personal.el
@@ -4,6 +4,20 @@
:config
(setq user-mail-address "vedang@unravel.tech"))
+(use-package org
+ :ensure nil
+ :config
+ (setq org-default-notes-file
+ (expand-file-name "brain/daily.org" org-directory))
+ (setq org-blogpost-file
+ (expand-file-name "brain/projects/blogposts.org" org-directory))
+ (setq org-company-file
+ (expand-file-name "brain/daily.org" org-directory))
+ (setq org-agenda-files
+ (append (list org-default-notes-file
+ (expand-file-name "brain/projects" org-directory)
+ (expand-file-name "brain/areas/prm.org" org-directory)))))
+
;;;; org-capture
(use-package org-capture
:ensure nil
diff --git a/init.el b/init.el
index 42916bc..2444747 100644
--- a/init.el
+++ b/init.el
@@ -120,6 +120,8 @@ making an abbreviation to a function."
(require 'unravel-org)
(require 'unravel-shell)
(require 'unravel-langs)
+;;; Comment this next line if you don't want to use my personal
+;;; settings (like specific directories or org variables)
(require 'vedang-personal)
;; Name the default frame
diff --git a/unravel-emacs.org b/unravel-emacs.org
index 1b950ce..891211b 100644
--- a/unravel-emacs.org
+++ b/unravel-emacs.org
@@ -454,6 +454,8 @@ Now we are ready to load our per-module configuration files:
(require 'unravel-org)
(require 'unravel-shell)
(require 'unravel-langs)
+ ;;; Comment this next line if you don't want to use my personal
+ ;;; settings (like specific directories or org variables)
(require 'vedang-personal)
#+end_src
@@ -3722,6 +3724,8 @@ done at a specific time, such as coaching sessions ([[#h:f8f06938-0dfe-45c3-b4cf
:CUSTOM_ID: h:e03df1e0-b43e-49b5-978e-6a511165617c
:END:
+By default, Org looks for files in the =~/org= directory. If you want to use a location other than the default localtion for your ~org-mode~ files, set the environment variable ~ORG_DIRECTORY~.
+
#+begin_quote
Org, also known as "Org mode", is one of the potentially most useful
feature sets available to every Emacs user. At its core, Org is a
@@ -3762,8 +3766,8 @@ on how I use Org.
(use-package org
:ensure nil
:init
- (setq org-directory (expand-file-name "~/Tresors/Documents/diary"))
- (setq org-default-notes-file (expand-file-name "brain/daily.org" org-directory))
+ (when (getenv "ORG_DIRECTORY")
+ (setq org-directory (expand-file-name (getenv "ORG_DIRECTORY"))))
(setq org-imenu-depth 7)
(add-to-list 'safe-local-variable-values '(org-hide-leading-stars . t))
@@ -4947,6 +4951,8 @@ Use the entry point ~M-x dictionary-search~
:CUSTOM_ID: h:e86a66dc-7ef9-4f09-ad7e-946de2034e8d
:END:
+By default, Denote looks for files in the =~/Documents/notes/= directory. If you want to use a location other than the default localtion for your ~denote~ files, set the environment variable ~DENOTE_DIRECTORY~.
+
#+begin_quote
This is another one of my packages and is extended by my
~consult-denote~ package ([[#h:ee82e629-fb05-4c75-9175-48a760a25691][The =unravel-langs.el= integration between Consult and Denote (~consult-denote~)]]).
@@ -5047,7 +5053,8 @@ Prot is the developer and maintainer of this package.
(require 'denote-org-extras)
;; Remember to check the doc strings of those variables.
- (setq denote-directory (expand-file-name "~/Tresors/Documents/diary/notes"))
+ (when (getenv "DENOTE_DIRECTORY")
+ (setq denote-directory (expand-file-name (getenv "DENOTE_DIRECTORY"))))
(setq denote-infer-keywords t)
(setq denote-sort-keywords t)
(setq denote-excluded-directories-regexp "data") ; external data related to headings is stored in these directories (web archives)
@@ -6291,6 +6298,28 @@ I want this section to contain all the personal configuration that anyone using
#+end_src
+*** My personal settings for ~org~
+:PROPERTIES:
+:CUSTOM_ID: h:5E428EA8-8889-411A-A63B-70E33F12DBF0
+:CREATED: [2024-12-12 Thu 19:39]
+:END:
+
+#+begin_src emacs-lisp :tangle "custom-lisp/vedang-personal.el"
+ (use-package org
+ :ensure nil
+ :config
+ (setq org-default-notes-file
+ (expand-file-name "brain/daily.org" org-directory))
+ (setq org-blogpost-file
+ (expand-file-name "brain/projects/blogposts.org" org-directory))
+ (setq org-company-file
+ (expand-file-name "brain/daily.org" org-directory))
+ (setq org-agenda-files
+ (append (list org-default-notes-file
+ (expand-file-name "brain/projects" org-directory)
+ (expand-file-name "brain/areas/prm.org" org-directory)))))
+#+end_src
+
*** My personal settings for ~org-capture~
:PROPERTIES:
:CUSTOM_ID: h:12636C22-D561-4726-8B37-10BD21737D54
diff --git a/unravel-modules/unravel-langs.el b/unravel-modules/unravel-langs.el
index 631640e..03d6117 100644
--- a/unravel-modules/unravel-langs.el
+++ b/unravel-modules/unravel-langs.el
@@ -196,7 +196,8 @@
(require 'denote-org-extras)
;; Remember to check the doc strings of those variables.
- (setq denote-directory (expand-file-name "~/Tresors/Documents/diary/notes"))
+ (when (getenv "DENOTE_DIRECTORY")
+ (setq denote-directory (expand-file-name (getenv "DENOTE_DIRECTORY"))))
(setq denote-infer-keywords t)
(setq denote-sort-keywords t)
(setq denote-excluded-directories-regexp "data") ; external data related to headings is stored in these directories (web archives)
diff --git a/unravel-modules/unravel-org.el b/unravel-modules/unravel-org.el
index 1ba8b7b..e132c78 100644
--- a/unravel-modules/unravel-org.el
+++ b/unravel-modules/unravel-org.el
@@ -49,8 +49,8 @@
(use-package org
:ensure nil
:init
- (setq org-directory (expand-file-name "~/Tresors/Documents/diary"))
- (setq org-default-notes-file (expand-file-name "brain/daily.org" org-directory))
+ (when (getenv "ORG_DIRECTORY")
+ (setq org-directory (expand-file-name (getenv "ORG_DIRECTORY"))))
(setq org-imenu-depth 7)
(add-to-list 'safe-local-variable-values '(org-hide-leading-stars . t))