diff --git a/.gitignore b/.gitignore index 4d0938f..0d783d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +build/ *.html result diff --git a/build.sh b/build.sh index f577fb7..f1a3881 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,4 @@ #!/bin/sh -find . -iname "*.md" -type f -exec sh -c 'pandoc -s -f markdown -t html --template=src/template.html -o "${0%.md}.html" "${0}"' {} \; +find src -type d -exec sh -c 'srcpath="$(realpath ${0})"; outpath=$(realpath "build${0#src}"); echo "src=$srcpath; dst=$outpath"; mkdir -p "$outpath" && cd "$srcpath" && pandoc -d "${srcpath}/defaults.pandoc" -o "${outpath}/index.html" ' {} \; + diff --git a/nix/shell.nix b/shell.nix similarity index 54% rename from nix/shell.nix rename to shell.nix index 56a40a1..d964240 100644 --- a/nix/shell.nix +++ b/shell.nix @@ -2,5 +2,5 @@ with pkgs; { - this = callPackage ./default.nix { }; + this = callPackage ./nix { }; } diff --git a/src/blog/defaults.pandoc b/src/blog/defaults.pandoc new file mode 100644 index 0000000..ea46930 --- /dev/null +++ b/src/blog/defaults.pandoc @@ -0,0 +1,8 @@ +defaults: +- ../defaults.pandoc +input-files: +- index.md +template: ../template.html + +metadata: + title: dadada's Blog diff --git a/src/blog/gpg/defaults.pandoc b/src/blog/gpg/defaults.pandoc new file mode 100644 index 0000000..cfa5a7c --- /dev/null +++ b/src/blog/gpg/defaults.pandoc @@ -0,0 +1,3 @@ +defaults: ../../defaults.pandoc +metadata: + title: Managing stripped GPG keys diff --git a/src/blog/gpg/index.md b/src/blog/gpg/index.md index 6e9145a..0c11aff 100644 --- a/src/blog/gpg/index.md +++ b/src/blog/gpg/index.md @@ -1,7 +1,3 @@ ---- -title: Managing stripped GPG keys -... - *2017-12-03* ``` diff --git a/src/blog/home-layout/defaults.pandoc b/src/blog/home-layout/defaults.pandoc new file mode 100644 index 0000000..a4a03ac --- /dev/null +++ b/src/blog/home-layout/defaults.pandoc @@ -0,0 +1,3 @@ +defaults: ../../defaults.pandoc +metadata: + title: My $HOME diff --git a/src/blog/home-layout/index.md b/src/blog/home-layout/index.md index f0d37d3..7df012a 100644 --- a/src/blog/home-layout/index.md +++ b/src/blog/home-layout/index.md @@ -1,7 +1,3 @@ ---- -title: My $HOME -... - *2018-09-03* Recently, I came across a blog posting titled "[$HOME, sweet $HOME](https://morr.cc/home-sweet-home/)", where [@blinry](https://morr.cc/) advocates for structuring your `$HOME` directory based on projects and their activity. diff --git a/src/blog/index.md b/src/blog/index.md index e0f52db..a9d0b06 100644 --- a/src/blog/index.md +++ b/src/blog/index.md @@ -1,6 +1,2 @@ ---- -title: Blogs -... - - [Managing stripped GPG keys](gpg/) - [My $HOME](home-layout/) diff --git a/src/defaults.pandoc b/src/defaults.pandoc new file mode 100644 index 0000000..9775040 --- /dev/null +++ b/src/defaults.pandoc @@ -0,0 +1,13 @@ +# Fallbacks + +from: markdown +to: html5 + +input-files: +- index.md + +standalone: true +metadata: + author: + - dadada + title: dadada diff --git a/src/index.md b/src/index.md index 0795308..7384d5b 100644 --- a/src/index.md +++ b/src/index.md @@ -1,7 +1,3 @@ ---- -title: dadada -... - **Welcome to my personal homepage ;-)** ## About this page diff --git a/src/projects/defaults.pandoc b/src/projects/defaults.pandoc new file mode 100644 index 0000000..841f2cb --- /dev/null +++ b/src/projects/defaults.pandoc @@ -0,0 +1,8 @@ +defaults: +- ../defaults.pandoc +input-files: +- index.md +template: ../template.html + +metadata: + title: dadada's projects diff --git a/src/projects/index.md b/src/projects/index.md index f5b8266..362222c 100644 --- a/src/projects/index.md +++ b/src/projects/index.md @@ -1,7 +1,3 @@ ---- -title: Projects -... - See also my [GitHub](https://github.com/dadada) and [Gitlab](https://gitlab.com/dadada_). ## Contributions diff --git a/src/talks/defaults.pandoc b/src/talks/defaults.pandoc new file mode 100644 index 0000000..b91fac4 --- /dev/null +++ b/src/talks/defaults.pandoc @@ -0,0 +1,8 @@ +defaults: +- ../defaults.pandoc +input-files: +- index.md +template: ../template.html + +metadata: + title: dadada's Talks diff --git a/src/talks/index.md b/src/talks/index.md index 60ae01b..3bc34ef 100644 --- a/src/talks/index.md +++ b/src/talks/index.md @@ -1,5 +1 @@ ---- -title: Talks -... - - [systemd.generator(7)](systemd.generator/) diff --git a/src/talks/systemd.generator/defaults.pandoc b/src/talks/systemd.generator/defaults.pandoc new file mode 100644 index 0000000..21a0f5d --- /dev/null +++ b/src/talks/systemd.generator/defaults.pandoc @@ -0,0 +1,3 @@ +defaults: ../../defaults.pandoc +metadata: + title: systemd.generator(7) diff --git a/src/talks/systemd.generator/index.md b/src/talks/systemd.generator/index.md index bc92dc4..b42d7bf 100644 --- a/src/talks/systemd.generator/index.md +++ b/src/talks/systemd.generator/index.md @@ -1,7 +1,3 @@ ---- -title: systemd.generator(7) -... - *2019-03-14* [Recording](https://www.youtube.com/watch?v=X88zHJjodFw)