From b6c0ffcaf707ee1968a7f29021d20357692a84d0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 7 Aug 2018 10:05:58 -0300
Subject: [PATCH] Reorganization
---
.htaccess | 28 +++++++++++------
books.md | 29 +++---------------
books/amor.md | 3 --
books/epistemology.md | 3 ++
.../contra-metodo.md | 2 ++
.../cristal-fumaca.md | 0
books/{filosofia => epistemology}/metodo.md | 2 ++
books/{filosofia => epistemology}/metodo/1.md | 0
books/{filosofia => epistemology}/metodo/2.md | 0
books/{filosofia => epistemology}/metodo/3.md | 0
books/{filosofia => epistemology}/metodo/4.md | 0
books/{filosofia => epistemology}/metodo/5.md | 0
books/{filosofia => epistemology}/metodo/6.md | 0
.../metodo/tetragrama.dot | 0
.../metodo/tetragrama.svg | 0
books/filosofia.md | 3 --
books/history.md | 3 ++
books/{historia => history}/ibm-holocaust.md | 2 ++
.../ibm-holocaust/auschwitz.jpg | Bin
.../ibm-holocaust/dehomag.png | Bin
books/life.md | 3 ++
books/{vida => life}/arte-da-vida.md | 0
books/{vida => life}/arte-de-viver.md | 0
.../brevidade-da-vida.md} | 0
books/literature.md | 3 ++
books/{sociedade => literature}/mayombe.md | 0
books/love.md | 3 ++
.../{amor/liquido.md => love/amor-liquido.md} | 0
books/{amor/arte.md => love/arte-de-amar.md} | 0
.../enamoramento-e-amor.md} | 0
.../dor.md => love/livro-da-dor-e-do-amor.md} | 0
books/{amor => love}/poesia-sabedoria.md | 0
.../sem-tesao-nao-ha-solucao.md} | 0
books/philosophy.md | 3 ++
.../espionosa-filosofia-pratica.md | 0
books/{filosofia => philosophy}/estoicismo.md | 0
books/psicologia.md | 3 --
books/psychology.md | 3 ++
.../eros-civilization.md | 0
.../eros-civilization/detours-to-death.png | Bin
.../psychology-of-intelligence.md | 0
books/scifi.md | 2 +-
books/sociedade.md | 3 --
books/sociology.md | 3 ++
.../age-of-the-smart-machine.md | 2 ++
.../burnout-society.md | 0
.../{sociedade => sociology}/ends-of-sleep.md | 0
books/{sociedade => sociology}/ilha.md | 0
.../{sociedade => sociology}/jogos-homens.md | 0
.../one-dimensional-man.md | 0
.../{sociedade => sociology}/post-scarcity.md | 0
books/{sociedade => sociology}/preguica.md | 0
.../processo-civilizador.md | 0
.../{sociedade => sociology}/segundo-sexo.md | 0
.../sociedade-contra-o-estado.md | 0
books/{sociedade => sociology}/tolice.md | 0
.../who-owns-the-future.md | 0
.../youre-not-a-gadget.md | 0
books/spy.md | 4 +--
books/technology.md | 18 +++++++++++
.../cathedral-bazaar.md | 0
.../{tecnopolitica => technology}/cybersyn.md | 0
.../maciunas-learning-machines.md | 0
.../manifesto-contrassexual.md | 0
.../2018-03-03-17:01:45_660x638.png | Bin
.../2018-03-04-02:33:43_533x291.png | Bin
.../2018-03-04-02:38:12_569x683.png | Bin
.../2018-03-04-08:45:50_521x709.png | Bin
.../2018-03-04-15:01:41_427x719.png | Bin
.../2018-03-04-15:02:04_419x584.png | Bin
.../2018-03-04-15:02:29_419x543.png | Bin
.../2018-03-04-15:02:42_441x731.png | Bin
.../2018-03-04-15:02:55_424x733.png | Bin
.../2018-03-04-15:03:16_430x733.png | Bin
.../2018-03-04-15:37:55_606x562.png | Bin
.../spaceship-earth.md} | 0
books/tecnopolitica.md | 3 --
books/vida.md | 3 --
meta.md | 7 ++++-
tags.md | 3 ++
templates/page.tmpl | 1 +
81 files changed, 87 insertions(+), 55 deletions(-)
delete mode 100644 books/amor.md
create mode 100644 books/epistemology.md
rename books/{filosofia => epistemology}/contra-metodo.md (99%)
rename books/{filosofia => epistemology}/cristal-fumaca.md (100%)
rename books/{filosofia => epistemology}/metodo.md (95%)
rename books/{filosofia => epistemology}/metodo/1.md (100%)
rename books/{filosofia => epistemology}/metodo/2.md (100%)
rename books/{filosofia => epistemology}/metodo/3.md (100%)
rename books/{filosofia => epistemology}/metodo/4.md (100%)
rename books/{filosofia => epistemology}/metodo/5.md (100%)
rename books/{filosofia => epistemology}/metodo/6.md (100%)
rename books/{filosofia => epistemology}/metodo/tetragrama.dot (100%)
rename books/{filosofia => epistemology}/metodo/tetragrama.svg (100%)
delete mode 100644 books/filosofia.md
create mode 100644 books/history.md
rename books/{historia => history}/ibm-holocaust.md (99%)
rename books/{historia => history}/ibm-holocaust/auschwitz.jpg (100%)
rename books/{historia => history}/ibm-holocaust/dehomag.png (100%)
create mode 100644 books/life.md
rename books/{vida => life}/arte-da-vida.md (100%)
rename books/{vida => life}/arte-de-viver.md (100%)
rename books/{vida/brevidade.md => life/brevidade-da-vida.md} (100%)
create mode 100644 books/literature.md
rename books/{sociedade => literature}/mayombe.md (100%)
create mode 100644 books/love.md
rename books/{amor/liquido.md => love/amor-liquido.md} (100%)
rename books/{amor/arte.md => love/arte-de-amar.md} (100%)
rename books/{amor/enamoramento.md => love/enamoramento-e-amor.md} (100%)
rename books/{amor/dor.md => love/livro-da-dor-e-do-amor.md} (100%)
rename books/{amor => love}/poesia-sabedoria.md (100%)
rename books/{amor/tesao.md => love/sem-tesao-nao-ha-solucao.md} (100%)
create mode 100644 books/philosophy.md
rename books/{filosofia => philosophy}/espionosa-filosofia-pratica.md (100%)
rename books/{filosofia => philosophy}/estoicismo.md (100%)
delete mode 100644 books/psicologia.md
create mode 100644 books/psychology.md
rename books/{psicologia => psychology}/eros-civilization.md (100%)
rename books/{psicologia => psychology}/eros-civilization/detours-to-death.png (100%)
rename books/{psicologia => psychology}/psychology-of-intelligence.md (100%)
delete mode 100644 books/sociedade.md
create mode 100644 books/sociology.md
rename books/{sociedade => sociology}/age-of-the-smart-machine.md (99%)
rename books/{sociedade => sociology}/burnout-society.md (100%)
rename books/{sociedade => sociology}/ends-of-sleep.md (100%)
rename books/{sociedade => sociology}/ilha.md (100%)
rename books/{sociedade => sociology}/jogos-homens.md (100%)
rename books/{sociedade => sociology}/one-dimensional-man.md (100%)
rename books/{sociedade => sociology}/post-scarcity.md (100%)
rename books/{sociedade => sociology}/preguica.md (100%)
rename books/{sociedade => sociology}/processo-civilizador.md (100%)
rename books/{sociedade => sociology}/segundo-sexo.md (100%)
rename books/{sociedade => sociology}/sociedade-contra-o-estado.md (100%)
rename books/{sociedade => sociology}/tolice.md (100%)
rename books/{sociedade => sociology}/who-owns-the-future.md (100%)
rename books/{sociedade => sociology}/youre-not-a-gadget.md (100%)
create mode 100644 books/technology.md
rename books/{tecnopolitica => technology}/cathedral-bazaar.md (100%)
rename books/{tecnopolitica => technology}/cybersyn.md (100%)
rename books/{tecnopolitica => technology}/maciunas-learning-machines.md (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual.md (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png (100%)
rename books/{tecnopolitica => technology}/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png (100%)
rename books/{sociedade/spaceship.md => technology/spaceship-earth.md} (100%)
delete mode 100644 books/tecnopolitica.md
delete mode 100644 books/vida.md
create mode 100644 tags.md
diff --git a/.htaccess b/.htaccess
index 558a226..d2a3bd8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,14 +1,24 @@
<IfModule mod_rewrite.c>
RewriteEngine on
+ # Permalink handling
# See https://httpd.apache.org/docs/2.4/rewrite/remapping.html
- RewriteRule ^cypherpunks$ /events/2013/cypherpunks/ [R]
- RewriteRule ^campusparty$ /events/2014/campusparty/ [R]
- RewriteRule ^cryptorave$ /events/2014/cryptorave/ [R]
- RewriteRule ^fisl$ /events/2015/fisl/ [R]
- RewriteRule ^static$ /suckless/sites/ [R]
- RewriteRule ^cli$ /suckless/cli/ [R]
- RewriteRule ^virtual$ /suckless/virtual/ [R]
- RewriteRule ^orphans$ /research/archived/ [R]
- RewriteRule ^organizacao$ https://templates.fluxo.info/organizacao [R]
+ RewriteRule ^cypherpunks$ /events/2013/cypherpunks/ [R]
+ RewriteRule ^campusparty$ /events/2014/campusparty/ [R]
+ RewriteRule ^cryptorave$ /events/2014/cryptorave/ [R]
+ RewriteRule ^fisl$ /events/2015/fisl/ [R]
+ RewriteRule ^static$ /suckless/sites/ [R]
+ RewriteRule ^cli$ /suckless/cli/ [R]
+ RewriteRule ^virtual$ /suckless/virtual/ [R]
+ RewriteRule ^orphans$ /research/archived/ [R]
+ RewriteRule ^books/amor(.*)$ /books/love$1 [R]
+ RewriteRule ^books/vida(.*)$ /books/life$1 [R]
+ RewriteRule ^books/historia(.*)$ /books/history$1 [R]
+ RewriteRule ^books/filosofia/metodo(.*)$ /books/epistemologia/metodo$1 [R]
+ RewriteRule ^books/filosofia/contra-metodo$ /books/epistemologia/contra-metodo$1 [R]
+ RewriteRule ^books/filosofia(.*)$ /books/philosophy$1 [R]
+ RewriteRule ^books/psicologia(.*)$ /books/psychology$1 [R]
+ RewriteRule ^books/sociedade(.*)$ /books/sociology$1 [R]
+ RewriteRule ^books/tecnopolitica(.*)$ /books/technology$1 [R]
+ RewriteRule ^organizacao$ https://templates.fluxo.info/organizacao [R]
</IfModule>
diff --git a/books.md b/books.md
index 4a5786e..9317092 100644
--- a/books.md
+++ b/books.md
@@ -1,28 +1,9 @@
[[!meta title="Livros"]]
-Resenhas, anotações, fichamentos e divertimentos.
+Resenhas, anotações, excertos, enxertos, fichamentos e divertimentos numa
+divisão por tópicos nem sempre coerente, muitas vezes arbitrária ou fazendo
+a difícil escolha de decidir qual é o assunto preponderante de cada livro
+ou do momento em que foi lido, tendo esta tortuosa catalogação complementada
+com o uso de [tags](https://ikiwiki.info/tags/).
[[!inline pages="page(books*)" archive="yes"]]
-
-## Miscelânea
-
-Pedaços, trechos e anotações diversas de livros que não ganharam uma página própria.
-
-### O mundo em suspenso
-
-Autores: Viveiros e Debora Danowski
-
- Os manifestos <aceleracionistas> insitem sobre as virtudes da aceleração
- tecnológica sem dizer palavra sobre as condições materiais- energéticas,
- ambientais, geopolíticas, etc- de tal processo, que conduzira
- "automaticamente" pensam os autores, à redução da jornada de trabalho(
- Também em Bangladesh?quando?), ao aumento das horas de lazer (a sociedade
- do espetáculo sai do armário!), à renda universal etc: ...
-
- A outra aceleração, a saber, aquela que diz respeito aos processod de
- ultrapassagem dos valores criticos dos parâmentros ambientais- quando
- chegaremos a +4C, que talves sejam + 6C ou + 8C? quando se dara o fim dos
- estoques de pesca? .... essa outra recebe no máximo uma menção que beira a
- frivolidade, para não dizermos um puro e simples negacionismo...
-
- -- 150
diff --git a/books/amor.md b/books/amor.md
deleted file mode 100644
index 35fbaf5..0000000
--- a/books/amor.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Amor"]]
-
-[[!inline pages="page(books/amor*)" archive="yes"]]
diff --git a/books/epistemology.md b/books/epistemology.md
new file mode 100644
index 0000000..1944f9a
--- /dev/null
+++ b/books/epistemology.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Epistemologia"]]
+
+[[!inline pages="page(books/epistemology*)" archive="yes"]]
diff --git a/books/filosofia/contra-metodo.md b/books/epistemology/contra-metodo.md
similarity index 99%
rename from books/filosofia/contra-metodo.md
rename to books/epistemology/contra-metodo.md
index d37e60f..b7d607e 100644
--- a/books/filosofia/contra-metodo.md
+++ b/books/epistemology/contra-metodo.md
@@ -96,3 +96,5 @@ Regular, irregular, regra: 213.
que tem muitas vantagens mas também muitos inconvenientes.
-- 225
+
+[[!tag epistemology philosophy]]
diff --git a/books/filosofia/cristal-fumaca.md b/books/epistemology/cristal-fumaca.md
similarity index 100%
rename from books/filosofia/cristal-fumaca.md
rename to books/epistemology/cristal-fumaca.md
diff --git a/books/filosofia/metodo.md b/books/epistemology/metodo.md
similarity index 95%
rename from books/filosofia/metodo.md
rename to books/epistemology/metodo.md
index cda5750..848958f 100644
--- a/books/filosofia/metodo.md
+++ b/books/epistemology/metodo.md
@@ -22,3 +22,5 @@
* [Volume II](2).
* [Volume III](3).
* [Volume IV](4).
+
+[[!tag epistemology philosophy]]
diff --git a/books/filosofia/metodo/1.md b/books/epistemology/metodo/1.md
similarity index 100%
rename from books/filosofia/metodo/1.md
rename to books/epistemology/metodo/1.md
diff --git a/books/filosofia/metodo/2.md b/books/epistemology/metodo/2.md
similarity index 100%
rename from books/filosofia/metodo/2.md
rename to books/epistemology/metodo/2.md
diff --git a/books/filosofia/metodo/3.md b/books/epistemology/metodo/3.md
similarity index 100%
rename from books/filosofia/metodo/3.md
rename to books/epistemology/metodo/3.md
diff --git a/books/filosofia/metodo/4.md b/books/epistemology/metodo/4.md
similarity index 100%
rename from books/filosofia/metodo/4.md
rename to books/epistemology/metodo/4.md
diff --git a/books/filosofia/metodo/5.md b/books/epistemology/metodo/5.md
similarity index 100%
rename from books/filosofia/metodo/5.md
rename to books/epistemology/metodo/5.md
diff --git a/books/filosofia/metodo/6.md b/books/epistemology/metodo/6.md
similarity index 100%
rename from books/filosofia/metodo/6.md
rename to books/epistemology/metodo/6.md
diff --git a/books/filosofia/metodo/tetragrama.dot b/books/epistemology/metodo/tetragrama.dot
similarity index 100%
rename from books/filosofia/metodo/tetragrama.dot
rename to books/epistemology/metodo/tetragrama.dot
diff --git a/books/filosofia/metodo/tetragrama.svg b/books/epistemology/metodo/tetragrama.svg
similarity index 100%
rename from books/filosofia/metodo/tetragrama.svg
rename to books/epistemology/metodo/tetragrama.svg
diff --git a/books/filosofia.md b/books/filosofia.md
deleted file mode 100644
index 53647a5..0000000
--- a/books/filosofia.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Filosofia"]]
-
-[[!inline pages="page(books/filosofia*)" archive="yes"]]
diff --git a/books/history.md b/books/history.md
new file mode 100644
index 0000000..27fdd9e
--- /dev/null
+++ b/books/history.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - História"]]
+
+[[!inline pages="page(books/history*)" archive="yes"]]
diff --git a/books/historia/ibm-holocaust.md b/books/history/ibm-holocaust.md
similarity index 99%
rename from books/historia/ibm-holocaust.md
rename to books/history/ibm-holocaust.md
index d210856..11ff478 100644
--- a/books/historia/ibm-holocaust.md
+++ b/books/history/ibm-holocaust.md
@@ -1894,3 +1894,5 @@ That was before the US entering the war.
* IBM Klub and House of Data, 449.
* Investigation that required "Holocaust knowledge with an emphasis on Hitler-era finance, added to information-technology expertise, sifted through the dogged techniques of an investigative reporter", 454.
* Local and central processing facilities -- like Berlin and Oranienburg, 455.
+
+[[!tag tecnology history sociology]]
diff --git a/books/historia/ibm-holocaust/auschwitz.jpg b/books/history/ibm-holocaust/auschwitz.jpg
similarity index 100%
rename from books/historia/ibm-holocaust/auschwitz.jpg
rename to books/history/ibm-holocaust/auschwitz.jpg
diff --git a/books/historia/ibm-holocaust/dehomag.png b/books/history/ibm-holocaust/dehomag.png
similarity index 100%
rename from books/historia/ibm-holocaust/dehomag.png
rename to books/history/ibm-holocaust/dehomag.png
diff --git a/books/life.md b/books/life.md
new file mode 100644
index 0000000..f2c3b4b
--- /dev/null
+++ b/books/life.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Vida"]]
+
+[[!inline pages="page(books/life*)" archive="yes"]]
diff --git a/books/vida/arte-da-vida.md b/books/life/arte-da-vida.md
similarity index 100%
rename from books/vida/arte-da-vida.md
rename to books/life/arte-da-vida.md
diff --git a/books/vida/arte-de-viver.md b/books/life/arte-de-viver.md
similarity index 100%
rename from books/vida/arte-de-viver.md
rename to books/life/arte-de-viver.md
diff --git a/books/vida/brevidade.md b/books/life/brevidade-da-vida.md
similarity index 100%
rename from books/vida/brevidade.md
rename to books/life/brevidade-da-vida.md
diff --git a/books/literature.md b/books/literature.md
new file mode 100644
index 0000000..66ffa69
--- /dev/null
+++ b/books/literature.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Literatura Geral"]]
+
+[[!inline pages="page(books/literatura*)" archive="yes"]]
diff --git a/books/sociedade/mayombe.md b/books/literature/mayombe.md
similarity index 100%
rename from books/sociedade/mayombe.md
rename to books/literature/mayombe.md
diff --git a/books/love.md b/books/love.md
new file mode 100644
index 0000000..b2948b7
--- /dev/null
+++ b/books/love.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Amor"]]
+
+[[!inline pages="page(books/love*)" archive="yes"]]
diff --git a/books/amor/liquido.md b/books/love/amor-liquido.md
similarity index 100%
rename from books/amor/liquido.md
rename to books/love/amor-liquido.md
diff --git a/books/amor/arte.md b/books/love/arte-de-amar.md
similarity index 100%
rename from books/amor/arte.md
rename to books/love/arte-de-amar.md
diff --git a/books/amor/enamoramento.md b/books/love/enamoramento-e-amor.md
similarity index 100%
rename from books/amor/enamoramento.md
rename to books/love/enamoramento-e-amor.md
diff --git a/books/amor/dor.md b/books/love/livro-da-dor-e-do-amor.md
similarity index 100%
rename from books/amor/dor.md
rename to books/love/livro-da-dor-e-do-amor.md
diff --git a/books/amor/poesia-sabedoria.md b/books/love/poesia-sabedoria.md
similarity index 100%
rename from books/amor/poesia-sabedoria.md
rename to books/love/poesia-sabedoria.md
diff --git a/books/amor/tesao.md b/books/love/sem-tesao-nao-ha-solucao.md
similarity index 100%
rename from books/amor/tesao.md
rename to books/love/sem-tesao-nao-ha-solucao.md
diff --git a/books/philosophy.md b/books/philosophy.md
new file mode 100644
index 0000000..710cbb2
--- /dev/null
+++ b/books/philosophy.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Filosofia"]]
+
+[[!inline pages="page(books/philosophy*)" archive="yes"]]
diff --git a/books/filosofia/espionosa-filosofia-pratica.md b/books/philosophy/espionosa-filosofia-pratica.md
similarity index 100%
rename from books/filosofia/espionosa-filosofia-pratica.md
rename to books/philosophy/espionosa-filosofia-pratica.md
diff --git a/books/filosofia/estoicismo.md b/books/philosophy/estoicismo.md
similarity index 100%
rename from books/filosofia/estoicismo.md
rename to books/philosophy/estoicismo.md
diff --git a/books/psicologia.md b/books/psicologia.md
deleted file mode 100644
index d180f71..0000000
--- a/books/psicologia.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Psicologia"]]
-
-[[!inline pages="page(books/psicologia*)" archive="yes"]]
diff --git a/books/psychology.md b/books/psychology.md
new file mode 100644
index 0000000..6850d65
--- /dev/null
+++ b/books/psychology.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Psicologia"]]
+
+[[!inline pages="page(books/psychology*)" archive="yes"]]
diff --git a/books/psicologia/eros-civilization.md b/books/psychology/eros-civilization.md
similarity index 100%
rename from books/psicologia/eros-civilization.md
rename to books/psychology/eros-civilization.md
diff --git a/books/psicologia/eros-civilization/detours-to-death.png b/books/psychology/eros-civilization/detours-to-death.png
similarity index 100%
rename from books/psicologia/eros-civilization/detours-to-death.png
rename to books/psychology/eros-civilization/detours-to-death.png
diff --git a/books/psicologia/psychology-of-intelligence.md b/books/psychology/psychology-of-intelligence.md
similarity index 100%
rename from books/psicologia/psychology-of-intelligence.md
rename to books/psychology/psychology-of-intelligence.md
diff --git a/books/scifi.md b/books/scifi.md
index 1f6748a..b402707 100644
--- a/books/scifi.md
+++ b/books/scifi.md
@@ -1,3 +1,3 @@
-[[!meta title="Scifi"]]
+[[!meta title="Livros - Scifi"]]
[[!inline pages="page(books/scifi*)" archive="yes"]]
diff --git a/books/sociedade.md b/books/sociedade.md
deleted file mode 100644
index bed3738..0000000
--- a/books/sociedade.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Sociedade"]]
-
-[[!inline pages="page(books/sociedade*)" archive="yes"]]
diff --git a/books/sociology.md b/books/sociology.md
new file mode 100644
index 0000000..dc240d3
--- /dev/null
+++ b/books/sociology.md
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Sociedade"]]
+
+[[!inline pages="page(books/sociology*)" archive="yes"]]
diff --git a/books/sociedade/age-of-the-smart-machine.md b/books/sociology/age-of-the-smart-machine.md
similarity index 99%
rename from books/sociedade/age-of-the-smart-machine.md
rename to books/sociology/age-of-the-smart-machine.md
index af891ce..eae8e19 100644
--- a/books/sociedade/age-of-the-smart-machine.md
+++ b/books/sociology/age-of-the-smart-machine.md
@@ -1069,3 +1069,5 @@ To be continued:
* Any equivalent term in portuguese to "clerical work"?
* Class differentiation among both the catholic clergy and the modern monastic automated office, with high ranks of technomonks
doing the thinking (and acting-with) and the lower clerks acting like automatons (acting-on).
+
+[[!tag sociology technology history]]
diff --git a/books/sociedade/burnout-society.md b/books/sociology/burnout-society.md
similarity index 100%
rename from books/sociedade/burnout-society.md
rename to books/sociology/burnout-society.md
diff --git a/books/sociedade/ends-of-sleep.md b/books/sociology/ends-of-sleep.md
similarity index 100%
rename from books/sociedade/ends-of-sleep.md
rename to books/sociology/ends-of-sleep.md
diff --git a/books/sociedade/ilha.md b/books/sociology/ilha.md
similarity index 100%
rename from books/sociedade/ilha.md
rename to books/sociology/ilha.md
diff --git a/books/sociedade/jogos-homens.md b/books/sociology/jogos-homens.md
similarity index 100%
rename from books/sociedade/jogos-homens.md
rename to books/sociology/jogos-homens.md
diff --git a/books/sociedade/one-dimensional-man.md b/books/sociology/one-dimensional-man.md
similarity index 100%
rename from books/sociedade/one-dimensional-man.md
rename to books/sociology/one-dimensional-man.md
diff --git a/books/sociedade/post-scarcity.md b/books/sociology/post-scarcity.md
similarity index 100%
rename from books/sociedade/post-scarcity.md
rename to books/sociology/post-scarcity.md
diff --git a/books/sociedade/preguica.md b/books/sociology/preguica.md
similarity index 100%
rename from books/sociedade/preguica.md
rename to books/sociology/preguica.md
diff --git a/books/sociedade/processo-civilizador.md b/books/sociology/processo-civilizador.md
similarity index 100%
rename from books/sociedade/processo-civilizador.md
rename to books/sociology/processo-civilizador.md
diff --git a/books/sociedade/segundo-sexo.md b/books/sociology/segundo-sexo.md
similarity index 100%
rename from books/sociedade/segundo-sexo.md
rename to books/sociology/segundo-sexo.md
diff --git a/books/sociedade/sociedade-contra-o-estado.md b/books/sociology/sociedade-contra-o-estado.md
similarity index 100%
rename from books/sociedade/sociedade-contra-o-estado.md
rename to books/sociology/sociedade-contra-o-estado.md
diff --git a/books/sociedade/tolice.md b/books/sociology/tolice.md
similarity index 100%
rename from books/sociedade/tolice.md
rename to books/sociology/tolice.md
diff --git a/books/sociedade/who-owns-the-future.md b/books/sociology/who-owns-the-future.md
similarity index 100%
rename from books/sociedade/who-owns-the-future.md
rename to books/sociology/who-owns-the-future.md
diff --git a/books/sociedade/youre-not-a-gadget.md b/books/sociology/youre-not-a-gadget.md
similarity index 100%
rename from books/sociedade/youre-not-a-gadget.md
rename to books/sociology/youre-not-a-gadget.md
diff --git a/books/spy.md b/books/spy.md
index 20b115b..c0e1280 100644
--- a/books/spy.md
+++ b/books/spy.md
@@ -1,3 +1,3 @@
-[[!meta title="Espionagem"]]
+[[!meta title="Livros - Espionagem"]]
-[[!inline pages="page(books/espionagem*)" archive="yes"]]
+[[!inline pages="page(books/spy*)" archive="yes"]]
diff --git a/books/technology.md b/books/technology.md
new file mode 100644
index 0000000..7f18cf7
--- /dev/null
+++ b/books/technology.md
@@ -0,0 +1,18 @@
+[[!meta title="Livros - Tecnologia"]]
+
+ Os manifestos <aceleracionistas> insitem sobre as virtudes da aceleração
+ tecnológica sem dizer palavra sobre as condições materiais- energéticas,
+ ambientais, geopolíticas, etc- de tal processo, que conduzira
+ "automaticamente" pensam os autores, à redução da jornada de trabalho(
+ Também em Bangladesh?quando?), ao aumento das horas de lazer (a sociedade
+ do espetáculo sai do armário!), à renda universal etc: ...
+
+ A outra aceleração, a saber, aquela que diz respeito aos processod de
+ ultrapassagem dos valores criticos dos parâmentros ambientais- quando
+ chegaremos a +4C, que talves sejam + 6C ou + 8C? quando se dara o fim dos
+ estoques de pesca? .... essa outra recebe no máximo uma menção que beira a
+ frivolidade, para não dizermos um puro e simples negacionismo...
+
+ -- O mundo em suspenso, de Viveiros e Debora Danowski, pág 150
+
+[[!inline pages="page(books/technology*)" archive="yes"]]
diff --git a/books/tecnopolitica/cathedral-bazaar.md b/books/technology/cathedral-bazaar.md
similarity index 100%
rename from books/tecnopolitica/cathedral-bazaar.md
rename to books/technology/cathedral-bazaar.md
diff --git a/books/tecnopolitica/cybersyn.md b/books/technology/cybersyn.md
similarity index 100%
rename from books/tecnopolitica/cybersyn.md
rename to books/technology/cybersyn.md
diff --git a/books/tecnopolitica/maciunas-learning-machines.md b/books/technology/maciunas-learning-machines.md
similarity index 100%
rename from books/tecnopolitica/maciunas-learning-machines.md
rename to books/technology/maciunas-learning-machines.md
diff --git a/books/tecnopolitica/manifesto-contrassexual.md b/books/technology/manifesto-contrassexual.md
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual.md
rename to books/technology/manifesto-contrassexual.md
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png b/books/technology/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png
rename to books/technology/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png b/books/technology/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png
rename to books/technology/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png b/books/technology/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png
rename to books/technology/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png b/books/technology/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png
rename to books/technology/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png b/books/technology/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png b/books/technology/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png b/books/technology/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png b/books/technology/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png b/books/technology/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png b/books/technology/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png
diff --git a/books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png b/books/technology/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png
similarity index 100%
rename from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png
rename to books/technology/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png
diff --git a/books/sociedade/spaceship.md b/books/technology/spaceship-earth.md
similarity index 100%
rename from books/sociedade/spaceship.md
rename to books/technology/spaceship-earth.md
diff --git a/books/tecnopolitica.md b/books/tecnopolitica.md
deleted file mode 100644
index fa35cd9..0000000
--- a/books/tecnopolitica.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Tecnopolítica"]]
-
-[[!inline pages="page(books/tecnopolitica*)" archive="yes"]]
diff --git a/books/vida.md b/books/vida.md
deleted file mode 100644
index a206df7..0000000
--- a/books/vida.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Vida"]]
-
-[[!inline pages="page(books/vida*)" archive="yes"]]
diff --git a/meta.md b/meta.md
index ed47971..5bf2775 100644
--- a/meta.md
+++ b/meta.md
@@ -6,7 +6,11 @@ I'm going to bootstrap exuberance.
### About
-This is a mixed language and an one-cyborg-effort based on the work of the broader [FLOSS](https://en.wikipedia.org/wiki/FLOSS) community. All the content is here because it haven't found any other place yet to be sent. It's my brain's downstream wishing to be upstream somewhere or staged content to be sent to existing upstreams.
+This is a mixed language and an one-cyborg-effort based on the work of the
+broader [FLOSS](https://en.wikipedia.org/wiki/FLOSS) community. All the content
+is here because it haven't found any other place yet to be sent. It's my
+brain's downstream wishing to be upstream somewhere or staged content to be
+sent to existing upstreams.
Fork this site and [check it's integrity](https://opsec.fluxo.info/meta)!
@@ -35,3 +39,4 @@ Este site é bilíngue (português brasileiro e inglês internacional), porém s
1. Conteúdo em português é voltado especificamente ao público brasileiro e lusófono, em geral ligado a temas de interesse específico ou à atuação local.
2. Conteúdo em ingês é voltado ao público geral e ligado a temas da computação, desenvolvimento de sistemas, etc.
+3. Nomenclatura de pastas/seções em inglês, por convenção.
diff --git a/tags.md b/tags.md
new file mode 100644
index 0000000..38155c6
--- /dev/null
+++ b/tags.md
@@ -0,0 +1,3 @@
+[[!meta title="Tags"]]
+
+[[!pagestats style="list" pages="page(*) and !ikiwiki/* and !index and !sandbox and !templates* and !smileys and !shortcuts and !ikiwiki and !RecentChanges and !*/Discussion"]]
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 192d367..424d923 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -53,6 +53,7 @@
<li><TMPL_VAR TITLE></li>
<li><span class="divider">|</span> <a href="/meta">Meta</a></li>
<li><span class="divider">|</span> <a href="/map">Map</a></li>
+ <li><span class="divider">|</span> <a href="/tags">Tags</a></li>
<li><span class="divider">|</span> <a href="<TMPL_VAR HISTORYURL>">History</a></li>
<li><span class="divider">|</span> <a href="/index.rss">Feed</a></li>
</ul>
--
GitLab