From 9769754f56b0179d0dca82462b0c23c6941dd23c Mon Sep 17 00:00:00 2001 From: Anne Date: Tue, 18 Mar 2025 23:58:20 +0100 Subject: [PATCH] Updated init.el.org --- init.el.org | 75 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/init.el.org b/init.el.org index aba5a32..4eb2007 100644 --- a/init.el.org +++ b/init.el.org @@ -1,6 +1,6 @@ #+title: init.el.org #+date: [2025-03-18 Tue] -#+lastmod: [2025-03-18 Tue 14:57] +#+lastmod: [2025-03-18 Tue 20:37] #+draft: false #+tags: emacs @@ -28,6 +28,12 @@ Or view this file on my blog: [[https://blog.minded.net/emacs][blog.minded.net/e user-mail-address "anne@minded.net") #+end_src +** System + +#+begin_src elisp + (setq laptop-p (equal (system-name) "siskin")) +#+end_src + ** Use-package [[https://github.com/jwiegley/use-package]] @@ -129,13 +135,13 @@ A bigger frame for the gui of Emacs. I do like the menu bar after all. #+begin_src elisp + (if laptop-p (scroll-bar-mode -1)) (tool-bar-mode -1) ;;(menu-bar-mode -1) - (scroll-bar-mode -1) (tooltip-mode -1) #+end_src -*** Column and line numbers +*** Mode line column and line numbers [[https://www.gnu.org/software/emacs/manual/html_node/efaq/Displaying-the-current-line-or-column.html]] @@ -275,6 +281,7 @@ when running in text terminal. #+begin_src elisp (use-package xclip + :if laptop-p :init (xclip-mode 1)) #+end_src @@ -532,12 +539,13 @@ Helm is an Emacs framework for incremental completions and narrowing selections. ** Org Mode -*** Org Mode +*** Org Mode on my laptop [[https://orgmode.org/org.html]] #+begin_src elisp (use-package org + :if laptop-p :bind (("C-c l" . org-store-link) ("C-c a" . org-agenda) @@ -548,10 +556,10 @@ Helm is an Emacs framework for incremental completions and narrowing selections. org-attach-id-dir "~/org/data/") ;;(setq org-agenda-text-search-extra-files (directory-files-recursively "~/org/" "\\.org$")) (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) - (setq org-startup-indented t + (setq org-startup-indented nil org-pretty-entities t org-hide-emphasis-markers t - org-hide-leading-stars t + org-hide-leading-stars nil org-startup-with-inline-images t org-image-actual-width '(300) org-tags-column 0 @@ -565,8 +573,8 @@ Helm is an Emacs framework for incremental completions and narrowing selections. ;;(setq org-blank-before-new-entry (quote ((heading) (plain-list-item)))) (advice-add 'org-refile :after 'org-save-all-org-buffers) (setq org-capture-templates - '(("t" "Task" entry (file "~/org/agenda/todo.org") "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:" :empty-lines 1) - ("n" "Note" entry (file org-default-notes-file) "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:" :empty-lines 1) + '(("t" "Task" entry (file "~/org/agenda/todo.org") "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:" :empty-lines 1) + ("n" "Note" entry (file org-default-notes-file) "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:" :empty-lines 1) ("j" "Journal entry" entry (file+olp+datetree "~/org/journal.org") "* %?" :unnarrowed t :empty-lines-after 1) ("J" "Journal entry on date" entry (file+olp+datetree "~/org/journal.org") "* %?" :time-prompt t :unnarrowed t :empty-lines-after 1) ("m" "Meeting" entry (file+olp+datetree "~/org/agenda/agenda.org") "* %?\n%T" :time-prompt t :tree-type month :empty-lines 1) @@ -577,6 +585,40 @@ Helm is an Emacs framework for incremental completions and narrowing selections. (sequence "TOWATCH(w)" "WATCHING" "|" "WATCHED")))) #+end_src +*** Org Mode on other systems + +#+begin_src elisp + (use-package org + :if (not laptop-p) + :bind + (("C-c l" . org-store-link) + ("C-c a" . org-agenda) + ("C-c c" . org-capture)) + :config + (setq org-directory "~/org" + org-default-notes-file "~/org/notes.org" + org-agenda-files '("~/org")) + (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) + (setq org-startup-indented nil + org-pretty-entities t + org-hide-emphasis-markers t + org-hide-leading-stars nil + org-startup-with-inline-images t + org-image-actual-width '(300) + org-tags-column 0 + org-log-done 'time + org-log-into-drawer t + org-deadline-warning-days 7 + org-refile-targets '((org-agenda-files :maxlevel . 5)) + org-refile-use-outline-path 'file + org-outline-path-complete-in-steps nil + org-refile-allow-creating-parent-nodes 'confirm) + (advice-add 'org-refile :after 'org-save-all-org-buffers) + (setq org-capture-templates + '(("t" "Task" entry (file org-default-notes-file) "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:CONTEXT: %a\n:END:" :empty-lines 1) + ("n" "Note" entry (file org-default-notes-file) "* %?\n:PROPERTIES:\n:CREATED: %U\n:CONTEXT: %a\n:END:" :empty-lines 1)))) +#+end_src + *** Helm-org [[https://github.com/emacs-helm/helm-org]] @@ -595,6 +637,7 @@ Helm is an Emacs framework for incremental completions and narrowing selections. #+begin_src elisp (use-package org-super-agenda + :if laptop-p :after org-agenda :init (setq org-agenda-files '("~/org" "~/org/agenda" "~/org/notes")) @@ -682,13 +725,15 @@ Helm is an Emacs framework for incremental completions and narrowing selections. :config (org-super-agenda-mode t)) - (defun pop-to-org-agenda (&optional split) - (interactive "P") - (org-agenda nil "d") - (delete-other-windows) - (treemacs) - (windmove-right)) - (global-set-key (kbd "") 'pop-to-org-agenda) + (if laptop-p + (defun pop-to-org-agenda (&optional split) + (interactive "P") + (org-agenda nil "d") + (delete-other-windows) + (treemacs) + (windmove-right))) + (if laptop-p + (global-set-key (kbd "") 'pop-to-org-agenda)) #+end_src *** Org-appear