36
Comparing 6bcdbaa..49c790e · tecosaur/emacs-config · GitHub
source link: https://github.com/tecosaur/emacs-config/compare/6bcdbaa..49c790e
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.
Showing
with
367 additions
and 1 deletion.
| @@ -452,6 +452,19 @@ For editing systemd unit files | ||
| (package! systemd :pin "51c148e09a") | ||
| #+END_SRC | ||
| *** Org Mode | ||
| **** Improve agenda/capture | ||
| The agenda is nice, but a souped up version is nicer. | ||
| #+BEGIN_SRC emacs-lisp | ||
| (package! org-super-agenda :pin "dd0d104c26") | ||
| #+END_SRC | ||
| Similarly ~doct~ (Declarative Org Capture Templates) seems to be a nicer way to | ||
| set up org-capture. | ||
| #+BEGIN_SRC emacs-lisp | ||
| (package! doct | ||
| :recipe (:host github :repo "progfolio/doct") | ||
| :pin "6cf1943ad7") | ||
| #+END_SRC | ||
| **** Visuals | ||
| Org tables aren't the prettiest thing to look at. This package is supposed to | ||
| redraw them in the buffer with box-drawing characters. Sounds like an | ||
| @@ -878,6 +891,351 @@ My spelling is atrocious, so let's get flycheck going. | ||
| #+BEGIN_SRC emacs-lisp | ||
| (after! org (add-hook 'org-mode-hook 'turn-on-flyspell)) | ||
| #+END_SRC | ||
| **** Super agenda | ||
| #+BEGIN_SRC emacs-lisp | ||
| (use-package! org-super-agenda | ||
| :commands (org-super-agenda-mode)) | ||
| (after! org-agenda | ||
| (org-super-agenda-mode)) | ||
| (setq org-agenda-skip-scheduled-if-done t | ||
| org-agenda-skip-deadline-if-done t | ||
| org-agenda-include-deadlines t | ||
| org-agenda-block-separator nil | ||
| org-agenda-compact-blocks t) | ||
| (setq org-agenda-custom-commands | ||
| '(("o" "Overview" | ||
| ((agenda "" ((org-agenda-span 'day) | ||
| (org-super-agenda-groups | ||
| '((:name "Today" | ||
| :time-grid t | ||
| :date today | ||
| :todo "TODAY" | ||
| :scheduled today | ||
| :order 1))))) | ||
| (alltodo "" ((org-agenda-overriding-header "") | ||
| (org-super-agenda-groups | ||
| '((:name "Next to do" | ||
| :todo "NEXT" | ||
| :order 1) | ||
| (:name "Important" | ||
| :tag "Important" | ||
| :priority "A" | ||
| :order 6) | ||
| (:name "Due Today" | ||
| :deadline today | ||
| :order 2) | ||
| (:name "Due Soon" | ||
| :deadline future | ||
| :order 8) | ||
| (:name "Overdue" | ||
| :deadline past | ||
| :face error | ||
| :order 7) | ||
| (:name "Assignments" | ||
| :tag "Assignment" | ||
| :order 10) | ||
| (:name "Issues" | ||
| :tag "Issue" | ||
| :order 12) | ||
| (:name "Projects" | ||
| :tag "Project" | ||
| :order 14) | ||
| (:name "Emacs" | ||
| :tag "Emacs" | ||
| :order 13) | ||
| (:name "Research" | ||
| :tag "Research" | ||
| :order 15) | ||
| (:name "To read" | ||
| :tag "Read" | ||
| :order 30) | ||
| (:name "Waiting" | ||
| :todo "WAITING" | ||
| :order 20) | ||
| (:name "Trivial" | ||
| :priority<= "E" | ||
| :tag ("Trivial" "Unimportant") | ||
| :todo ("SOMEDAY" ) | ||
| :order 90) | ||
| (:discard (:tag ("Chore" "Routine" "Daily"))))))))))) | ||
| #+END_SRC | ||
| **** Capture | ||
| Let's setup some org-capture templates | ||
| #+BEGIN_SRC emacs-lisp :noweb yes | ||
| (use-package! doct | ||
| :commands (doct)) | ||
| (after! org-capture | ||
| <<prettify-capture>> | ||
| (add-transient-hook! 'org-capture-select-template | ||
| (setq org-capture-templates | ||
| (doct `((,(format "%s\tPersonal todo" (all-the-icons-octicon "checklist" :face 'all-the-icons-green :v-adjust 0.01)) | ||
| :keys "t" | ||
| :file +org-capture-todo-file | ||
| :prepend t | ||
| :headline "Inbox" | ||
| :type entry | ||
| :template ("* TODO %?" | ||
| "%i %a") | ||
| ) | ||
| (,(format "%s\tPersonal note" (all-the-icons-faicon "sticky-note-o" :face 'all-the-icons-green :v-adjust 0.01)) | ||
| :keys "n" | ||
| :file +org-capture-todo-file | ||
| :prepend t | ||
| :headline "Inbox" | ||
| :type entry | ||
| :template ("* %?" | ||
| "%i %a") | ||
| ) | ||
| (,(format "%s\tUniversity" (all-the-icons-faicon "graduation-cap" :face 'all-the-icons-purple :v-adjust 0.01)) | ||
| :keys "u" | ||
| :file +org-capture-todo-file | ||
| :headline "University" | ||
| :prepend t | ||
| :type entry | ||
| :children ((,(format "%s\tTest" (all-the-icons-material "timer" :face 'all-the-icons-red :v-adjust 0.01)) | ||
| :keys "t" | ||
| :template ("* TODO [#C] %? :uni:tests:" | ||
| "SCHEDULED: %^{Test date:}T" | ||
| "%i %a")) | ||
| (,(format "%s\tAssignment" (all-the-icons-material "library_books" :face 'all-the-icons-orange :v-adjust 0.01)) | ||
| :keys "a" | ||
| :template ("* TODO [#B] %? :uni:assignments:" | ||
| "DEADLINE: %^{Due date:}T" | ||
| "%i %a")) | ||
| (,(format "%s\tMiscellaneous task" (all-the-icons-faicon "list" :face 'all-the-icons-yellow :v-adjust 0.01)) | ||
| :keys "u" | ||
| :template ("* TODO [#C] %? :uni:" | ||
| "%i %a")))) | ||
| (,(format "%s\tEmail" (all-the-icons-faicon "envelope" :face 'all-the-icons-blue :v-adjust 0.01)) | ||
| :keys "e" | ||
| :file +org-capture-todo-file | ||
| :prepend t | ||
| :headline "Inbox" | ||
| :type entry | ||
| :template ("* TODO %? :email:" | ||
| "%i %a")) | ||
| (,(format "%s\tInteresting" (all-the-icons-faicon "eye" :face 'all-the-icons-lcyan :v-adjust 0.01)) | ||
| :keys "i" | ||
| :file +org-capture-todo-file | ||
| :prepend t | ||
| :headline "Interesting" | ||
| :type entry | ||
| :template ("* [ ] %{desc}%? :%{i-type}:" | ||
| "%i %a") | ||
| :children ((,(format "%s\tWebpage" (all-the-icons-faicon "globe" :face 'all-the-icons-green :v-adjust 0.01)) | ||
| :keys "w" | ||
| :desc "%(org-cliplink-capture) " | ||
| :i-type "read:web" | ||
| ) | ||
| (,(format "%s\tArticle" (all-the-icons-octicon "file-text" :face 'all-the-icons-yellow :v-adjust 0.01)) | ||
| :keys "a" | ||
| :desc "" | ||
| :i-type "read:reaserch" | ||
| ) | ||
| (,(format "%s\tInformation" (all-the-icons-faicon "info-circle" :face 'all-the-icons-blue :v-adjust 0.01)) | ||
| :keys "i" | ||
| :desc "" | ||
| :i-type "read:info" | ||
| ) | ||
| (,(format "%s\tIdea" (all-the-icons-material "bubble_chart" :face 'all-the-icons-silver :v-adjust 0.01)) | ||
| :keys "I" | ||
| :desc "" | ||
| :i-type "idea" | ||
| ))) | ||
| (,(format "%s\tTasks" (all-the-icons-octicon "inbox" :face 'all-the-icons-yellow :v-adjust 0.01)) | ||
| :keys "k" | ||
| :file +org-capture-todo-file | ||
| :prepend t | ||
| :headline "Tasks" | ||
| :type entry | ||
| :template ("* TODO %? %^G%{extra}" | ||
| "%i") | ||
| :children ((,(format "%s\tGeneral Task" (all-the-icons-octicon "inbox" :face 'all-the-icons-yellow :v-adjust 0.01)) | ||
| :keys "k" | ||
| :extra "" | ||
| ) | ||
| (,(format "%s\tTask with deadline" (all-the-icons-material "timer" :face 'all-the-icons-orange :v-adjust -0.1)) | ||
| :keys "d" | ||
| :extra "\nDEADLINE: %^{Deadline:}t" | ||
| ) | ||
| (,(format "%s\tScheduled Task" (all-the-icons-octicon "calendar" :face 'all-the-icons-orange :v-adjust 0.01)) | ||
| :keys "s" | ||
| :extra "\nSCHEDULED: %^{Start time:}t" | ||
| ) | ||
| )) | ||
| (,(format "%s\tProject" (all-the-icons-octicon "repo" :face 'all-the-icons-silver :v-adjust 0.01)) | ||
| :keys "p" | ||
| :prepend t | ||
| :type entry | ||
| :headline "Inbox" | ||
| :template ("* %{time-or-todo} %?" | ||
| "%i" | ||
| "%a") | ||
| :file "" | ||
| :custom (:time-or-todo "") | ||
| :children ((,(format "%s\tProject-local todo" (all-the-icons-octicon "checklist" :face 'all-the-icons-green :v-adjust 0.01)) | ||
| :keys "t" | ||
| :time-or-todo "TODO" | ||
| :file +org-capture-project-todo-file) | ||
| (,(format "%s\tProject-local note" (all-the-icons-faicon "sticky-note" :face 'all-the-icons-yellow :v-adjust 0.01)) | ||
| :keys "n" | ||
| :time-or-todo "%U" | ||
| :file +org-capture-project-notes-file) | ||
| (,(format "%s\tProject-local changelog" (all-the-icons-faicon "list" :face 'all-the-icons-blue :v-adjust 0.01)) | ||
| :keys "c" | ||
| :time-or-todo "%U" | ||
| :heading "Unreleased" | ||
| :file +org-capture-project-changelog-file)) | ||
| ) | ||
| ("\tCenteralised project templates" | ||
| :keys "o" | ||
| :type entry | ||
| :prepend t | ||
| :template ("* %{time-or-todo} %?" | ||
| "%i" | ||
| "%a") | ||
| :children (("Project todo" | ||
| :keys "t" | ||
| :prepend nil | ||
| :time-or-todo "TODO" | ||
| :heading "Tasks" | ||
| :file +org-capture-central-project-todo-file) | ||
| ("Project note" | ||
| :keys "n" | ||
| :time-or-todo "%U" | ||
| :heading "Notes" | ||
| :file +org-capture-central-project-notes-file) | ||
| ("Project changelog" | ||
| :keys "c" | ||
| :time-or-todo "%U" | ||
| :heading "Unreleased" | ||
| :file +org-capture-central-project-changelog-file)) | ||
| )))))) | ||
| #+END_SRC | ||
| It would also be nice to improve how the capture dialouge looks | ||
| #+NAME: prettify-capture | ||
| #+BEGIN_SRC emacs-lisp :tangle no | ||
| (defun org-capture-select-template-prettier (&optional keys) | ||
| "Select a capture template, in a prettier way than default | ||
| Lisp programs can force the template by setting KEYS to a string." | ||
| (let ((org-capture-templates | ||
| (or (org-contextualize-keys | ||
| (org-capture-upgrade-templates org-capture-templates) | ||
| org-capture-templates-contexts) | ||
| '(("t" "Task" entry (file+headline "" "Tasks") | ||
| "* TODO %?\n %u\n %a"))))) | ||
| (if keys | ||
| (or (assoc keys org-capture-templates) | ||
| (error "No capture template referred to by \"%s\" keys" keys)) | ||
| (org-mks org-capture-templates | ||
| "Select a capture template\n━━━━━━━━━━━━━━━━━━━━━━━━━" | ||
| "Template key: " | ||
| `(("q" ,(concat (all-the-icons-octicon "stop" :face 'all-the-icons-red :v-adjust 0.01) "\tAbort"))))))) | ||
| (advice-add 'org-capture-select-template :override #'org-capture-select-template-prettier) | ||
| (defun org-mks-pretty (table title &optional prompt specials) | ||
| "Select a member of an alist with multiple keys. Prettified. | ||
| TABLE is the alist which should contain entries where the car is a string. | ||
| There should be two types of entries. | ||
| 1. prefix descriptions like (\"a\" \"Description\") | ||
| This indicates that `a' is a prefix key for multi-letter selection, and | ||
| that there are entries following with keys like \"ab\", \"ax\"… | ||
| 2. Select-able members must have more than two elements, with the first | ||
| being the string of keys that lead to selecting it, and the second a | ||
| short description string of the item. | ||
| The command will then make a temporary buffer listing all entries | ||
| that can be selected with a single key, and all the single key | ||
| prefixes. When you press the key for a single-letter entry, it is selected. | ||
| When you press a prefix key, the commands (and maybe further prefixes) | ||
| under this key will be shown and offered for selection. | ||
| TITLE will be placed over the selection in the temporary buffer, | ||
| PROMPT will be used when prompting for a key. SPECIALS is an | ||
| alist with (\"key\" \"description\") entries. When one of these | ||
| is selected, only the bare key is returned." | ||
| (save-window-excursion | ||
| (let ((inhibit-quit t) | ||
| (buffer (org-switch-to-buffer-other-window "*Org Select*")) | ||
| (prompt (or prompt "Select: ")) | ||
| case-fold-search | ||
| current) | ||
| (unwind-protect | ||
| (catch 'exit | ||
| (while t | ||
| (setq-local evil-normal-state-cursor (list nil)) | ||
| (erase-buffer) | ||
| (insert title "\n\n") | ||
| (let ((des-keys nil) | ||
| (allowed-keys '("\C-g")) | ||
| (tab-alternatives '("\s" "\t" "\r")) | ||
| (cursor-type nil)) | ||
| ;; Populate allowed keys and descriptions keys | ||
| ;; available with CURRENT selector. | ||
| (let ((re (format "\\`%s\\(.\\)\\'" | ||
| (if current (regexp-quote current) ""))) | ||
| (prefix (if current (concat current " ") ""))) | ||
| (dolist (entry table) | ||
| (pcase entry | ||
| ;; Description. | ||
| (`(,(and key (pred (string-match re))) ,desc) | ||
| (let ((k (match-string 1 key))) | ||
| (push k des-keys) | ||
| ;; Keys ending in tab, space or RET are equivalent. | ||
| (if (member k tab-alternatives) | ||
| (push "\t" allowed-keys) | ||
| (push k allowed-keys)) | ||
| (insert (propertize prefix 'face 'font-lock-comment-face) (propertize k 'face 'bold) (propertize "›" 'face 'font-lock-comment-face) " " desc "…" "\n"))) | ||
| ;; Usable entry. | ||
| (`(,(and key (pred (string-match re))) ,desc . ,_) | ||
| (let ((k (match-string 1 key))) | ||
| (insert (propertize prefix 'face 'font-lock-comment-face) (propertize k 'face 'bold) " " desc "\n") | ||
| (push k allowed-keys))) | ||
| (_ nil)))) | ||
| ;; Insert special entries, if any. | ||
| (when specials | ||
| (insert "─────────────────────────\n") | ||
| (pcase-dolist (`(,key ,description) specials) | ||
| (insert (format "%s %s\n" (propertize key 'face '(bold all-the-icons-red)) description)) | ||
| (push key allowed-keys))) | ||
| ;; Display UI and let user select an entry or | ||
| ;; a sub-level prefix. | ||
| (goto-char (point-min)) | ||
| (unless (pos-visible-in-window-p (point-max)) | ||
| (org-fit-window-to-buffer)) | ||
| (let ((pressed (org--mks-read-key allowed-keys prompt))) | ||
| (setq current (concat current pressed)) | ||
| (cond | ||
| ((equal pressed "\C-g") (user-error "Abort")) | ||
| ;; Selection is a prefix: open a new menu. | ||
| ((member pressed des-keys)) | ||
| ;; Selection matches an association: return it. | ||
| ((let ((entry (assoc current table))) | ||
| (and entry (throw 'exit entry)))) | ||
| ;; Selection matches a special entry: return the | ||
| ;; selection prefix. | ||
| ((assoc current specials) (throw 'exit current)) | ||
| (t (error "No entry available"))))))) | ||
| (when buffer (kill-buffer buffer)))))) | ||
| (advice-add 'org-mks :override #'org-mks-pretty) | ||
| #+END_SRC | ||
| The [[file:~/.emacs.d/bin/org-capture][org-capture bin]] is rather nice, but I'd be nicer with a smaller frame, and | ||
| no modeline. | ||
| #+BEGIN_SRC emacs-lisp | ||
| (setf (alist-get 'height +org-capture-frame-parameters) 15) | ||
| ;; (alist-get 'name +org-capture-frame-parameters) "❖ Capture") ;; ATM hardcoded in other places, so changing breaks stuff | ||
| (setq +org-capture-fn | ||
| (lambda () | ||
| (interactive) | ||
| (set-window-parameter nil 'mode-line-format 'none) | ||
| (org-capture))) | ||
| #+END_SRC | ||
| **** Nicer headings | ||
| Thanks to alphapapa's [[https://github.com/alphapapa/unpackaged.el#export-to-html-with-useful-anchors][unpackaged.el]]. | ||
| Unfortunately this currently seems to break some of the other modifications I've made. | ||
| @@ -1115,7 +1473,15 @@ I've also added some fun alternatives, just commented out. | ||
| (use-package org-pretty-tags | ||
| :config | ||
| (setq org-pretty-tags-surrogate-strings | ||
| '(("uni" . "🎓"))) | ||
| '(("uni" . "🎓") | ||
| ("assignment" . "📓") | ||
| ("email" . "🖂") | ||
| ("read" . "🕮") | ||
| ("article" . "🖹") | ||
| ("web" . "🌐") | ||
| ("info" . "🛈") | ||
| ("issue" . "🐛") | ||
| ("emacs" . "ɛ"))) | ||
| (org-pretty-tags-global-mode))) | ||
| (after! org | ||
Recommend
-
143
A tweak-able (and tweaked) Emacs config This is my Emacs configuration. There are many like it, but this one is mine. Actually, there aren't many like it, since it's highly personalized, with the key binding setup relying substanti...
-
60
.emacs.d - My emacs config
-
40
README.md My emacs settings An ever-changing set of emacs settings. Micro-optimizations are super fun. These are used in the
-
23
Join GitHub today GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
-
48
README.org Doom Emacs Configuration — HTML Version Here you may find my config. There are only...
-
14
README.org Org Pandoc Import The worst part about org-mode? Having to leave it. This package aims to reduce this pain by leveraging
-
32
Tycho Emacs Config Kit. Contribute to tychoish/.emacs.d development by creating an account on GitHub.
-
3
README ;; ========================================================================= ;; Anthony Green's GNU Emacs configuration file. ;; ;; Copyright (C) 2009 Anthony Green <...
-
20
Emacs Everywhere A re-implementation of the fantastic idea in zachcurry/emacs-anywhere.
-
6
Screenshot.el Ever wanted to take a screenshot of some code to share on <insert IM platform of choice here>? Yes: well then this package may just be for you! No: you’re lying With th...
About Joyk
Aggregate valuable and interesting links.
Joyk means Joy of geeK