commit 1301046e0e3ae596ead1151e4b6f0003a7423f55
parent ac05de0d4e6ceabeab1d9124f2a9f741c034f490
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Thu, 4 Jan 2024 12:31:31 +0200
Reformat file layout and site layout.
Diffstat:
6 files changed, 107 insertions(+), 69 deletions(-)
diff --git a/assets/index.css b/assets/index.css
@@ -1,12 +1,14 @@
+h1 { text-align: center; }
body {
- background: #222;
- color: wheat;
- background-image: linear-gradient(to bottom, #111, #222);
- background-size: 2px 2px;
- /*margin: 0;
- padding: 0;
- */
- }
+ background: #222;
+ color: wheat;
+ background-image: linear-gradient(to bottom, #111, #222);
+ background-size: 2px 2px;
+ /*
+ margin: 0;
+ padding: 0;
+ */
+}
div { width: 920px; max-width: calc(100% - 20px); margin: auto; }
#topmostdiv {
box-shadow: 0px -20px 50px -20px #fff;
diff --git a/haunt.scm b/haunt.scm
@@ -16,8 +16,10 @@
(haunt reader)
(haunt site)
- (prefix (kakafarm index)
- kakafarm:index:))
+ (prefix (kakafarm index) kakafarm:index:)
+ (prefix (kakafarm software clipboard-speaker) kakafarm:software:clipboard-speaker:)
+ (prefix (kakafarm software diceware) kakafarm:software:diceware:)
+ (prefix (kakafarm software) kakafarm:software:))
(define (dp a) (pretty-print a) a)
@@ -104,9 +106,10 @@
(title ,(string-append site-title-prefix
" -- "
a-page-title-string)))
- (body ,an-sxml-tree
- ,haunt-footer
- ,creative-commons-copyright-notice))))
+ (body (div (@ (id "topmostdiv"))
+ ,an-sxml-tree
+ ,haunt-footer
+ ,creative-commons-copyright-notice)))))
(define blog-theme
(theme #:name "blog-theme"
@@ -119,9 +122,10 @@
(type "text/css")
(href "/assets/index.css")))
(title ,site-title-prefix))
- (body ,an-sxml-tree
- ,haunt-footer
- ,creative-commons-copyright-notice))))
+ (body (div (@ (id "topmostdiv"))
+ ,an-sxml-tree
+ ,haunt-footer
+ ,creative-commons-copyright-notice)))))
(define topsite-theme
(theme #:name "topsite-theme"
@@ -141,6 +145,15 @@
(page-builder #:destination "/index.html"
#:make-sxml kakafarm:index:make-index-sxml
#:theme topsite-theme)
+ (page-builder #:destination "/software/index.html"
+ #:make-sxml kakafarm:software:make-sxml
+ #:theme topsite-theme)
+ (page-builder #:destination "/software/diceware.html"
+ #:make-sxml kakafarm:software:diceware:make-sxml
+ #:theme topsite-theme)
+ (page-builder #:destination "/software/clipboard-speaker.html"
+ #:make-sxml kakafarm:software:clipboard-speaker:make-sxml
+ #:theme topsite-theme)
(atom-feed #:file-name "/haunt/feed.xml"
#:blog-prefix "/haunt/posts")
(atom-feeds-by-tag #:prefix "/haunt/feeds"
diff --git a/kakafarm/index.scm b/kakafarm/index.scm
@@ -4,65 +4,36 @@
(begin
(define* (make-index-sxml #:key posts)
- `(div (@ (id "topmostdiv"))
- (h1 "Various stuff:")
- (h2 "Clipboard Speaker")
- (p "An accessibility tool that reads either what you mark with your mouse:"
- (dl
- (dt "Python")
-
- (dd (pre "clipboard-speaker -p"))
-
- (dt "Guile>")
- (dd (pre "clipboard-speaker --clipboard-type=p")))
-
- "Or the contents of your clipboard:"
-
- (dl
- (dt "Python")
- (dd (pre "clipboard-speaker -b"))
- (dt "Guile")
- (dd (pre "clipboard-speaker --clipboard-type=b")))
-
- (a (@ (href "https://sr.ht/~kakafarm/clipboard-speaker/"))
- "Clipboard Speaker's Sourcehut repositories"))
- (h3 "Python Clipboard Speaker")
- (p "The original Python code:"
- (a (@ (href "https://git.sr.ht/~kakafarm/clipboard-speaker/"))
- "Python Clipboard Speaker's Sourcehut repository"))
- (h3 "Guile Clipboard Speaker")
- (p "Also rewritten it in Guile:"
- (a (@ (href "https://git.sr.ht/~kakafarm/clipboard-speaker/"))
- "Guile Clipboard Speaker's Sourcehut repository"))
-
- (h2 "Rusty Diceware")
- (p
- (a (@ (href "https://github.com/yuvallanger/rusty-diceware/"))
- "A diceware tool in Rustlang."))
+ `(div (h1 "Everything I do is shit, hence: "
+ (br)
+ (a (@ (href "https://kaka.farm/"))
+ "Kaka Farm"))
+ (h2 "Software:")
+ (a (@ (href "/software/"))
+ "Various software!")
(h2 "Blog")
(ul
- (li (a (@ (href "//kaka.farm/blog/"))
- "blog-ish"))
(li (a (@ (href "//kaka.farm/haunt/"))
- "A Haunt blog! Maybe I will migrate everything into Haunt and SXML?")))
+ "A Haunt blog!"))
+ (li (a (@ (href "//kaka.farm/blog/"))
+ "blog-ish. Will be merged into the Haunt blog.")))
(h2 "Commonly Forgotten")
(a (@ (href "//kaka.farm/~commonly-forgotten/")) "Commonly Forgotten")
- " "
- "has some terribly written notes (which I should consolidate into Haunt)."
+ " has some terribly written notes (which I should consolidate into
+Haunt). A very old bunch of static site generator notes."
(h2 "Git repository repositories")
- (p (ul (li "The static site generator"
+ (p (ul (li (a (@ (href "/stagit/"))
+ "My copies of some of my git repositories")
+ "were generated by the static site generator"
(a (@ (href "https://codemadness.org/stagit.html"))
"Stagit")
- "("
+ " ("
(a (@ (href "https://codemadness.org/git/stagit/file/README.html"))
"README")
- ") was used to generate"
- (a (@ (href "/stagit/"))
- "my copies of some of my git repositories")
- ".")
+ ").")
(li (a (@ (href "//sr.ht/~kakafarm/")) "Sourcehut"))
(li (a (@ (href "//gitgud.io/yuvallanger/")) "GitGud profile"))
(li (a (@ (href "//gitlab.com/yuvallanger/")) "GitLab profile"))
@@ -71,15 +42,11 @@
(h2 "org-roam notes")
(p
"Splitting your org-roam notes into"
- (a (@ (href "/private-org-roam-notes/")) "private")
- " "
- "and"
- " "
+ (a (@ (href "/private-org-roam-notes/")) " private")
+ " and "
(a (@ (href "/org-roam-notes/"))
"public")
- " "
- "notes is a pain in the arse. Luckily for me I love"
- " "
+ " notes is a pain in the arse. Luckily for me I love "
(a (@ (href "//en.wikipedia.org/wiki/Pita"))
"."))
diff --git a/kakafarm/software.scm b/kakafarm/software.scm
@@ -0,0 +1,10 @@
+(define-library (kakafarm software)
+ (import (guile))
+ (export make-sxml)
+
+ (begin
+ (define* (make-sxml #:key posts)
+ `(div (ul (li (a (@ (href "diceware.html"))
+ "Diceware!"))
+ (li (a (@ (href "clipboard-speaker.html"))
+ "Clipboard Speaker!")))))))
diff --git a/kakafarm/software/clipboard-speaker.scm b/kakafarm/software/clipboard-speaker.scm
@@ -0,0 +1,35 @@
+(define-library (kakafarm software clipboard-speaker)
+ (import (guile))
+ (export make-sxml)
+
+ (begin
+ (define* (make-sxml #:key posts)
+ `(div
+ (h2 "Clipboard Speaker")
+ (p "An accessibility tool that reads either what you mark with your mouse:"
+ (dl
+ (dt "Python")
+
+ (dd (pre "clipboard-speaker -p"))
+
+ (dt "Guile>")
+ (dd (pre "clipboard-speaker --clipboard-type=p")))
+
+ "Or the contents of your clipboard:"
+
+ (dl
+ (dt "Python")
+ (dd (pre "clipboard-speaker -b"))
+ (dt "Guile")
+ (dd (pre "clipboard-speaker --clipboard-type=b")))
+
+ (a (@ (href "https://sr.ht/~kakafarm/clipboard-speaker/"))
+ "Clipboard Speaker's Sourcehut repositories"))
+ (h3 "Python Clipboard Speaker")
+ (p "The original Python code:"
+ (a (@ (href "https://git.sr.ht/~kakafarm/clipboard-speaker/"))
+ "Python Clipboard Speaker's Sourcehut repository"))
+ (h3 "Guile Clipboard Speaker")
+ (p "Also rewritten it in Guile:"
+ (a (@ (href "https://git.sr.ht/~kakafarm/clipboard-speaker/"))
+ "Guile Clipboard Speaker's Sourcehut repository"))))))
diff --git a/kakafarm/software/diceware.scm b/kakafarm/software/diceware.scm
@@ -0,0 +1,11 @@
+(define-library (kakafarm software diceware)
+ (import (guile))
+ (export make-sxml)
+
+ (begin
+ (define* (make-sxml #:key posts)
+ `(div
+ (h2 "Rusty Diceware")
+ (p
+ (a (@ (href "https://gitlab.com/yuvallanger/rusty-diceware/"))
+ "A diceware tool in Rustlang."))))))
