diff --git a/.gitignore b/.gitignore index 807aeb8..d552cae 100644 --- a/.gitignore +++ b/.gitignore @@ -72,8 +72,3 @@ projects /lsp-cache/ /mastodon.plstore /eln-cache/ -/request/ -/var/ -/.lsp-eslint-choices -/mastodon.plstore -/lisp/ diff --git a/config.org b/config.org index f51a61e..306ddbb 100644 --- a/config.org +++ b/config.org @@ -711,17 +711,6 @@ Support for Org links to Magit buffers. "https://git.mmk2410.org/%n/commit/%r"))) #+end_src -** gitmoji - -Insert gitmoji in Emacs. - -Source: [[https://github.com/janusvm/emacs-gitmoji][GitHub: janusvm/emacs-gitmoji]] - -#+begin_src emacs-lisp -(use-package gitmoji - :load-path "lisp/gitmoji/") -#+end_src - ** diff-hl Emacs package for highlighting uncommitted changes @@ -1110,7 +1099,11 @@ Forbid closing of todos with open subtasks. Set org agenda files. #+begin_src emacs-lisp -(setq org-agenda-files (list "~/org/tasks/")) +(setq org-agenda-files + (list + "~/org/" + "~/org/personal-computer/" + "~/org/projects/")) (setq org-agenda-text-search-extra-files (list "~/org/archive/" @@ -1128,15 +1121,15 @@ Define org-capture templates. #+begin_src emacs-lisp (setq org-capture-templates - '(("t" "Normal task" entry (file "~/org/tasks/inbox.org") + '(("t" "Normal task" entry (file "~/org/inbox.org") "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:") - ("e" "E-Mail needing a reply" entry (file "~/org/tasks/inbox.org") + ("e" "E-Mail needing a reply" entry (file "~/org/inbox.org") "* TODO Reply: %a\n:PROPERTIES:\n:CREATED: %U\n:END:" :immediate-finish t) - ("p" "org-protocol-capture" entry (file "~/org/tasks/inbox.org") + ("p" "org-protocol-capture" entry (file "~/org/inbox.org") "* TODO [[%:link][%:description]]\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%i" :immediate-finish t) - ("r" "Reading todo" entry (file "~/org/tasks/read-review.org") + ("r" "Reading todo" entry (file "~/org/read-review.org") "* TODO %^L %^G\n:PROPERTIES:\n:CREATED: %U\n:END:\n"))) #+end_src @@ -1167,7 +1160,7 @@ Org Agenda mode settings: - Start week today and not on Monday. #+begin_src emacs-lisp -(setq org-agenda-span 'day) +(setq org-agenda-span 'week) (setq org-agenda-skip-scheduled-if-deadline-is-shown t) (setq org-agenda-start-on-weekday nil) #+end_src @@ -1176,7 +1169,7 @@ Make the column for categories wider. #+begin_src emacs-lisp (setq org-agenda-prefix-format - '((agenda . " %i %-15:c%?-12t% s") + '((agenda . " %i %?-12t% s") (todo . " %i") (tags . " %i") (search . " %i"))) @@ -1193,7 +1186,7 @@ Finally define the org-agenda display using [[https://github.com/alphapapa/org-s org-agenda-compact-blocks t) (setq org-agenda-custom-commands '(("c" "Complete Agenda with Todos" - ((agenda "" ((org-agenda-span 'day) + ((agenda "" ((org-agenda-span 'week) (org-deadline-warning-days 365) (org-super-agenda-groups '((:name "" :time-grid t :deadline future))))) @@ -1749,6 +1742,7 @@ Original Source: [[https://www.emacswiki.org/emacs/ts-mode.el][EmacsWiki: ts-mod ("\\.tsconfig\\'" . ts-mode))) #+end_src + * Emacs Multimedia System (EMMS) For notes, tasks, writing, and countless other things there is org-mode. @@ -1926,7 +1920,7 @@ Using this function I can now define a org-capture template for my purpose. #+begin_src emacs-lisp (add-to-list 'org-capture-templates - '("a" "RSS Article" entry (file "~/org/tasks/read-review.org") + '("a" "RSS Article" entry (file "~/org/read-review.org") "* TODO %(elfeed-feed-title (mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-feed)): [[%(mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-link)][%(mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-title)]]\n :PROPERTIES:\n :CREATED: %U\n :END:\n" :immediate-finish t)) #+end_src @@ -1937,20 +1931,21 @@ Using this function I can now define a org-capture template for my purpose. I currently use it in combination with my Miniflux instance (previously I used it with Nextcloud News and FreshRSS). The reason why I not only use elfeed with a local feed list (managed for example by elfeed-org) is that a cloud service can check for new feed articles continuously and I can read articles on any device. -I additionally bind =elfeed-protocol-fever-reinit= to a handy keybinding since this seems to be the only way to retrieve new items from the API. - Source: [[https://github.com/fasheng/elfeed-protocol][GitHub: fasheng/elfeed-protocol]] #+begin_src emacs-lisp (use-package elfeed-protocol :init ;; FreshRSS (self-hosted) + ;; Disabled since I currently use Miniflux (setq elfeed-feeds '(("fever+https://mmk2410@rss.mmk2410.org" :api-url "https://rss.mmk2410.org/api/fever.php" :use-authinfo t))) - (elfeed-protocol-enable) - :bind (:map elfeed-search-mode-map - ("C-c C-u" . elfeed-protocol-fever-reinit))) + ;; Miniflux (self-hosted) + ;; (setq elfeed-feeds '(("fever+https://mmk2410@miniflux.rss.mmk2410.org" + ;; :api-url "https://miniflux.rss.mmk2410.org/fever/" + ;; :use-authinfo t))) + (elfeed-protocol-enable)) #+end_src * Mastodon @@ -1992,7 +1987,7 @@ Not all distributions that I use have a enough up-to-date package of mu/maildir- ((file-directory-p mu4e-load-path-usr-local) mu4e-load-path-usr-local) ((file-directory-p mu4e-load-path-usr) - mu4e-load-path-usr) + mu4e-load-path-usr-local) (t (error "mu4e not found!")))))) #+end_src @@ -2211,10 +2206,10 @@ I use org-mode heavily and also manage my todos within it. Since my INBOX is not #+begin_src emacs-lisp (if (mmk2410/work) (add-to-list 'org-capture-templates - '("m" "mail" entry (file "~/org/tasks/inbox.org") - "* TODO %a%? :@work:\n:PROPERTIES:\n:CREATED:%U\n:END:\n")) + '("m" "mail" entry (file "~/org/work.inbox.org") + "* TODO %a%?\n :PROPERTIES:\n :CREATED: %U\n :END:\n")) (add-to-list 'org-capture-templates - '("m" "mail" entry (file "~/org/tasks/inbox.org") + '("m" "mail" entry (file "~/org/inbox.org") "* TODO %a%?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"))) #+end_src