From 9d76c3fa2af87ad31938d943339707818ddfbbc4 Mon Sep 17 00:00:00 2001 From: stev Date: Thu, 7 Sep 2023 21:37:47 +0200 Subject: [PATCH] update everything gmirator is now in its own repo and rewritten in Python. the rest of the content was updated --- README.md | 31 +-- assets/style.css | 1 + content/gemlog/2021-05-01_windowssucks.gmi | 1 + .../gemlog/2021-05-04_networking_school.gmi | 1 + content/gemlog/index.gmi | 1 + content/index.gmi | 3 +- content/projects.gmi | 5 + content/tinylog.gmi | 6 - footer.gmi => gmi-helper/footer.gmi | 1 - gmirator.sh | 179 ------------------ {html-parts => html-helper}/footer-part.html | 2 +- {html-parts => html-helper}/header-part.html | 2 +- html-output/tinylog.html | 27 --- {html-output => web}/favicon.ico | Bin .../gemlog/2021-05-01_windowssucks.html | 8 +- .../gemlog/2021-05-04_networking_school.html | 6 +- {html-output => web}/gemlog/index.html | 11 +- {html-output => web}/gibone-CV.pdf | Bin {html-output => web}/index.html | 16 +- {html-output => web}/projects.html | 12 +- {html-output => web}/style.css | 1 + 21 files changed, 57 insertions(+), 257 deletions(-) delete mode 100644 content/tinylog.gmi rename footer.gmi => gmi-helper/footer.gmi (97%) delete mode 100755 gmirator.sh rename {html-parts => html-helper}/footer-part.html (56%) rename {html-parts => html-helper}/header-part.html (92%) delete mode 100644 html-output/tinylog.html rename {html-output => web}/favicon.ico (100%) rename {html-output => web}/gemlog/2021-05-01_windowssucks.html (94%) rename {html-output => web}/gemlog/2021-05-04_networking_school.html (87%) rename {html-output => web}/gemlog/index.html (92%) rename {html-output => web}/gibone-CV.pdf (100%) rename {html-output => web}/index.html (93%) rename {html-output => web}/projects.html (85%) rename {html-output => web}/style.css (94%) 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 "
  • %s
    • \n" "${line/\* /}" | inline_parsing - continue - else - in_list=no - printf "\n" - fi - elif [[ "$in_preformated" == yes ]]; then - if [[ "$line" == '```'* ]]; then - in_preformated=no - printf "\n" - else - printf "%s\n" "$line" - fi - continue - fi - - case "$line" in - '') - ;; - '* '*) - in_list=yes - printf "

    # I hate Microsoft

    +

    Yep, like a lot of people I hate Microsoft so I'll try to be a little specific.

    +

    First of all, the only reason I still have Windows on my desktop is for gaming reasons and only that, most of what I do happens on GNU+Linux on my laptop which is not powerfull to play something more advanced than OSRS. I hadn't played on that desktop for a very long time because I no longer had a GPU but I found a very, very old GT240 at my parent's house to put in there so I started using it again... It was my first use of Windows in about two years and it was a pain!

    I discovered that back in 2018 I tried to prevent MS from spying on me by disabling every telemetry I could... so that was a mistake because now Windows just refuses to update. I know it was my fault but it feels so wrong that if I don't want my pc to send MS data about what I do on my computer I also have to give up having Windows updates.

    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.

    +     diff --git a/html-output/gemlog/2021-05-04_networking_school.html b/web/gemlog/2021-05-04_networking_school.html similarity index 87% rename from html-output/gemlog/2021-05-04_networking_school.html rename to web/gemlog/2021-05-04_networking_school.html index 3f1dc2b..40f5719 100644 --- a/html-output/gemlog/2021-05-04_networking_school.html +++ b/web/gemlog/2021-05-04_networking_school.html @@ -2,7 +2,7 @@ - stevengibone.com + I'm learning networking @@ -17,13 +17,15 @@

    # 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...

    +     diff --git a/html-output/gemlog/index.html b/web/gemlog/index.html similarity index 92% rename from html-output/gemlog/index.html rename to web/gemlog/index.html index e2e329c..f3725e5 100644 --- a/html-output/gemlog/index.html +++ b/web/gemlog/index.html @@ -2,7 +2,7 @@ - stevengibone.com + log index @@ -18,12 +18,14 @@

    # log index

    Here will live gemlog posts about nothing and everything, I will rant a lot I thing, I could I not, you deserve entertainment!

    +

    there's a list of ideas:

    + + + +

    ## logs

    +     => 2021-05-04 - I'm learning networking
    => 2021-05-01 - I hate Microsoft
    + diff --git a/html-output/gibone-CV.pdf b/web/gibone-CV.pdf similarity index 100% rename from html-output/gibone-CV.pdf rename to web/gibone-CV.pdf diff --git a/html-output/index.html b/web/index.html similarity index 93% rename from html-output/index.html rename to web/index.html index b75bbed..5c57937 100644 --- a/html-output/index.html +++ b/web/index.html @@ -21,14 +21,18 @@ ▄██ ▄ ▀▄█ █ █▄█ ▀▄▀ █ ▀█ █▄▄ Est. 17th of February 2021. +

    # stevengibone.com

    => my resume (in french)
    +

    Hello, my name is Steven Gibone and welcome to my gemini capsule. I used to study mathematics but quit due to me realizing I don't want to teach to an entire class. The public education system is far too broken for me and I really cannot accept to work in these conditions.

    +

    I have both a website and a gemini capsule:

    => gemini://stevengibone.com
    => https://stevengibone.com

    If you don't know about the gemini protocol and care about a more simple internet, I strongly encourage you to learn more about it:

    => https://gemini.circumlunar.space/
    +

    I take interest in:

    +

    And sportswise:

    + => my differents projects
    +

    ## what I'm reading

    +

    ## what I'm playing

    +

    ## logs

    -=> tinylogs go here
    -=> full gemlogs here
    +=> all gemlogs here
    + => 2021-05-04 - I'm learning networking
    => 2021-05-01 - I hate Microsoft
    + diff --git a/html-output/projects.html b/web/projects.html similarity index 85% rename from html-output/projects.html rename to web/projects.html index 1d56861..b619dd1 100644 --- a/html-output/projects.html +++ b/web/projects.html @@ -2,7 +2,7 @@ - stevengibone.com + Current or finished projects @@ -17,12 +17,16 @@

    # Current or finished projects

    +

    sorted in reverse chronological order so that the most recent projects appears first:

    +

    ## 2023

    -    => gemini://ploum.net/2022-12-04-fin-du-blog-et-derniere-version.gmi
    + +

    ## 2022

    +

    ## 2021

    + diff --git a/html-output/style.css b/web/style.css similarity index 94% rename from html-output/style.css rename to web/style.css index d3de647..03a7368 100644 --- a/html-output/style.css +++ b/web/style.css @@ -1,4 +1,5 @@ body { + font-family: monospace; max-width: 750px; margin: auto; background: black;