From a42d4cecef63cceaa068ae1cc6572f455da08806 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Fri, 9 Aug 2024 22:33:19 +0200 Subject: [PATCH 1/2] move old projects --- site/index.html | 2 +- site/music.html | 1 + .../fractal_tree.png | Bin site/{projects => old-projects}/fractals.html | 2 +- site/{projects => old-projects}/fractals.js | 0 site/{projects => old-projects}/gol.png | Bin .../old-project-list.html | 12 +++++------ .../raymarched-voxels.png | Bin .../voxel_media/demo.mp4 | Bin .../voxel_media/demo2.mp4 | Bin .../voxel_media/fig1.png | Bin .../voxel_media/fig2.png | Bin .../voxel_media/fig3.png | Bin site/{projects => old-projects}/voxels.html | 0 write/apocalypse/server.md | 19 ++++++++++++++++++ write/index.md | 2 +- write/music.md | 1 + write/{projects => old-projects}/fractals.md | 2 +- .../old-project-list.md | 12 +++++------ write/{projects => old-projects}/voxels.md | 0 20 files changed, 37 insertions(+), 16 deletions(-) rename site/{projects => old-projects}/fractal_tree.png (100%) rename site/{projects => old-projects}/fractals.html (98%) rename site/{projects => old-projects}/fractals.js (100%) rename site/{projects => old-projects}/gol.png (100%) rename site/{projects => old-projects}/old-project-list.html (87%) rename site/{projects => old-projects}/raymarched-voxels.png (100%) rename site/{projects => old-projects}/voxel_media/demo.mp4 (100%) rename site/{projects => old-projects}/voxel_media/demo2.mp4 (100%) rename site/{projects => old-projects}/voxel_media/fig1.png (100%) rename site/{projects => old-projects}/voxel_media/fig2.png (100%) rename site/{projects => old-projects}/voxel_media/fig3.png (100%) rename site/{projects => old-projects}/voxels.html (100%) create mode 100644 write/apocalypse/server.md rename write/{projects => old-projects}/fractals.md (97%) rename write/{projects => old-projects}/old-project-list.md (83%) rename write/{projects => old-projects}/voxels.md (100%) diff --git a/site/index.html b/site/index.html index d3a9b45..703cdba 100644 --- a/site/index.html +++ b/site/index.html @@ -34,7 +34,7 @@ this means it is
- keyboar
- distracting
- blender
-- old projects
+- old projects
- todo: put more words in the computer

diff --git a/site/music.html b/site/music.html index c7b10bf..82e0fa9 100644 --- a/site/music.html +++ b/site/music.html @@ -58,6 +58,7 @@ Artism
LORN
Oxart
Worakls
+DEADLIFE
Faux Tales
Wojciech Golchzewski
Death & Rebirth
diff --git a/site/projects/fractal_tree.png b/site/old-projects/fractal_tree.png similarity index 100% rename from site/projects/fractal_tree.png rename to site/old-projects/fractal_tree.png diff --git a/site/projects/fractals.html b/site/old-projects/fractals.html similarity index 98% rename from site/projects/fractals.html rename to site/old-projects/fractals.html index 8d348cc..a8c892d 100644 --- a/site/projects/fractals.html +++ b/site/old-projects/fractals.html @@ -69,7 +69,7 @@ You can set the iteration count in the input field.

- + diff --git a/site/projects/fractals.js b/site/old-projects/fractals.js similarity index 100% rename from site/projects/fractals.js rename to site/old-projects/fractals.js diff --git a/site/projects/gol.png b/site/old-projects/gol.png similarity index 100% rename from site/projects/gol.png rename to site/old-projects/gol.png diff --git a/site/projects/old-project-list.html b/site/old-projects/old-project-list.html similarity index 87% rename from site/projects/old-project-list.html rename to site/old-projects/old-project-list.html index 22798ee..721af15 100644 --- a/site/projects/old-project-list.html +++ b/site/old-projects/old-project-list.html @@ -24,8 +24,8 @@ source: github.com/CrispyPin/

I made a voxel engine in rust to learn rust and godot-rust as well as explore voxel systems. It has (practically) infinite terrain generation, lets you place and remove voxels and supports transparent voxel types. The main point was to develop an optimised meshing algorithm.
- -This one I actually wrote a post about here
+ +This one I actually wrote a post about here

OVR Utils

@@ -45,7 +45,7 @@ source: github.com/Crisp

A raymarched voxel renderer made with a Godot shader.
- +

Game of Life wallpaper

@@ -55,7 +55,7 @@ source: github.com/CrispyP

This is hosted on github pages at gol.crispypin.cc
-screenshot of conways game of life +screenshot of conways game of life

Fractals

@@ -65,8 +65,8 @@ source: github.com/Crispy

While I was learning web development and JavaScript I made a page with fractals.
-It has now been moved here
- +It has now been moved here
+

back to more recent stuff
diff --git a/site/projects/raymarched-voxels.png b/site/old-projects/raymarched-voxels.png similarity index 100% rename from site/projects/raymarched-voxels.png rename to site/old-projects/raymarched-voxels.png diff --git a/site/projects/voxel_media/demo.mp4 b/site/old-projects/voxel_media/demo.mp4 similarity index 100% rename from site/projects/voxel_media/demo.mp4 rename to site/old-projects/voxel_media/demo.mp4 diff --git a/site/projects/voxel_media/demo2.mp4 b/site/old-projects/voxel_media/demo2.mp4 similarity index 100% rename from site/projects/voxel_media/demo2.mp4 rename to site/old-projects/voxel_media/demo2.mp4 diff --git a/site/projects/voxel_media/fig1.png b/site/old-projects/voxel_media/fig1.png similarity index 100% rename from site/projects/voxel_media/fig1.png rename to site/old-projects/voxel_media/fig1.png diff --git a/site/projects/voxel_media/fig2.png b/site/old-projects/voxel_media/fig2.png similarity index 100% rename from site/projects/voxel_media/fig2.png rename to site/old-projects/voxel_media/fig2.png diff --git a/site/projects/voxel_media/fig3.png b/site/old-projects/voxel_media/fig3.png similarity index 100% rename from site/projects/voxel_media/fig3.png rename to site/old-projects/voxel_media/fig3.png diff --git a/site/projects/voxels.html b/site/old-projects/voxels.html similarity index 100% rename from site/projects/voxels.html rename to site/old-projects/voxels.html diff --git a/write/apocalypse/server.md b/write/apocalypse/server.md new file mode 100644 index 0000000..651aeef --- /dev/null +++ b/write/apocalypse/server.md @@ -0,0 +1,19 @@ +# impact +The server this website is served from is bad for the environment. So is every other computing device. + +The server is a Lenovo Legion Y520T-25IKL purchased in 2018. +It consists of: +- 3 modules of RAM +- a 250W power supply +- a case +- a CPU +- a graphics card +- a motherboard +- a laptop SSD +- an M.2 SSD +It was **delivered by truck** from a warehouse somewhere else in sweden. +Before that, it was assembled from parts in a lenovo factory somewhere else and **transported** to the warehouse of the seller. +Before that, all the parts were probably **transported** from other warehouses and factories all over the world, using **fossil fuels**. +All the *parts* were assembled in at *least* one factory each, probably all in china, from components created in other factories in china. +the raw materials were processed in + diff --git a/write/index.md b/write/index.md index c559d67..0b32d86 100644 --- a/write/index.md +++ b/write/index.md @@ -18,7 +18,7 @@ this means it is - [keyboar](/keyboards-are-fun) - [distracting](/humans/distracting) - [blender](/blender) -- [old projects](/projects/old-project-list) +- [old projects](/old-projects/old-project-list) - todo: put more words in the computer [me elsewhere](/my-other-stuff) | [photos](/photos) diff --git a/write/music.md b/write/music.md index b323e7c..778e04a 100644 --- a/write/music.md +++ b/write/music.md @@ -38,6 +38,7 @@ Artism LORN Oxart Worakls +DEADLIFE Faux Tales Wojciech Golchzewski Death & Rebirth diff --git a/write/projects/fractals.md b/write/old-projects/fractals.md similarity index 97% rename from write/projects/fractals.md rename to write/old-projects/fractals.md index f87902d..d338848 100644 --- a/write/projects/fractals.md +++ b/write/old-projects/fractals.md @@ -49,4 +49,4 @@ You can set the iteration count in the input field. - + diff --git a/write/projects/old-project-list.md b/write/old-projects/old-project-list.md similarity index 83% rename from write/projects/old-project-list.md rename to write/old-projects/old-project-list.md index 55e4993..c061741 100644 --- a/write/projects/old-project-list.md +++ b/write/old-projects/old-project-list.md @@ -8,8 +8,8 @@ last update: `2022-05-05` source: [github.com/CrispyPin/gd-voxel-rs](https://github.com/CrispyPin/gd-voxel-rs) I made a voxel engine in rust to learn rust and godot-rust as well as explore voxel systems. It has (practically) infinite terrain generation, lets you place and remove voxels and supports transparent voxel types. The main point was to develop an optimised meshing algorithm. - -This one I actually wrote a post about [here](/projects/voxels) + +This one I actually wrote a post about [here](/old-projects/voxels) ### OVR Utils start: `2021-05-14` @@ -25,7 +25,7 @@ last update: `2021-04-29` source: [github.com/CrispyPin/voxel-raymarcher](https://github.com/CrispyPin/voxel-raymarcher) A raymarched voxel renderer made with a Godot shader. - + ### Game of Life wallpaper start: `2021-03-21` @@ -33,7 +33,7 @@ last update: `2022-02-22` source: [github.com/CrispyPin/gol-wallpaper](https://github.com/CrispyPin/gol-wallpaper/) This is hosted on github pages at [gol.crispypin.cc](https://gol.crispypin.cc/?cellsize=5&time=2&margin=0&populate=true) -screenshot of conways game of life +screenshot of conways game of life ### Fractals start: `2020-03-04` @@ -41,8 +41,8 @@ last update: `2020-05-19` source: [github.com/CrispyPin/Webb-1-Projekt/](https://github.com/CrispyPin/Webb-1-Projekt/) While I was learning web development and JavaScript I made a page with fractals. -It has now been moved [here](/projects/fractals) - +It has now been moved [here](/old-projects/fractals) + diff --git a/write/projects/voxels.md b/write/old-projects/voxels.md similarity index 100% rename from write/projects/voxels.md rename to write/old-projects/voxels.md From 2d5dbd027308fb1f957981e341ff0a35aa0204d4 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Fri, 9 Aug 2024 22:38:27 +0200 Subject: [PATCH 2/2] move lists to subdir --- site/index.html | 5 ++--- site/{ => lists}/bookmarks.html | 0 site/{my-other-stuff.html => lists/me.html} | 2 +- site/{ => lists}/music.html | 0 site/{ => lists}/pets.html | 0 write/apocalypse/{server.md => server.md.wip} | 0 write/index.md | 5 ++--- write/{ => lists}/bookmarks.md | 0 write/{my-other-stuff.md => lists/me.md} | 0 write/{ => lists}/music.md | 0 write/{ => lists}/pets.md | 0 11 files changed, 5 insertions(+), 7 deletions(-) rename site/{ => lists}/bookmarks.html (100%) rename site/{my-other-stuff.html => lists/me.html} (93%) rename site/{ => lists}/music.html (100%) rename site/{ => lists}/pets.html (100%) rename write/apocalypse/{server.md => server.md.wip} (100%) rename write/{ => lists}/bookmarks.md (100%) rename write/{my-other-stuff.md => lists/me.md} (100%) rename write/{ => lists}/music.md (100%) rename write/{ => lists}/pets.md (100%) diff --git a/site/index.html b/site/index.html index 703cdba..8c63612 100644 --- a/site/index.html +++ b/site/index.html @@ -27,7 +27,6 @@ this means it is

"content"

- unity on linux sucks
-- pets
- dead trees
- horological crimes
- snad (cell thing)
@@ -38,8 +37,8 @@ this means it is
- todo: put more words in the computer

-me elsewhere | photos
-bookmarks | music
+me elsewhere | photos
+bookmarks | music


diff --git a/site/bookmarks.html b/site/lists/bookmarks.html similarity index 100% rename from site/bookmarks.html rename to site/lists/bookmarks.html diff --git a/site/my-other-stuff.html b/site/lists/me.html similarity index 93% rename from site/my-other-stuff.html rename to site/lists/me.html index ba2b427..ef496c0 100644 --- a/site/my-other-stuff.html +++ b/site/lists/me.html @@ -4,7 +4,7 @@ - something silly - my-other-stuff + something silly - me diff --git a/site/music.html b/site/lists/music.html similarity index 100% rename from site/music.html rename to site/lists/music.html diff --git a/site/pets.html b/site/lists/pets.html similarity index 100% rename from site/pets.html rename to site/lists/pets.html diff --git a/write/apocalypse/server.md b/write/apocalypse/server.md.wip similarity index 100% rename from write/apocalypse/server.md rename to write/apocalypse/server.md.wip diff --git a/write/index.md b/write/index.md index 0b32d86..20dbf5a 100644 --- a/write/index.md +++ b/write/index.md @@ -11,7 +11,6 @@ this means it is ## "content" - [unity on linux sucks](/awful_software/unity-on-linux) -- [pets](/pets) - [dead trees](/apocalypse/dead-trees) - [horological crimes](/horological-crimes) - [snad (cell thing)](/cellthing) @@ -21,8 +20,8 @@ this means it is - [old projects](/old-projects/old-project-list) - todo: put more words in the computer -[me elsewhere](/my-other-stuff) | [photos](/photos) -[bookmarks](/bookmarks) | [music](/music) +[me elsewhere](/lists/me) | [photos](/photos) +[bookmarks](/lists/bookmarks) | [music](/lists/music) {RAW_HTML}
diff --git a/write/bookmarks.md b/write/lists/bookmarks.md similarity index 100% rename from write/bookmarks.md rename to write/lists/bookmarks.md diff --git a/write/my-other-stuff.md b/write/lists/me.md similarity index 100% rename from write/my-other-stuff.md rename to write/lists/me.md diff --git a/write/music.md b/write/lists/music.md similarity index 100% rename from write/music.md rename to write/lists/music.md diff --git a/write/pets.md b/write/lists/pets.md similarity index 100% rename from write/pets.md rename to write/lists/pets.md