diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1050593..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.conf
-*.temp
diff --git a/README.md b/README.md
deleted file mode 100644
index ac3a3b7..0000000
--- a/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.
-
-> 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/content/gemlog/2021-05-01_windowssucks.gmi b/content/gemlog/2021-05-01_windowssucks.gmi
index fd02050..a2eed25 100644
--- a/content/gemlog/2021-05-01_windowssucks.gmi
+++ b/content/gemlog/2021-05-01_windowssucks.gmi
@@ -7,9 +7,3 @@ 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
-
-contact me by mail: steven.gibone at zaclys dot net
-=> https://mastodon.zaclys.com/@lonion @lonion@mastodon.zaclys.com on mastodon
diff --git a/content/gemlog/2021-05-04_networking_school.gmi b/content/gemlog/2021-05-04_networking_school.gmi
index 60bfa01..8601a99 100644
--- a/content/gemlog/2021-05-04_networking_school.gmi
+++ b/content/gemlog/2021-05-04_networking_school.gmi
@@ -1,9 +1,3 @@
# 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
-
-contact me by mail: steven.gibone at zaclys dot net
-=> https://mastodon.zaclys.com/@lonion @lonion@mastodon.zaclys.com on mastodon
diff --git a/content/gemlog/index.gmi b/content/gemlog/index.gmi
index 6a590d7..1fc3a24 100644
--- a/content/gemlog/index.gmi
+++ b/content/gemlog/index.gmi
@@ -20,11 +20,5 @@ there's a list of ideas:
## logs
-=> /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
-
-contact me by mail: steven.gibone at zaclys dot net
-=> https://mastodon.zaclys.com/@lonion @lonion@mastodon.zaclys.com on mastodon
+=> 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/index.gmi b/content/index.gmi
index 4b34553..263c477 100644
--- a/content/index.gmi
+++ b/content/index.gmi
@@ -6,6 +6,7 @@ Est. 17th of February 2021.
# stevengibone.com
=> gibone-CV.pdf my resume (in french)
+=> mailto:steven.gibone@zaclys.net
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.
@@ -29,30 +30,39 @@ And sportswise:
* rock climbing (mostly bouldering in Arkose)
* rollerblading
-=> projects.gmi my differents projects
+## finished projects
+### 2021
+* built my website using PicoCMS
+* installed Pi-Hole on my Raspberry Pi
+* installed Gogs on my Raspberry Pi now with remote access
+* bought a domain name for my website.
+* migrated from Gogs to Gitea because it was easy and Gitea has a mobile UI contrary to Gogs. Lives at the same address.
+* installed agate to serve this gemini capsule :)
+* migrate website from PicoCMS to 11ty
+### 2022
+* multiple things of which I didn't keep records
+* 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.
+* tried *gitolite* and *cgit* replacement of *Gitea*
+* settle to *Onedev*
+### 2023
+* resuscitate my gemini capsule again after reading an article by Ploum
+=> gemini://ploum.net/2022-12-04-fin-du-blog-et-derniere-version.gmi
## what I'm reading
* ~~The Lord of the Rings: The Two Towers, J.R.R. Tolkien~~
* ~~Clit Révolution, Sarah Constantin & Elvire Duvelle-Charles~~
* En Travail, Bernard Friot et Frédéric Lordon
-* ~~Sortir de l'hétérosexualité, Juliet Drouart~~
-* Beaufs et Barbares, Houria Bouteldja
+* Sortir de l'hétérosexualité, Juliet Drouart
## what I'm playing
-* Bloodstained: Ritual of the Night
+* Skul: The Hero Slayer
* Hades
-* Pokemon: Shining Pearl
+* PokeMon: Shining Pearl
## logs
+
=> tinylog.gmi tinylogs go here
=> gemlog/index.gmi full 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
-
----
-=> /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
+=> 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
deleted file mode 100644
index c3f8618..0000000
--- a/content/projects.gmi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Current or finished projects
-sorted in reverse chronological order so that the most recent projects appears first:
-## 2023
-* 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 :)
-* migrated from Gogs to Gitea because it was easy and Gitea has a mobile UI contrary to Gogs. Lives at the same address.
-* bought a domain name for my website.
-* installed Gogs on my Raspberry Pi now with remote access
-* installed Pi-Hole on my Raspberry Pi
-* built my website using PicoCMS
-
----
-=> /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/content/tinylog.gmi b/content/tinylog.gmi
index e965228..ed97d53 100644
--- a/content/tinylog.gmi
+++ b/content/tinylog.gmi
@@ -1,6 +1 @@
---
-=> /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/footer.gmi
deleted file mode 100644
index e965228..0000000
--- a/footer.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/gmirator.sh b/gmirator.sh
index 67dc0e8..7495b45 100755
--- a/gmirator.sh
+++ b/gmirator.sh
@@ -14,9 +14,8 @@ make_gemlogs_index() {
| 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
+ 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/,//{
@@ -27,29 +26,13 @@ make_gemlogs_index() {
}" $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 :)"
-}
+ printf '
+=> tinylog.gmi tinylogs go here
+=> gemlog/index.gmi full gemlogs here\n\n%s' "$(head $WORKDIR/articles.gmi.temp)" \
+ | cat $WORKDIR/in.gmi - > $LGMI/index.gmi
+ echo "" >> $LGMI/index.gmi
-inline_parsing() {
- sed -E 's|\*([^\*]+)\*|\1|g' |
- sed -E 's|~~(.*)~~|\1|g'
+ echo "DONE :)"
}
gmi2html() {
@@ -57,13 +40,9 @@ gmi2html() {
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 + printf "%s
\n" "$line" ;; esac done @@ -134,10 +125,6 @@ synchronise() { 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 } diff --git a/html-output/gemlog/2021-05-01_windowssucks.html b/html-output/gemlog/2021-05-01_windowssucks.html index 6890bc5..a00a37e 100644 --- a/html-output/gemlog/2021-05-01_windowssucks.html +++ b/html-output/gemlog/2021-05-01_windowssucks.html @@ -10,12 +10,6 @@ -# 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!
@@ -23,11 +17,4 @@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.
-