diff --git a/README.md b/README.md
index ac3a3b7..66e34ec 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,7 @@
# stevengibone.com gemini capsule
+
This is where all sources related to my Gemini capsule and my website go.
-You will find both the content I write and the script I use to generate the html from
-the gemtext files.
+I write everything in gemtext first and only then generate the html for the web using
+my own tool [Gmirator](https://git.stevengibone.com/stev/Gmirator.git).
-> Lots of things will change in the script to make it more flexible and sensible.
-
-I write everything in gemtext first and only then generate the html for the web.
-
-## Configuration
-The script needs a config file to provide the remote servers and some directory
-paths. The script uses rsync to push files to the server so go check its manual if
-you need help settings `RGMI` and `RHTML`.
-
-| variable name | description |
-|---------------|---------------------------------------|
-| WORKDIR | base directory |
-| ASSETS | |
-| LGMI | local directory with all your gemtext |
-| RGMI | remote directory to put your gemtext |
-| HTML_HEADER | |
-| HTML_FOOTER | |
-| LHTML | local directory to put generated HTML |
-| RHTML | remote directory to put your HTML |
-
-## To do
-- [ ] make script also generate the title based on first h1 title
-- [ ] make more variable to use less hard-coded paths
-- [ ] reorganise the directory ?
- - `html-in`, `html-out`, `gmi`, `assets`...
-- [ ] separate script into its own repo ?
diff --git a/assets/style.css b/assets/style.css
index d3de647..03a7368 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -1,4 +1,5 @@
body {
+ font-family: monospace;
max-width: 750px;
margin: auto;
background: black;
diff --git a/content/gemlog/2021-05-01_windowssucks.gmi b/content/gemlog/2021-05-01_windowssucks.gmi
index fd02050..158ee07 100644
--- a/content/gemlog/2021-05-01_windowssucks.gmi
+++ b/content/gemlog/2021-05-01_windowssucks.gmi
@@ -7,6 +7,7 @@ I discovered that back in 2018 I tried to prevent MS from spying on me by disabl
All this was so I could play Minecraft with my SO. I had not played Minecraft in many years, Mojang had not been bought by MS last time I played. I was so angry when I learnt about the bedrock edition and that I had to buy it even though I already had the java edition (I don't intend to play the bedrock edition but the fact that you have to pay twice to have both is infuriating to me). The worst part is that by the end of the year if I want to continue playing I have to use a MS account with Minecraft instead of my Mojang account and that also pisses my off very much.
Unfortunately these are not the only reasons I hate MS, they were just new reasons that added to the others.
+
---
=> /index.gmi
=> /gemlog/index.gmi
diff --git a/content/gemlog/2021-05-04_networking_school.gmi b/content/gemlog/2021-05-04_networking_school.gmi
index 60bfa01..dd91224 100644
--- a/content/gemlog/2021-05-04_networking_school.gmi
+++ b/content/gemlog/2021-05-04_networking_school.gmi
@@ -1,6 +1,7 @@
# I'm learning networking
I'm currently learning networking stuff to become a sysadmin on my own waiting for the formation to start. I'm looking at a free Coursera course and videos on Youtube and I'm having a blast learning all this but it makes me want to buy all kind of things that would be way overkill both for my wallet and for my home network...
+
---
=> /index.gmi
=> /gemlog/index.gmi
diff --git a/content/gemlog/index.gmi b/content/gemlog/index.gmi
index 6a590d7..73c1cd1 100644
--- a/content/gemlog/index.gmi
+++ b/content/gemlog/index.gmi
@@ -22,6 +22,7 @@ there's a list of ideas:
=> /gemlog/2021-05-04_networking_school.gmi 2021-05-04 - I'm learning networking
=> /gemlog/2021-05-01_windowssucks.gmi 2021-05-01 - I hate Microsoft
+
---
=> /index.gmi
=> /gemlog/index.gmi
diff --git a/content/index.gmi b/content/index.gmi
index 4b34553..01cee42 100644
--- a/content/index.gmi
+++ b/content/index.gmi
@@ -44,8 +44,7 @@ And sportswise:
* Pokemon: Shining Pearl
## logs
-=> tinylog.gmi tinylogs go here
-=> gemlog/index.gmi full gemlogs here
+=> /gemlog/index.gmi all gemlogs here
=> /gemlog/2021-05-04_networking_school.gmi 2021-05-04 - I'm learning networking
=> /gemlog/2021-05-01_windowssucks.gmi 2021-05-01 - I hate Microsoft
diff --git a/content/projects.gmi b/content/projects.gmi
index c3f8618..51acf75 100644
--- a/content/projects.gmi
+++ b/content/projects.gmi
@@ -1,13 +1,18 @@
# Current or finished projects
+
sorted in reverse chronological order so that the most recent projects appears first:
+
## 2023
+* once again i returned to *Gitea* because i had performance issues with *OneDev*
* resuscitate my gemini capsule again after reading an article by Ploum
=> gemini://ploum.net/2022-12-04-fin-du-blog-et-derniere-version.gmi
+
## 2022
* settle to *Onedev*
* tried *gitolite* and *cgit* replacement of *Gitea*
* a lot of testing of different minecraft servers and frontend to manage them. I finaly dicided to keep it simple by using cronjobs and tmux. I found that web dashboards are to cumbersome and not flexible enough.
* multiple things of which I didn't keep records
+
## 2021
* migrate website from PicoCMS to 11ty
* installed agate to serve this gemini capsule :)
diff --git a/content/tinylog.gmi b/content/tinylog.gmi
deleted file mode 100644
index e965228..0000000
--- a/content/tinylog.gmi
+++ /dev/null
@@ -1,6 +0,0 @@
----
-=> /index.gmi
-=> /gemlog/index.gmi
-
-contact me by mail: steven.gibone at zaclys dot net
-=> https://mastodon.zaclys.com/@lonion @lonion@mastodon.zaclys.com on mastodon
diff --git a/footer.gmi b/gmi-helper/footer.gmi
similarity index 97%
rename from footer.gmi
rename to gmi-helper/footer.gmi
index e965228..d84b682 100644
--- a/footer.gmi
+++ b/gmi-helper/footer.gmi
@@ -1,4 +1,3 @@
----
=> /index.gmi
=> /gemlog/index.gmi
diff --git a/gmirator.sh b/gmirator.sh
deleted file mode 100755
index 67dc0e8..0000000
--- a/gmirator.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#! /usr/bin/env bash
-
-source ./gmirator.conf
-
-COMMAND=$1
-PARAM=$2
-
-make_gemlogs_index() {
-
- rm articles.gmi.temp
-
- echo "generating articles.gmi.temp"
- ls $LGMI/gemlog | grep -v 'index' | sort -r \
- | while read fname; do
- local date=$(echo "$fname" | sed "s/_.*//")
- local title=$(head -1 $LGMI/gemlog/$fname | sed "s/# //")
- echo "=> /gemlog/$fname $date - $title" >> $WORKDIR/articles.gmi.temp
- done
- head $WORKDIR/articles.gmi.temp > $WORKDIR/head-articles.gmi.temp
-
- echo "generating gemlog/index.gmi"
- sed -i -e "/^## logs/,//{
- /^#/!d
- }" -e "/^## logs/{
- a
- r $WORKDIR/articles.gmi.temp
- }" $LGMI/gemlog/index.gmi
-
- echo "generating index.gmi"
- sed -i -e "/^## logs/,//{
- /^#/!d
- }" -e "/^## logs/{
- a => tinylog.gmi tinylogs go here
- a => gemlog/index.gmi full gemlogs here
- a
- r $WORKDIR/head-articles.gmi.temp
- a
- }" $LGMI/index.gmi
-
- echo "generate footer for every .gmi"
- while read -r file; do
- sed -i -e "/^---/,//{
- d
- }" $file
- cat $WORKDIR/footer.gmi >> $file
- done < <(find $LGMI -type f -name \*.gmi)
- echo "DONE :)"
-}
-
-inline_parsing() {
- sed -E 's|\*([^\*]+)\*|\1|g' |
- sed -E 's|~~(.*)~~|\1|g'
-}
-
-gmi2html() {
- local in_list=no
- local in_preformated=no
-
- while read -r line; do
- if [[ $line == "---" ]]; then
- break
- fi
-
- if [[ "$in_list" == yes ]]; then
- if [[ "$line" == '* '* ]]; then
- printf "
\n" - ;; - *) - printf "%s
\n" "$line" | inline_parsing - ;; - esac - done -} - -make_html() { - while read -r file; do - local dest=${file/.gmi/.html} - dest=${dest/\/content\//\/html-output\/} - - printf "... %s\n" $dest - cat $HTML_HEADER > $dest - gmi2html < "$file" >> $dest - cat $HTML_FOOTER >> $dest - done < <(find $LGMI -type f -name \*.gmi) - echo "Done generating HTML" - echo "Copying statis assets" - cp $ASSETS/* $LHTML -} - -synchronise() { - if [[ $PARAM == "html" ]]; then - echo "Synchronising HTML content with remote" - rsync -aP -e "ssh -p 1312" $LHTML $RHTML - elif [[ $PARAM == "gmi" ]]; then - echo "Synchtonising GMI content with remote" - rsync -aP -e "ssh -p 1312" $LGMI $RGMI - else - echo "Synchtonising GMI and HTML content with remote" - rsync -aP -e "ssh -p 1312" $LHTML $RHTML - rsync -aP -e "ssh -p 1312" $LGMI $RGMI - fi -} - -generate() { - case $1 in - gmi) - make_gemlogs_index - ;; - html) - make_html - ;; - esac -} - -usage() { - echo "\ -Usage: $0- -Commands: - gen generates output - sync synchronises files with server with rsync -" -} - -main() { - case $COMMAND in - gen) - generate $PARAM - ;; - sync) - synchronise - ;; - *) - usage - ;; - esac -} - -main diff --git a/html-parts/footer-part.html b/html-helper/footer-part.html similarity index 56% rename from html-parts/footer-part.html rename to html-helper/footer-part.html index 8f916ff..86ec180 100644 --- a/html-parts/footer-part.html +++ b/html-helper/footer-part.html @@ -3,7 +3,7 @@
- Mail me: steven.gibone
-zaclys (dot) net - My mastodon profile
+- My mastodon profile