From b90bcd4f2574c1585f3f7d79f160bccea72073dd Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Sun, 2 Jan 2022 17:50:52 +0100 Subject: Installing Guix fr now! --- bookmarks | 15 ---- resources/custom.el | 6 +- resources/org/default-notes.org | 3 + resources/templates/documents/ms-default.setup | 6 +- resources/themes/sd-compagnon-dark-theme.el | 12 +-- smart-documents.org | 112 ++++++++++++++++--------- smart-documents.pdf | Bin 418923 -> 391296 bytes 7 files changed, 88 insertions(+), 66 deletions(-) delete mode 100644 bookmarks diff --git a/bookmarks b/bookmarks deleted file mode 100644 index debd3cb..0000000 --- a/bookmarks +++ /dev/null @@ -1,15 +0,0 @@ -;;;; Emacs Bookmark Format Version 1 ;;;; -*- coding: utf-8-emacs -*- -;;; This format is meant to be slightly human-readable; -;;; nevertheless, you probably don't want to edit it. -;;; -*- End Of Bookmark File Format Version Stamp -*- -(("org-refile-last-stored" - (filename . "~/org/WORK/2021-job-search/RAIL-job-search-2021-09-17.org") - (front-context-string . "** FOLLOW UP EDF") - (rear-context-string . "olkswagen Group\n") - (position . 23388)) -("org-capture-last-stored" - (filename . "~/.emacs.d/resources/org/default-notes.org") - (front-context-string . "** TODO Do this\n") - (rear-context-string) - (position . 9)) -) diff --git a/resources/custom.el b/resources/custom.el index ece9227..c6760da 100644 --- a/resources/custom.el +++ b/resources/custom.el @@ -20,7 +20,7 @@ (output-html "xdg-open"))) '(ansi-color-names-vector ["#3F3F3F" "#CC9393" "#7F9F7F" "#F0DFAF" "#8CD0D3" "#DC8CC3" "#93E0E3" "#DCDCCC"]) - '(browse-url-browser-function 'browse-url-firefox) + '(browse-url-browser-function 'browse-url-default-browser) '(column-number-mode t) '(company-quickhelp-color-background "#4F4F4F") '(company-quickhelp-color-foreground "#DCDCCC") @@ -28,7 +28,7 @@ '(cursor-type 'bar) '(custom-enabled-themes nil) '(custom-safe-themes - '("03ba8d0d53d972508db964fa88c3cb8610604e364d4f4163dffb495c9de0a144" "2877431bffac5322ba62437547002039a466a846e04eefcf817f745dd75f8191" "633b9c85026b2159928553f2fe828b3b80b2581c7e3b324e2b0eac8f604c483b" "422a317d1eed69a367d1506fe15a928dd18426ade0d6ee76bb390402f7c4e3aa" "9a7c95cf28858105c3265f6be4b36447092682c9e49cfbe1fe81c029fbed8db8" "e9954eb5df6bb9a3730639c5a6ce9b7db4d753a5935d9b73953cabe032fbfbd2" "9547849e788cd0a520c445bed08d248742d5d2b7c0c750bbab284e98810dd551" "7e03b8096f27ea37c12abc9afff4922659c79221d0c6815700b8fabbc450ca7c" "6751665922c478d0aee39f06fc269dd82dc109b8dabb0e3b443cab511aa5fe2e" "5147d19a022bb32b3b084f7c746ad8ac20e56f89e1720ddd25758710406e7614" "b067125d603e44d886d1fcbeb82f6db4b2ad79c7244bce32d2a863d05b1e6dc6" "c21761ef593f2c6258f4b602cb785aebf9fe18d4e6b659dbca7850caf0b33a74" "8205f1caf1334c56a3360438ace84d2a1ade86923929e766e53987c9b5a5cd7d" "d1d7ccb8f1c17a3f53b10b769ccd3b8b62c0230dde88ca23dd8fe85a3fe1fa74" "c353dde8298eb4fd36d534d30f99d1b71844871c1e5e89a273479582190cce10" "98cbdcf881aa40774a278953571a46a19505d2c168a29760d016a54483470d3f" "6796c19189021d5643e7b4fe2238834da597ffe1087d8919da386b6bba827112" "bc627b8eccb0f82eb00f7a7cdb2fd2b66422ddbe46e01de66dcd0936a414958c" "a23a48bb7bac7d46c61e779e0b9a3e003387b4b9543163e9db562a12ff96333b" "32df8feae4f9846e05dcb578e48be7c465971b7664469431dd13bfe01dbe0872" "ebbbdfe1bf03a99559116736d073500a2100c463c242ab7f7feabce4d22aa6ae" "cd0f588f48c6f3c1eb25084396820f8c938c28fb489487262d60168b1a6385f7" "6f78c6f29feef7561fe7224a4e9c73b87940ff888b92cae27fd63cf0de10c7c7" "fff87b42a0999ee2e7a28507e3f0746fbc3e1eb1394ce74e9dee2cf4a81d080d" "0bbbb6fb8921bcca20e3dc0a628867cfac8b82487b464deb93da38388ca86503" "280de4d8dd8980fa1c5a8f1d726d89932df982fccc33dbcc74d107ef941211a2" "fb8357d6a94ab57b3e5062b481876f0b6c7149f2394a6ec46f1ca92487fbc888" "ea287582eaea4e0c0a991ad0aa42f679f21b8d92766762bcc4d730d4aa6c8fd7" "07e0a2ea30155beb57b51f031a9a1c975e201bd497982ba3bf5093a6715300d9" "5a6e72c173208edfaa2f591b669294636f7ee7fbf5bcf901c9c9d52b0c69ce6e" "69e4d8638af3287be6b70391b75c816b67b47578dc88141a1643d32ba806ac8a" "cdc38ce5913c5e2b69bf6a4984ec0c9d0be8eddb71db55b9ee659ed103919aab" "44854133f0525c7e714e1b04f3ddfd01d87176e914d2efb0cc755458c510719f" "7a2fd29088d19e5e9428851a5c3c13e330ad1789ae558782c208b94a5234d9ca" "6565cf9ef99fd03e4514dc72dca6dd900007ec35c3bb0b65053f8041b7b64b83" "d24ae1c19dbf63a629fe84d4df55cbbc494b5694978157b870f57b61c03bf334" "b8244418af8bc37c4b076a021cacb1bda94fb70e506a5b50c40d1a0ed92a15d6" "c480484ec6a61d87d3dab2443e7b04832659bafc1d2b5bcaacb3d977bdbea928" "82d48184709ea6777d920226b4d95986ac469f5c01b0652b3b63566124a959d5" "8f567db503a0d27202804f2ee51b4cd409eab5c4374f57640317b8fcbbd3e466" "e6df46d5085fde0ad56a46ef69ebb388193080cc9819e2d6024c9c6e27388ba9" default)) + '("4447d9707582225f7b2998c0728e3ca26133aa911b1e2720cedcd375cbf0014b" "c68a090711fd539357afc8d5f07d4e978c24be255e4fcd7e3bce3896b5579270" "f370b6f29926ebc1ed599785db8982bfcd26cc13ac9873fa95491ff1fb4c5292" "581e250fce111f3d88943657bbe5dfca4e85cfa336b32a831b7b26ff6b6cdab4" "e9db16248eb2fdd91028ba5f4dccb8ea5a92d3266c5bcb8b85ae2e56494209a7" "7ab64e2f8b921d1a0397e7db6dd358f51d372bf85e65d85d89e1f5a3d25a6195" "03ba8d0d53d972508db964fa88c3cb8610604e364d4f4163dffb495c9de0a144" "2877431bffac5322ba62437547002039a466a846e04eefcf817f745dd75f8191" "633b9c85026b2159928553f2fe828b3b80b2581c7e3b324e2b0eac8f604c483b" "422a317d1eed69a367d1506fe15a928dd18426ade0d6ee76bb390402f7c4e3aa" "9a7c95cf28858105c3265f6be4b36447092682c9e49cfbe1fe81c029fbed8db8" "e9954eb5df6bb9a3730639c5a6ce9b7db4d753a5935d9b73953cabe032fbfbd2" "9547849e788cd0a520c445bed08d248742d5d2b7c0c750bbab284e98810dd551" "7e03b8096f27ea37c12abc9afff4922659c79221d0c6815700b8fabbc450ca7c" "6751665922c478d0aee39f06fc269dd82dc109b8dabb0e3b443cab511aa5fe2e" "5147d19a022bb32b3b084f7c746ad8ac20e56f89e1720ddd25758710406e7614" "b067125d603e44d886d1fcbeb82f6db4b2ad79c7244bce32d2a863d05b1e6dc6" "c21761ef593f2c6258f4b602cb785aebf9fe18d4e6b659dbca7850caf0b33a74" "8205f1caf1334c56a3360438ace84d2a1ade86923929e766e53987c9b5a5cd7d" "d1d7ccb8f1c17a3f53b10b769ccd3b8b62c0230dde88ca23dd8fe85a3fe1fa74" "c353dde8298eb4fd36d534d30f99d1b71844871c1e5e89a273479582190cce10" "98cbdcf881aa40774a278953571a46a19505d2c168a29760d016a54483470d3f" "6796c19189021d5643e7b4fe2238834da597ffe1087d8919da386b6bba827112" "bc627b8eccb0f82eb00f7a7cdb2fd2b66422ddbe46e01de66dcd0936a414958c" "a23a48bb7bac7d46c61e779e0b9a3e003387b4b9543163e9db562a12ff96333b" "32df8feae4f9846e05dcb578e48be7c465971b7664469431dd13bfe01dbe0872" "ebbbdfe1bf03a99559116736d073500a2100c463c242ab7f7feabce4d22aa6ae" "cd0f588f48c6f3c1eb25084396820f8c938c28fb489487262d60168b1a6385f7" "6f78c6f29feef7561fe7224a4e9c73b87940ff888b92cae27fd63cf0de10c7c7" "fff87b42a0999ee2e7a28507e3f0746fbc3e1eb1394ce74e9dee2cf4a81d080d" "0bbbb6fb8921bcca20e3dc0a628867cfac8b82487b464deb93da38388ca86503" "280de4d8dd8980fa1c5a8f1d726d89932df982fccc33dbcc74d107ef941211a2" "fb8357d6a94ab57b3e5062b481876f0b6c7149f2394a6ec46f1ca92487fbc888" "ea287582eaea4e0c0a991ad0aa42f679f21b8d92766762bcc4d730d4aa6c8fd7" "07e0a2ea30155beb57b51f031a9a1c975e201bd497982ba3bf5093a6715300d9" "5a6e72c173208edfaa2f591b669294636f7ee7fbf5bcf901c9c9d52b0c69ce6e" "69e4d8638af3287be6b70391b75c816b67b47578dc88141a1643d32ba806ac8a" "cdc38ce5913c5e2b69bf6a4984ec0c9d0be8eddb71db55b9ee659ed103919aab" "44854133f0525c7e714e1b04f3ddfd01d87176e914d2efb0cc755458c510719f" "7a2fd29088d19e5e9428851a5c3c13e330ad1789ae558782c208b94a5234d9ca" "6565cf9ef99fd03e4514dc72dca6dd900007ec35c3bb0b65053f8041b7b64b83" "d24ae1c19dbf63a629fe84d4df55cbbc494b5694978157b870f57b61c03bf334" "b8244418af8bc37c4b076a021cacb1bda94fb70e506a5b50c40d1a0ed92a15d6" "c480484ec6a61d87d3dab2443e7b04832659bafc1d2b5bcaacb3d977bdbea928" "82d48184709ea6777d920226b4d95986ac469f5c01b0652b3b63566124a959d5" "8f567db503a0d27202804f2ee51b4cd409eab5c4374f57640317b8fcbbd3e466" "e6df46d5085fde0ad56a46ef69ebb388193080cc9819e2d6024c9c6e27388ba9" default)) '(electric-indent-mode t) '(erc-modules '(autojoin button completion services spelling track netsplit fill match readonly networks ring noncommands irccontrols move-to-prompt stamp menu list)) @@ -67,7 +67,7 @@ '(org-table-convert-region-max-lines 3000) '(org-tags-column -66) '(package-selected-packages - '(ivy yasnippet which-key use-package undo-tree tuareg rich-minority rainbow-mode rainbow-delimiters py-yapf projectile plantuml-mode pdf-tools magit lua-mode ledger-mode hungry-delete haskell-mode gnuplot flycheck emojify dumb-jump csv-mode counsel auctex-latexmk)) + '(all-the-icons ivy yasnippet which-key use-package undo-tree tuareg rich-minority rainbow-mode rainbow-delimiters py-yapf projectile plantuml-mode pdf-tools magit lua-mode ledger-mode hungry-delete haskell-mode gnuplot flycheck emojify dumb-jump csv-mode counsel auctex-latexmk)) '(pdf-view-midnight-colors '("#DCDCCC" . "#383838")) '(save-place-mode t) '(send-mail-function 'smtpmail-send-it) diff --git a/resources/org/default-notes.org b/resources/org/default-notes.org index 01cebcb..5a318aa 100644 --- a/resources/org/default-notes.org +++ b/resources/org/default-notes.org @@ -1,3 +1,6 @@ * Tasks ** TODO Do this [2021-10-06 Wed] +** TODO Do that instead. + [2021-12-20 Mon] + [[file:~/.emacs.d/meta/bookmarks::front-context-string . "** TODO Do this\n"]] diff --git a/resources/templates/documents/ms-default.setup b/resources/templates/documents/ms-default.setup index f7e5fbb..ce04191 100644 --- a/resources/templates/documents/ms-default.setup +++ b/resources/templates/documents/ms-default.setup @@ -55,7 +55,7 @@ #+LATEX_HEADER_EXTRA: \hrulefill\\[0.8em] #+LATEX_HEADER_EXTRA: Page \thepage/\pageref*{LastPage}\\[0.8em] #+LATEX_HEADER_EXTRA: \footnotesize Compiled with -#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/img/icons/EmacsIcon.png}/ -#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/img/icons/Org-mode-unicorn.png}/ -#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/img/icons/LuaTeX_logo.png}/...\\ +#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/resources/images/icons/EmacsIcon.png}/ +#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/resources/images/icons/Org-mode-unicorn.png}/ +#+LATEX_HEADER_EXTRA: \includegraphics[width = 1.618ex]{C:/Users/blend/AppData/Roaming/.emacs.d/resources/images/icons/LuaTeX_logo.png}/...\\ #+LATEX_HEADER_EXTRA: Copyright \copyright~2020 Marius Peter. All rights reserved.} diff --git a/resources/themes/sd-compagnon-dark-theme.el b/resources/themes/sd-compagnon-dark-theme.el index 7f75094..8cded72 100644 --- a/resources/themes/sd-compagnon-dark-theme.el +++ b/resources/themes/sd-compagnon-dark-theme.el @@ -1,5 +1,5 @@ (deftheme sd-compagnon-dark - "Created 2021-07-07.") + "Created 2021-12-20.") (custom-theme-set-variables 'sd-compagnon-dark @@ -12,7 +12,7 @@ '(variable-pitch ((t (:family "Compagnon Roman")))) '(escape-glyph ((t (:foreground "orange")))) '(homoglyph ((t (:foreground "cyan")))) - '(minibuffer-prompt ((t (:inherit (org-meta-line))))) + '(minibuffer-prompt ((t (:inherit org-meta-line)))) '(highlight ((t (:box (:line-width 2 :color "medium spring green") :background "sea green")))) '(region ((t (:extend t :background "medium sea green")))) '(shadow ((t (:foreground "light slate gray")))) @@ -33,13 +33,13 @@ '(font-lock-type-face ((t (:foreground "orchid2")))) '(font-lock-variable-name-face ((t (:weight bold)))) '(font-lock-warning-face ((t (:inherit (error))))) - '(button ((t (:foundry "Compagnon Light")))) + '(button ((t (:box (:line-width 2 :color "slate gray" :style released-button) :foundry "Compagnon Light")))) '(link ((t (:foreground "green yellow" :family "Compagnon Light Italic")))) '(link-visited ((t (:inherit link :foreground "yellow green")))) '(fringe ((t (:background "gainsboro")))) '(header-line ((t (:inherit org-meta-line :weight bold :height 1.8)))) - '(tooltip ((t (:background "white smoke" :foreground "sea green" :family "Hermit")))) - '(mode-line ((t (:inherit org-meta-line :box (:line-width -1 :style released-button))))) + '(tooltip ((t (:background "white smoke" :foreground "sea green" :family "Compagnon Medium")))) + '(mode-line ((t (:box (:line-width 2 :style released-button) :inherit org-meta-line)))) '(mode-line-buffer-id ((t (:weight bold)))) '(mode-line-emphasis ((t (:weight bold)))) '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40" :style released-button))))) @@ -80,6 +80,6 @@ '(show-paren-mismatch ((t (:background "orange red" :foreground "white")))) '(org-drawer ((t (:inherit org-block-begin-line)))) '(org-agenda-structure ((t (:foreground "Green Yellow")))) - '(default ((t (:inherit nil :extend nil :stipple nil :background "gray15" :foreground "white" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight semi-bold :height 142 :width normal :foundry "UKWN" :family "Compagnon Medium"))))) + '(default ((t (:inherit nil :extend nil :stipple nil :background "gray15" :foreground "white" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight semi-bold :height 142 :width normal :family "Compagnon Medium"))))) (provide-theme 'sd-compagnon-dark) diff --git a/smart-documents.org b/smart-documents.org index 14879a6..46597ee 100644 --- a/smart-documents.org +++ b/smart-documents.org @@ -42,6 +42,7 @@ personal GNU Emacs customizations with a tutorial. This paper is a ** TODO button as master {{{sd}}} entry point +** TODO Turn ~left-fringe~ into ~org-agenda~ buffer drawer * Introduction @@ -181,7 +182,7 @@ logic. In this section, we'll be tidying up the =.emacs.d/= directory---by default, many Emacs packages create files useful for themselves in our -~user-emacs-directory~. This leads to undesirable clutter. Certain +[[help:user-emacs-directory][user-emacs-directory]]. This leads to undesirable clutter. Certain packages create files that log recently visited files ([[Recently visited files]]); log location of known projects ([[Projects' bookmarks]]); log location in recently visited files ([[Location in previously visited @@ -189,10 +190,18 @@ file]]) The commonality between all these files is that they tend to reference... other files. Thus, I decided to refer to them as meta files. +A meta files should follow the following best principles: + +- Be located at [[help:sd-path-meta][sd-path-meta]] :: This ensures a tidy + [[help:user-emacs-directory][user-emacs-directory]]. +- Be explicit :: Meta filenames should not begin with a period: they + would be hidden by default on GNU/Linux systems. Novices must see + all files by default. + #+BEGIN_SRC emacs-lisp :tangle yes (defcustom sd-path-meta (concat user-emacs-directory "meta/") - "Directory (which is a file, really) containing files about files.") + "Directory containing files about files.") #+END_SRC **** Recently visited files @@ -202,6 +211,13 @@ files. (concat sd-path-meta "recentf")) #+END_SRC +**** File bookmarks + +#+BEGIN_SRC emacs-lisp :tangle yes + (setq bookmark-default-file + (concat sd-path-meta "bookmarks")) +#+END_SRC + **** Projects' bookmarks #+BEGIN_SRC emacs-lisp :tangle yes @@ -209,6 +225,24 @@ files. (concat sd-path-meta "projectile-bookmarks.eld")) #+END_SRC +**** Org id locations + +#+begin_quote +We track IDs through files, so that links work globally. The file +defined at [[help:org-id-locations-file][org-id-locations-file]] maintains a hash table for IDs and +writes this table to disk when exiting Emacs. Because of this, it +works best if you use a single Emacs process, not many. + +Paraphrased from [[help:org-id-track-globally][the Emacs help interface]]. +#+end_quote + +#+BEGIN_SRC emacs-lisp :tangle yes + (setq org-id-locations-file + (concat sd-path-meta "org-id-locations")) + ;; The leading period is removed because no files are hidden in the + ;; metafiles' directory. +#+END_SRC + **** Location in previously visited file #+BEGIN_SRC emacs-lisp :tangle yes @@ -322,8 +356,8 @@ Transparency. : (set-frame-parameter (selected-frame) 'alpha ) #+BEGIN_SRC emacs-lisp :tangle yes - (set-frame-parameter (selected-frame) 'alpha '(95 . 70)) - (add-to-list 'default-frame-alist '(alpha . (95 . 70))) + (set-frame-parameter (selected-frame) 'alpha '(90 . 70)) + (add-to-list 'default-frame-alist '(alpha . (90 . 70))) #+END_SRC ** Secrets @@ -811,18 +845,16 @@ Everlasting Father, Prince of Peace. :bind (("C-f" . swiper))) #+END_SRC -*** Web browsing +*** COMMENT Web browsing Thanks Xah![fn::[[http://ergoemacs.org/emacs/emacs_set_default_browser.html]]] +We use a browser depending on the url. #+BEGIN_SRC emacs-lisp :tangle yes - ;; use browser depending on url - (setq - browse-url-browser-function - '( - ("wikipedia\\.org" . browse-url-firefox) - ("github" . browse-url-chromium) + (setq browse-url-browser-function + '(("wikipedia\\.org" . browse-url-firefox) + ("github\\.com" . browse-url-chromium) ("thefreedictionary\\.com" . eww-browse-url) ("." . browse-url-default-browser) )) @@ -1791,34 +1823,36 @@ for our header line buttons for navigating through open windows. Now, we describe the actual format of the header line. #+BEGIN_SRC emacs-lisp :tangle yes - (setq-default - header-line-format - '(:eval - (list - (if (eq (length (window-list)) 1) - (propertize " ↤ " - 'face 'org-meta-line - 'mouse-face 'highlight - 'keymap sd-header-line-previous-buffer-keymap - 'help-echo "Return to previous window.") - (list (propertize " ❌ " - 'face 'org-meta-line - 'mouse-face 'org-todo - 'keymap sd-header-line-kill-buffer-keymap - 'help-echo "Close this window.") - (propertize " ⇱" - 'face 'org-meta-line - 'mouse-face 'highlight - 'keymap sd-header-line-maximize-window-keymap - 'help-echo "Maximize this window.") - (propertize "⇲ " - 'face 'org-meta-line - 'mouse-face 'highlight - 'keymap sd-header-line-minimize-window-keymap - 'help-echo "Minimize this window."))) - mode-line-buffer-identification))) - - (image-animate sd-icon-loading 0 t) + (use-package all-the-icons) + + (setq-default + header-line-format + '(:eval + (list + (if (eq (length (window-list)) 1) + (propertize " ↤ " + 'face 'org-meta-line + 'mouse-face 'highlight + 'keymap sd-header-line-previous-buffer-keymap + 'help-echo "Return to previous window.") + (list (propertize " ❌ " + 'face 'org-meta-line + 'mouse-face 'org-todo + 'keymap sd-header-line-kill-buffer-keymap + 'help-echo "Close this window.") + (propertize " ⇱" + 'face 'org-meta-line + 'mouse-face 'highlight + 'keymap sd-header-line-maximize-window-keymap + 'help-echo "Maximize this window.") + (propertize "⇲ " + 'face 'org-meta-line + 'mouse-face 'highlight + 'keymap sd-header-line-minimize-window-keymap + 'help-echo "Minimize this window."))) + mode-line-buffer-identification))) + + (image-animate sd-icon-loading 0 t) #+END_SRC **** Mode line diff --git a/smart-documents.pdf b/smart-documents.pdf index 5b09901..89e988c 100644 Binary files a/smart-documents.pdf and b/smart-documents.pdf differ -- cgit v1.2.3