feat!: Merged softare page into about page

5 files changed, 78 insertions, 77 deletions

diff --git a/src/_header.html b/src/_header.html
index ee57d14..a54be39 100644
--- a/src/_header.html
+++ b/src/_header.html
@@ -72,7 +72,6 @@
 			<span>Me</span><span class="nocss-aid">:</span>
 			<span class="index-list">
 				<a class="index-list-item" href="/about">About</a>
-				<a class="index-list-item" href="/software">Software</a>
 				<a class="index-list-item" href="/setup">Setup</a>
 			</span>
 
diff --git a/src/about.md b/src/about.md
index ecc4fd0..52c6bf9 100644
--- a/src/about.md
+++ b/src/about.md
@@ -27,3 +27,42 @@ So, who knows what's gonna be next.
 
 Unfortunately there isn't too much I can show now, especially as content on this website...
 But hey, you gotta start somewhere!
+
+### Software
+
+This is a curated list of the more relevant software projects I've made or heavily contributed to
+
+<br>
+
+#### *2023*
+
+[gitlab / texty-office](https://gitlab.com/Syndamia/texty-office) + [gitlab / texty-office.vim](https://gitlab.com/Syndamia/texty-office.vim)
+: An imperfect converter from DOCX, PPTX and XLSX to normal text with it's associated [Vim](https://www.vim.org/) plugin. <br> `GNU GPLv3` & `MIT` | `C++` `vimscript` | `Office file` `converter` `plugin` `Vim` `CLI tool`
+
+[gitlab / small-web-utilities](https://gitlab.com/Syndamia/small-web-utilities) &emsp; *maintained*
+: A collection of small but fast utilities, like a checklist, that work locally on your browser. Also hosted [here](https://utils.syndamia.com). <br> `GNU GPLv3` | `HTML` `Javascript` | `checklist` `utilities`
+
+[gitlab / ss-law](https://gitlab.com/Syndamia/ss-law) + [github / ss-law](https://github.com/Syndamia/ss-law) &emsp; *maintained*
+: A small, lightweight and simple static site generation system, extracted as a template from my own <br> `Markdown` `bash` `awk` | `ssg` `lowdown` `static site generator` `pipelines`
+
+[gitlab / homelander](https://gitlab.com/Syndamia/homelander) &emsp; *maintained*
+: A very small and good looking, handmade prompt for zsh <br> `GPLv3` | `bash` | `zsh` `shell` `prompt` `script` `Linux`
+
+[gitlab / goodwolf](https://gitlab.com/Syndamia/goodwolf) &emsp; *abandoned*
+: Fork of the [badwolf](https://hacktivis.me/projects/badwolf) browser, which aims to add features <br> `BSD-3-Clause` | `C` | `web browser` `GTK` `WebKitGTK` `Linux`
+
+#### *2021*
+
+[gitlab / RepoSync](https://gitlab.com/Syndamia/reposync) &emsp; *completed*
+: Script and some config files for synchronizing a git repository with a server <br> `MIT` | `python` | `server` `git` `systemd`
+
+[github / filite-list](https://github.com/Syndamia/filite-list) &emsp; *completed*
+: Script for managing [filite](https://github.com/raftario/filite) links <br> `GPLv3` | `bash` | `filite` `server` `script` `Linux`
+
+#### *2020*
+
+[github / DevHive](https://github.com/Team-Kaleidoscope/DevHive) and [github / DevHive-Angular](https://github.com/Team-Kaleidoscope/DevHive-Angular) &emsp; *completed*
+: DevHive is a social network oriented towards programmers. It's FOSS, built from the ground up, and made from a team of three for a course. <br> `GPLv3` | `C#` `TypeScript` | `Angular` `ASP.NET Core` `social media` `mvc` `Docker` `CSS`
+
+[github / min-youtube-element-blocker](https://github.com/Syndamia/min-youtube-element-blocker) &emsp; *maintained*
+: Userscript for hiding certain UI elements in YouTube <br> `MIT` | `JavaScript` | `youtube` `userscript` `css`
diff --git a/src/about/index.md b/src/about/index.md
index ecc4fd0..52c6bf9 100644
--- a/src/about/index.md
+++ b/src/about/index.md
@@ -27,3 +27,42 @@ So, who knows what's gonna be next.
 
 Unfortunately there isn't too much I can show now, especially as content on this website...
 But hey, you gotta start somewhere!
+
+### Software
+
+This is a curated list of the more relevant software projects I've made or heavily contributed to
+
+<br>
+
+#### *2023*
+
+[gitlab / texty-office](https://gitlab.com/Syndamia/texty-office) + [gitlab / texty-office.vim](https://gitlab.com/Syndamia/texty-office.vim)
+: An imperfect converter from DOCX, PPTX and XLSX to normal text with it's associated [Vim](https://www.vim.org/) plugin. <br> `GNU GPLv3` & `MIT` | `C++` `vimscript` | `Office file` `converter` `plugin` `Vim` `CLI tool`
+
+[gitlab / small-web-utilities](https://gitlab.com/Syndamia/small-web-utilities) &emsp; *maintained*
+: A collection of small but fast utilities, like a checklist, that work locally on your browser. Also hosted [here](https://utils.syndamia.com). <br> `GNU GPLv3` | `HTML` `Javascript` | `checklist` `utilities`
+
+[gitlab / ss-law](https://gitlab.com/Syndamia/ss-law) + [github / ss-law](https://github.com/Syndamia/ss-law) &emsp; *maintained*
+: A small, lightweight and simple static site generation system, extracted as a template from my own <br> `Markdown` `bash` `awk` | `ssg` `lowdown` `static site generator` `pipelines`
+
+[gitlab / homelander](https://gitlab.com/Syndamia/homelander) &emsp; *maintained*
+: A very small and good looking, handmade prompt for zsh <br> `GPLv3` | `bash` | `zsh` `shell` `prompt` `script` `Linux`
+
+[gitlab / goodwolf](https://gitlab.com/Syndamia/goodwolf) &emsp; *abandoned*
+: Fork of the [badwolf](https://hacktivis.me/projects/badwolf) browser, which aims to add features <br> `BSD-3-Clause` | `C` | `web browser` `GTK` `WebKitGTK` `Linux`
+
+#### *2021*
+
+[gitlab / RepoSync](https://gitlab.com/Syndamia/reposync) &emsp; *completed*
+: Script and some config files for synchronizing a git repository with a server <br> `MIT` | `python` | `server` `git` `systemd`
+
+[github / filite-list](https://github.com/Syndamia/filite-list) &emsp; *completed*
+: Script for managing [filite](https://github.com/raftario/filite) links <br> `GPLv3` | `bash` | `filite` `server` `script` `Linux`
+
+#### *2020*
+
+[github / DevHive](https://github.com/Team-Kaleidoscope/DevHive) and [github / DevHive-Angular](https://github.com/Team-Kaleidoscope/DevHive-Angular) &emsp; *completed*
+: DevHive is a social network oriented towards programmers. It's FOSS, built from the ground up, and made from a team of three for a course. <br> `GPLv3` | `C#` `TypeScript` | `Angular` `ASP.NET Core` `social media` `mvc` `Docker` `CSS`
+
+[github / min-youtube-element-blocker](https://github.com/Syndamia/min-youtube-element-blocker) &emsp; *maintained*
+: Userscript for hiding certain UI elements in YouTube <br> `MIT` | `JavaScript` | `youtube` `userscript` `css`
diff --git a/src/software.md b/src/software.md
deleted file mode 100644
index f676f51..0000000
--- a/src/software.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Software
-
-This is a curated list of the more relevant software projects I've made or heavily contributed to
-
-<br>
-
-#### *2023*
-
-[gitlab / texty-office](https://gitlab.com/Syndamia/texty-office) + [gitlab / texty-office.vim](https://gitlab.com/Syndamia/texty-office.vim)
-: An imperfect converter from DOCX, PPTX and XLSX to normal text with it's associated [Vim](https://www.vim.org/) plugin. <br> `GNU GPLv3` & `MIT` | `C++` `vimscript` | `Office file` `converter` `plugin` `Vim` `CLI tool`
-
-[gitlab / small-web-utilities](https://gitlab.com/Syndamia/small-web-utilities) &emsp; *maintained*
-: A collection of small but fast utilities, like a checklist, that work locally on your browser. Also hosted [here](https://utils.syndamia.com). <br> `GNU GPLv3` | `HTML` `Javascript` | `checklist` `utilities`
-
-[gitlab / ss-law](https://gitlab.com/Syndamia/ss-law) + [github / ss-law](https://github.com/Syndamia/ss-law) &emsp; *maintained*
-: A small, lightweight and simple static site generation system, extracted as a template from my own <br> `Markdown` `bash` `awk` | `ssg` `lowdown` `static site generator` `pipelines`
-
-[gitlab / homelander](https://gitlab.com/Syndamia/homelander) &emsp; *maintained*
-: A very small and good looking, handmade prompt for zsh <br> `GPLv3` | `bash` | `zsh` `shell` `prompt` `script` `Linux`
-
-[gitlab / goodwolf](https://gitlab.com/Syndamia/goodwolf) &emsp; *abandoned*
-: Fork of the [badwolf](https://hacktivis.me/projects/badwolf) browser, which aims to add features <br> `BSD-3-Clause` | `C` | `web browser` `GTK` `WebKitGTK` `Linux`
-
-#### *2021*
-
-[gitlab / RepoSync](https://gitlab.com/Syndamia/reposync) &emsp; *completed*
-: Script and some config files for synchronizing a git repository with a server <br> `MIT` | `python` | `server` `git` `systemd`
-
-[github / filite-list](https://github.com/Syndamia/filite-list) &emsp; *completed*
-: Script for managing [filite](https://github.com/raftario/filite) links <br> `GPLv3` | `bash` | `filite` `server` `script` `Linux`
-
-#### *2020*
-
-[github / DevHive](https://github.com/Team-Kaleidoscope/DevHive) and [github / DevHive-Angular](https://github.com/Team-Kaleidoscope/DevHive-Angular) &emsp; *completed*
-: DevHive is a social network oriented towards programmers. It's FOSS, built from the ground up, and made from a team of three for a course. <br> `GPLv3` | `C#` `TypeScript` | `Angular` `ASP.NET Core` `social media` `mvc` `Docker` `CSS`
-
-[github / min-youtube-element-blocker](https://github.com/Syndamia/min-youtube-element-blocker) &emsp; *maintained*
-: Userscript for hiding certain UI elements in YouTube <br> `MIT` | `JavaScript` | `youtube` `userscript` `css`
diff --git a/src/software/index.md b/src/software/index.md
deleted file mode 100644
index f676f51..0000000
--- a/src/software/index.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Software
-
-This is a curated list of the more relevant software projects I've made or heavily contributed to
-
-<br>
-
-#### *2023*
-
-[gitlab / texty-office](https://gitlab.com/Syndamia/texty-office) + [gitlab / texty-office.vim](https://gitlab.com/Syndamia/texty-office.vim)
-: An imperfect converter from DOCX, PPTX and XLSX to normal text with it's associated [Vim](https://www.vim.org/) plugin. <br> `GNU GPLv3` & `MIT` | `C++` `vimscript` | `Office file` `converter` `plugin` `Vim` `CLI tool`
-
-[gitlab / small-web-utilities](https://gitlab.com/Syndamia/small-web-utilities) &emsp; *maintained*
-: A collection of small but fast utilities, like a checklist, that work locally on your browser. Also hosted [here](https://utils.syndamia.com). <br> `GNU GPLv3` | `HTML` `Javascript` | `checklist` `utilities`
-
-[gitlab / ss-law](https://gitlab.com/Syndamia/ss-law) + [github / ss-law](https://github.com/Syndamia/ss-law) &emsp; *maintained*
-: A small, lightweight and simple static site generation system, extracted as a template from my own <br> `Markdown` `bash` `awk` | `ssg` `lowdown` `static site generator` `pipelines`
-
-[gitlab / homelander](https://gitlab.com/Syndamia/homelander) &emsp; *maintained*
-: A very small and good looking, handmade prompt for zsh <br> `GPLv3` | `bash` | `zsh` `shell` `prompt` `script` `Linux`
-
-[gitlab / goodwolf](https://gitlab.com/Syndamia/goodwolf) &emsp; *abandoned*
-: Fork of the [badwolf](https://hacktivis.me/projects/badwolf) browser, which aims to add features <br> `BSD-3-Clause` | `C` | `web browser` `GTK` `WebKitGTK` `Linux`
-
-#### *2021*
-
-[gitlab / RepoSync](https://gitlab.com/Syndamia/reposync) &emsp; *completed*
-: Script and some config files for synchronizing a git repository with a server <br> `MIT` | `python` | `server` `git` `systemd`
-
-[github / filite-list](https://github.com/Syndamia/filite-list) &emsp; *completed*
-: Script for managing [filite](https://github.com/raftario/filite) links <br> `GPLv3` | `bash` | `filite` `server` `script` `Linux`
-
-#### *2020*
-
-[github / DevHive](https://github.com/Team-Kaleidoscope/DevHive) and [github / DevHive-Angular](https://github.com/Team-Kaleidoscope/DevHive-Angular) &emsp; *completed*
-: DevHive is a social network oriented towards programmers. It's FOSS, built from the ground up, and made from a team of three for a course. <br> `GPLv3` | `C#` `TypeScript` | `Angular` `ASP.NET Core` `social media` `mvc` `Docker` `CSS`
-
-[github / min-youtube-element-blocker](https://github.com/Syndamia/min-youtube-element-blocker) &emsp; *maintained*
-: Userscript for hiding certain UI elements in YouTube <br> `MIT` | `JavaScript` | `youtube` `userscript` `css`