Browse code
feat(emacs): move org configuration to its own directory
Edward Langley authored on 22/10/2022 20:47:07Showing 2 changed files
| ... | ... |
@@ -301,76 +301,8 @@ |
| 301 | 301 |
:ensure t) |
| 302 | 302 |
(use-package graphql |
| 303 | 303 |
:ensure t) |
| 304 |
-(use-package ob-graphql |
|
| 305 |
- :ensure t) |
|
| 306 |
-(use-package ob-http |
|
| 307 |
- :ensure t) |
|
| 308 |
-(use-package ob-restclient |
|
| 309 |
- :ensure t) |
|
| 310 | 304 |
|
| 311 |
-(defun safe-files () |
|
| 312 |
- (let ((fn (expand-file-name "~/.safe-files"))) |
|
| 313 |
- (when (file-exists-p fn) |
|
| 314 |
- (read-strings-in-file fn)))) |
|
| 315 |
- |
|
| 316 |
-(defun fwoar/mark-safe (fn) |
|
| 317 |
- (interactive (list buffer-file-name)) |
|
| 318 |
- (with-temp-buffer |
|
| 319 |
- (insert "\n") |
|
| 320 |
- (insert fn) |
|
| 321 |
- (append-to-file (point-min) (point-max) |
|
| 322 |
- (expand-file-name "~/.safe-files")))) |
|
| 323 |
- |
|
| 324 |
-(defvar-local safe-file-p nil) |
|
| 325 |
-(setf (get 'safe-file-p 'risky-local-variable) t) |
|
| 326 |
- |
|
| 327 |
-(defun fwoar/confirm-babel-evaluate (lang body) |
|
| 328 |
- (message "Buffer file name: %s" buffer-file-name) |
|
| 329 |
- (let ((result (or safe-file-p |
|
| 330 |
- (member buffer-file-name (safe-files))))) |
|
| 331 |
- (setq-local safe-file-p result) |
|
| 332 |
- (not safe-file-p))) |
|
| 333 |
- |
|
| 334 |
-(setq org-confirm-babel-evaluate 'fwoar/confirm-babel-evaluate) |
|
| 335 |
- |
|
| 336 |
-(use-package org |
|
| 337 |
- :pin "gnu" |
|
| 338 |
- :ensure t |
|
| 339 |
- :config |
|
| 340 |
- (setq org-directory "~/org" |
|
| 341 |
- org-default-notes-file (concat org-directory "/scratch.org") |
|
| 342 |
- org-refile-use-outline-path 'file |
|
| 343 |
- org-outline-path-complete-in-steps nil |
|
| 344 |
- org-log-done 'time |
|
| 345 |
- org-log-into-drawer t |
|
| 346 |
- org-capture-templates '(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks")
|
|
| 347 |
- "* TODO %?\n %i\n %a") |
|
| 348 |
- ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
|
|
| 349 |
- "* %?\nEntered on %U\n %i\n %a") |
|
| 350 |
- ("s" "Snippet" entry (file "~/org/snippets.org")
|
|
| 351 |
- "* %?\n#+BEGIN_SRC\n%i\n#+END_SRC") |
|
| 352 |
- ("b" "Bookmarks" entry (file+olp+datetree "~/org/bookmarks.org")
|
|
| 353 |
- "* %? %^g\n%c\n") |
|
| 354 |
- ("a" "Agenda" entry
|
|
| 355 |
- (file "~/org/agenda.org") |
|
| 356 |
- "* %? %^G\n SCHEDULED: %T")) |
|
| 357 |
- org-refile-targets '((nil . (:maxlevel . 2)))) |
|
| 358 |
- |
|
| 359 |
- (defvar fwoar::*lob* (f-join org-directory "lob.org")) |
|
| 360 |
- (org-babel-lob-ingest fwoar::*lob*) |
|
| 361 |
- |
|
| 362 |
- (org-babel-do-load-languages |
|
| 363 |
- 'org-babel-load-languages |
|
| 364 |
- '((restclient . t) |
|
| 365 |
- (graphql . t) |
|
| 366 |
- (http . t) |
|
| 367 |
- (emacs-lisp . t) |
|
| 368 |
- (lisp . t) |
|
| 369 |
- (haskell . t) |
|
| 370 |
- (shell . t))) |
|
| 371 |
- |
|
| 372 |
- (define-key global-map "\C-cc" 'org-capture) |
|
| 373 |
- (evil-define-key 'visual 'global (kbd "<leader>c") 'org-capture)) |
|
| 305 |
+(load-package-configuration 'org) |
|
| 374 | 306 |
|
| 375 | 307 |
(use-package delight |
| 376 | 308 |
:ensure t) |
| ... | ... |
@@ -31,49 +31,53 @@ |
| 31 | 31 |
(use-package org |
| 32 | 32 |
:ensure t |
| 33 | 33 |
:pin gnu |
| 34 |
+ :custom |
|
| 35 |
+ (org-confirm-babel-evaluate 'fwoar/confirm-babel-evaluate) |
|
| 36 |
+ (org-default-notes-file (concat org-directory "/scratch.org")) |
|
| 37 |
+ (org-directory "~/org") |
|
| 38 |
+ (org-log-done 'time) |
|
| 39 |
+ (org-log-into-drawer t) |
|
| 40 |
+ (org-refile-targets '((nil . (:maxlevel . 2)))) |
|
| 34 | 41 |
:config |
| 35 |
- (setq org-directory "~/org" |
|
| 36 |
- org-confirm-babel-evaluate 'fwoar/confirm-babel-evaluate |
|
| 37 |
- org-default-notes-file (concat org-directory "/scratch.org") |
|
| 38 |
- org-refile-use-outline-path 'file |
|
| 39 |
- org-outline-path-complete-in-steps nil |
|
| 40 |
- org-log-done 'time |
|
| 41 |
- org-log-into-drawer t |
|
| 42 |
- org-capture-templates '(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks")
|
|
| 43 |
- "* TODO %?\n %i\n %a") |
|
| 44 |
- ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
|
|
| 45 |
- "* %?\nEntered on %U\n %i\n %a") |
|
| 46 |
- ("s" "Snippet" entry (file "~/org/snippets.org")
|
|
| 47 |
- "* %?\n#+BEGIN_SRC\n%i\n#+END_SRC") |
|
| 48 |
- ("b" "Bookmarks" entry (file+olp+datetree "~/org/bookmarks.org")
|
|
| 49 |
- "* %? %^g\n%c\n") |
|
| 50 |
- ("a" "Agenda" entry
|
|
| 51 |
- (file "~/org/agenda.org") |
|
| 52 |
- "* %? %^G\n SCHEDULED: %T")) |
|
| 53 |
- org-refile-targets '((nil . (:maxlevel . 2)))) |
|
| 42 |
+ (comment |
|
| 43 |
+ (setq org-refile-use-outline-path 'file |
|
| 44 |
+ org-outline-path-complete-in-steps nil |
|
| 45 |
+ org-capture-templates '(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks")
|
|
| 46 |
+ "* TODO %?\n %i\n %a") |
|
| 47 |
+ ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
|
|
| 48 |
+ "* %?\nEntered on %U\n %i\n %a") |
|
| 49 |
+ ("s" "Snippet" entry (file "~/org/snippets.org")
|
|
| 50 |
+ "* %?\n#+BEGIN_SRC\n%i\n#+END_SRC") |
|
| 51 |
+ ("b" "Bookmarks" entry (file+olp+datetree "~/org/bookmarks.org")
|
|
| 52 |
+ "* %? %^g\n%c\n") |
|
| 53 |
+ ("a" "Agenda" entry
|
|
| 54 |
+ (file "~/org/agenda.org") |
|
| 55 |
+ "* %? %^G\n SCHEDULED: %T")))) |
|
| 54 | 56 |
|
| 55 | 57 |
(org-babel-do-load-languages |
| 56 | 58 |
'org-babel-load-languages |
| 57 |
- '((restclient . t) |
|
| 59 |
+ '((emacs-lisp . t) |
|
| 58 | 60 |
(graphql . t) |
| 61 |
+ (haskell . t) |
|
| 59 | 62 |
(http . t) |
| 60 |
- (emacs-lisp . t) |
|
| 61 | 63 |
(lisp . t) |
| 62 |
- (haskell . t))) |
|
| 64 |
+ (restclient . t) |
|
| 65 |
+ (shell . t))) |
|
| 63 | 66 |
|
| 64 | 67 |
(define-key global-map "\C-cc" 'org-capture) |
| 65 | 68 |
(evil-define-key 'visual 'global (kbd "<leader>c") 'org-capture)) |
| 66 | 69 |
|
| 67 |
-(use-package org-projectile |
|
| 68 |
- :ensure t |
|
| 69 |
- :after org company |
|
| 70 |
- :config |
|
| 71 |
- (progn |
|
| 72 |
- (org-projectile-per-project) |
|
| 73 |
- (setq org-agenda-skip-unavailable-files t) |
|
| 74 |
- (setq org-projectile-per-project-filepath |
|
| 75 |
- "notes/README.org") |
|
| 76 |
- (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files))) |
|
| 77 |
- (push (org-projectile-project-todo-entry) org-capture-templates) |
|
| 78 |
- (define-key projectile-mode-map (kbd "C-c c") 'org-capture)) |
|
| 79 |
- :ensure t) |
|
| 70 |
+(comment |
|
| 71 |
+ (use-package org-projectile |
|
| 72 |
+ :ensure t |
|
| 73 |
+ :after org company |
|
| 74 |
+ :config |
|
| 75 |
+ (progn |
|
| 76 |
+ (org-projectile-per-project) |
|
| 77 |
+ (setq org-agenda-skip-unavailable-files t) |
|
| 78 |
+ (setq org-projectile-per-project-filepath |
|
| 79 |
+ "notes/README.org") |
|
| 80 |
+ (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files))) |
|
| 81 |
+ (push (org-projectile-project-todo-entry) org-capture-templates) |
|
| 82 |
+ (define-key projectile-mode-map (kbd "C-c c") 'org-capture)) |
|
| 83 |
+ :ensure t)) |