[Org] Repository for my personal website.

Main site.

Commit
9ff58899a77cde20d61fac7d459702e54bfacd9c
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
Changed files
index.org
index d4f69096..655fb698 100644..100644
@@ -43,6 +43,8 @@
43 43 :PROPERTIES:
44 44 :CUSTOM_ID: table-of-contents
45 45 :END:
46 Added: # The above hack enables jumping to the main content cards from the
47 Added: # "Contents" button in the top navbar, in the narrow screen layout.
46 48
47 49 # #+NAME: recent-posts
48 50 # #+BEGIN_SRC emacs-lisp :exports results :results list
@@ -59,27 +61,32 @@
59 61 # (mapcar make-link recent-posts))
60 62 # #+END_SRC
61 63
62 Removed:
63 64 - [[https://blog.mlnp.fr/2022/hello-world.html][Hello World!]]
64 65 - [[https://blog.mlnp.fr/2022/why-study-languages.html][Why study languages?]]
65 66
67 Added: [[https://blog.mlnp.fr/sitemap.html][See more...]]
66 68
67 Removed: [[http://blog.mlnp.fr/sitemap.html][See more...]]
68 69
69 Removed:
70 70 ** Main wiki sections
71 71
72 72 - [[https://wiki.mlnp.fr/engineering/index.html][Engineering]]
73 73 - [[https://wiki.mlnp.fr/emacs/index.html][Emacs]]
74 74 - [[https://wiki.mlnp.fr/languages/index.html][Languages]]
75 75
76 Added: [[https://wiki.mlnp.fr/index.html][See more...]]
76 77
77 Removed: [[http://wiki.mlnp.fr/index.html][See more...]]
78 78
79 Added: ** Apps
79 80
80 Removed: ** Publish this website
81 Added: I'm learning about developing online apps.
81 82
82 Removed: Learn how I write and publish this website [[file:publish-mlnp.org][here]].
83 Added: [[https://apps.mlnp.fr][What's cooking?]]
84 Added:
85 Added:
86 Added: ** Publishing this website
87 Added:
88 Added: - [[file:publish-mlnp.org][Publishing workflow]]
89 Added: - [[file:resources/css.org][CSS stylesheet]]
83 90
84 91
85 92 ** Online resume
publish-mlnp.org
index c8f299ca..7b814069 100644..100644
@@ -48,43 +48,50 @@
48 48 uncorrelated content.
49 49
50 50 #+NAME: tree
51 Removed: #+BEGIN_SRC bash :results verbatim :exports results
52 Removed: tree -L 2 -I *.html
51 Added: #+BEGIN_SRC bash :results verbatim :exports both
52 Added: tree -F -L 2
53 53 #+END_SRC
54 54
55 55 #+RESULTS: tree
56 56 #+begin_example
57 Removed: .
57 Added: ./
58 58 ├── README.org
59 59 ├── about.org
60 Removed: ├── blog
61 Removed: │   ├── 2022
62 Removed: │   ├── 2023
60 Added: ├── apps/
63 61 │   ├── index.org
64 62 │   └── sitemap.org
63 Added: ├── blog/
64 Added: │   ├── 2022/
65 Added: │   ├── 2023/
66 Added: │   └── index.org
65 67 ├── cv.org
66 68 ├── cv.txt
67 69 ├── index.org
70 Added: ├── publish-mlnp.html
68 71 ├── publish-mlnp.org
69 Removed: ├── resources
72 Added: ├── resources/
70 73 │   ├── css.org
71 74 │   ├── favicon.png
72 75 │   ├── favicon.xcf
73 Removed: │   ├── fonts
74 Removed: │   └── mlnp.css
76 Added: │   ├── fonts/
77 Added: │   ├── mlnp.css
78 Added: │   └── topnav.html
75 79 ├── sitemap.org
76 Removed: └── wiki
77 Removed: ├── aerospace
78 Removed: ├── emacs
79 Removed: ├── images
80 Added: └── wiki/
81 Added: ├── emacs/
82 Added: ├── engineering/
83 Added: ├── fitness/
84 Added: ├── images/
85 Added: ├── index-with-images.org.bkp
86 Added: ├── index.html
80 87 ├── index.org
81 Removed: ├── languages
82 Removed: ├── linux
83 Removed: ├── programming
88 Added: ├── languages/
89 Added: ├── linux/
90 Added: ├── programming/
84 91 ├── sitemap.org
85 Removed: └── typography
92 Added: └── typography/
86 93
87 Removed: 13 directories, 15 files
94 Added: 15 directories, 20 files
88 95 #+end_example
89 96
90 97
@@ -121,12 +128,6 @@
121 128 (read-string
122 129 "Local target: " "/tmp/")))
123 130
124 Removed: (setq org-publish-location-local
125 Removed: (or org-publish-location-local
126 Removed: (read-string "Local target: " "/tmp/")))
127 Removed:
128 Removed:
129 Removed:
130 131 (unless (boundp 'org-publish-location-remote)
131 132 (setq org-publish-location-remote
132 133 (read-string
@@ -151,6 +152,8 @@
151 152 ?w "build the wiki")
152 153 ("blog.mlnp.fr"
153 154 ?b "build the blog")
155 Added: ("apps.mlnp.fr"
156 Added: ?a "build the apps homepage")
154 157 ("everything"
155 158 ?e "build everything for all websites")
156 159 ("all-styles"
@@ -197,8 +200,8 @@
197 200 identify website components and their properties upon export. It
198 201 enables us to target different directories when publishing; I can
199 202 write this website in a single, version-controlled directory, whilst
200 Removed: maintaining separate export directories for =wiki.mlnp.fr= and
201 Removed: =blog.mlnp.fr=.
203 Added: maintaining separate export directories for =wiki.mlnp.fr=,
204 Added: =blog.mlnp.fr=, and =apps.mlnp.fr=.
202 205
203 206 Both the wiki and the blog call for css and font resources hosted on
204 207 =mlnp.fr=, so these resources need only be exported once---to the
@@ -206,17 +209,19 @@
206 209
207 210 #+NAME: org-publish-project-alist
208 211 #+BEGIN_SRC emacs-lisp :noweb no-export :results pp
209 Removed: (require 'ox-publish)
210 Removed: (setq org-publish-project-alist
211 Removed: `( ;; This line left blank to avoid noweb honoring `( prefix.
212 Removed: <<mlnp.fr>>
213 Removed: <<wiki.mlnp.fr>>
214 Removed: <<blog.mlnp.fr>>
215 Removed: <<all-styles>>
216 Removed: ("everything"
217 Removed: :components ("mlnp.fr"
218 Removed: "wiki.mlnp.fr"
219 Removed: "blog.mlnp.fr"))))
212 Added: (require 'ox-publish)
213 Added: (setq org-publish-project-alist
214 Added: `( ;; This line left blank to avoid noweb honoring `( prefix.
215 Added: <<mlnp.fr>>
216 Added: <<wiki.mlnp.fr>>
217 Added: <<blog.mlnp.fr>>
218 Added: <<apps.mlnp.fr>>
219 Added: <<all-styles>>
220 Added: ("everything"
221 Added: :components ("mlnp.fr"
222 Added: "wiki.mlnp.fr"
223 Added: "blog.mlnp.fr"
224 Added: "apps.mlnp.fr"))))
220 225 #+END_SRC
221 226
222 227
@@ -238,7 +243,8 @@
238 243 ("all-styles"
239 244 :components ("styles-mlnp"
240 245 "styles-wiki"
241 Removed: "styles-blog"))
246 Added: "styles-blog"
247 Added: "styles-apps"))
242 248 ("styles-mlnp"
243 249 :base-directory "resources/"
244 250 :base-extension "css"
@@ -254,6 +260,11 @@
254 260 :base-extension "css"
255 261 :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/resources/")
256 262 :publishing-function org-publish-attachment)
263 Added: ("styles-apps"
264 Added: :base-directory "resources/"
265 Added: :base-extension "css"
266 Added: :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/resources/")
267 Added: :publishing-function org-publish-attachment)
257 268 #+END_SRC
258 269
259 270
@@ -273,7 +284,7 @@
273 284 :publishing-directory ,(concat org-publish-location-local "mlnp.fr/")
274 285 :recursive nil ; Main site pages are all in top-level org directory.
275 286 :auto-sitemap t
276 Removed: :sitemap-title "Sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]"
287 Added: :sitemap-title "Sitemap for [[https://mlnp.fr][mlnp.fr]]"
277 288 :publishing-function org-html-publish-to-html)
278 289 ("mlnp-cv-txt"
279 290 :base-directory "./"
@@ -547,6 +558,39 @@
547 558 #+END_SRC
548 559
549 560
561 Added: ** =apps.mlnp.fr=
562 Added:
563 Added: #+NAME: apps.mlnp.fr
564 Added: #+BEGIN_SRC emacs-lisp
565 Added: ("apps.mlnp.fr"
566 Added: :components ("apps-homepage"
567 Added: "apps-resources"
568 Added: "apps-fonts"))
569 Added: ("apps-homepage"
570 Added: :base-directory "apps/"
571 Added: :base-extension "org"
572 Added: :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/")
573 Added: :recursive t
574 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/mlnp.css'/>
575 Added: <link rel='icon' type='image/png' href='https://apps.mlnp.fr/resources/favicon.png'/>"
576 Added: :auto-sitemap t
577 Added: :sitemap-filename "sitemap.org"
578 Added: :sitemap-title "Sitemap for [[https://apps.mlnp.fr][apps.mlnp.fr]]"
579 Added: :sitemap-sort-files chronologically
580 Added: :publishing-function org-html-publish-to-html)
581 Added: ("apps-resources"
582 Added: :base-directory "resources/"
583 Added: :base-extension "css\\|js\\|png"
584 Added: :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/resources/")
585 Added: :publishing-function org-publish-attachment)
586 Added: ("apps-fonts"
587 Added: :base-directory "resources/fonts/"
588 Added: :base-extension "ttf\\|otf"
589 Added: :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/resources/fonts/")
590 Added: :publishing-function org-publish-attachment)
591 Added: #+END_SRC
592 Added:
593 Added:
550 594 * Main publishing logic :main:
551 595
552 596 This is the main publishing logic. Execute the following source block
@@ -575,7 +619,7 @@
575 619 (let* ((local org-publish-location-local)
576 620 (local-websites (concat local "*mlnp.fr"))
577 621 (remote org-publish-location-remote)
578 Removed: (sync-command (format "rsync -razvP %s %s" local-websites remote)))
622 Added: (sync-command (format "rsync -azvP %s %s" local-websites remote)))
579 623 (if (not (yes-or-no-p "Push local changes to remote target? "))
580 624 (message "Didn't publish remotely to %s." remote)
581 625 (message
@@ -584,7 +628,7 @@
584 628 #+END_SRC
585 629
586 630 #+RESULTS: main
587 Removed: : #<window 57 on *Async Shell Command*>
631 Added: : #<window 257 on *Async Shell Command*>
588 632
589 633 The following links to the locally built homepages are useful after
590 634 building the website locally, to check that everything proceeded smoothly.
@@ -592,3 +636,4 @@
592 636 - Main site :: [[file:/tmp/mlnp.fr/index.html]]
593 637 - Wiki :: [[file:/tmp/wiki.mlnp.fr/index.html]]
594 638 - Blog :: [[file:/tmp/blog.mlnp.fr/index.html]]
639 Added: - Apps :: [[file:/tmp/apps.mlnp.fr/index.html]]