From e9e5696bc95d34aad8eb561d7458ac21b06359b0 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Sun, 28 Apr 2024 20:59:39 -0500 Subject: bug fixing, repo changes, etc. - add font lock studio, - don't disable Emacs native vc backend functions - change elpa mirror location - change default location for localrepo - update packages - add constant for journals directory and ensure it exists on launch - move project file to org-roam - add remote repository reset to scripts folder --- modules/config-utilities.el | 10 ++++++++-- modules/local-repository.el | 5 ++--- modules/org-roam-config.el | 2 +- modules/user-constants.el | 6 +++++- modules/vc-config.el | 1 - 5 files changed, 16 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/config-utilities.el b/modules/config-utilities.el index aeeed5fc8..c6942015b 100644 --- a/modules/config-utilities.el +++ b/modules/config-utilities.el @@ -104,8 +104,14 @@ Will recompile natively if supported, or byte-compiled if not." (cl-sort features-vec 'string-lessp) (cl-loop for x across features-vec do (insert (format " - %-25s: %s\n" x - (locate-library (symbol-name x)))))) - (goto-char (point-min)))) + (locate-library (symbol-name x)))))) + (goto-char (point-min)))) + +;; ------------------------------ Font Lock Studio ----------------------------- +;; debugger for font lock keywords + +(use-package font-lock-studio + :demand t) (provide 'config-utilities) ;;; config-utilities.el ends here diff --git a/modules/local-repository.el b/modules/local-repository.el index bb8c2770c..99e95c836 100644 --- a/modules/local-repository.el +++ b/modules/local-repository.el @@ -24,7 +24,8 @@ Used for the package-archive and package-archive-priorities lists.") A higher value means higher priority. If you want your local packages to be preferred, this must be a higher number than any other repositories.") -(defcustom localrepo-repository-location (concat user-emacs-directory "/localrepo") +(defcustom localrepo-repository-location + (concat user-emacs-directory "/.localrepo") "The location of the local repository. It's a good idea to keep this with the rest of your configuration files and keep them in source control.") @@ -44,7 +45,5 @@ keep them in source control.") (add-to-list 'package-archive-priorities (localrepo-repository-id . localrepo-repository-priority)))) - - (provide 'local-repository) ;;; local-repository.el ends here. diff --git a/modules/org-roam-config.el b/modules/org-roam-config.el index d6c437b28..ede2025f9 100644 --- a/modules/org-roam-config.el +++ b/modules/org-roam-config.el @@ -13,7 +13,7 @@ :defer .5 :custom (org-roam-directory roam-dir) - (org-roam-dailies-directory "journal/") + (org-roam-dailies-directory journals-dir) (org-roam-completion-everywhere t) (org-roam-dailies-capture-templates '(("d" "default" entry "* %<%I:%M:%S %p %Z> %?" diff --git a/modules/user-constants.el b/modules/user-constants.el index 97cba1f46..56c0f2f91 100644 --- a/modules/user-constants.el +++ b/modules/user-constants.el @@ -46,6 +46,9 @@ (defconst roam-dir (concat sync-dir "roam/") "The location of org-roam files.") +(defconst journals-dir (concat roam-dir "journals/") + "The location of org-roam dailies or journals files.") + (defconst drill-dir (concat sync-dir "drill/") "The location of org-drill org files.") @@ -94,7 +97,8 @@ ;; ------------------------- Verify Or Create Constants ------------------------ (mapc 'cj/verify-or-create-dir (list sync-dir - roam-dir + roam-dir + journals-dir snippets-dir)) (mapc 'cj/verify-or-create-file (list schedule-file diff --git a/modules/vc-config.el b/modules/vc-config.el index 769825a8c..4205b0e07 100644 --- a/modules/vc-config.el +++ b/modules/vc-config.el @@ -25,7 +25,6 @@ :custom (magit-define-global-key-bindings 'default) :config - (setf vc-handled-backends nil) ;; magit is the only vc interface I use (setq magit-bury-buffer-function 'magit-restore-window-configuration) (setq git-commit-major-mode 'org-mode) ;; edit commit messages in org-mode (setq magit-display-buffer-function -- cgit v1.2.3