aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.htaccess28
-rw-r--r--books.md29
-rw-r--r--books/amor.md3
-rw-r--r--books/epistemology.md3
-rw-r--r--books/epistemology/contra-metodo.md (renamed from books/filosofia/contra-metodo.md)2
-rw-r--r--books/epistemology/cristal-fumaca.md (renamed from books/filosofia/cristal-fumaca.md)0
-rw-r--r--books/epistemology/metodo.md (renamed from books/filosofia/metodo.md)2
-rw-r--r--books/epistemology/metodo/1.md (renamed from books/filosofia/metodo/1.md)0
-rw-r--r--books/epistemology/metodo/2.md (renamed from books/filosofia/metodo/2.md)0
-rw-r--r--books/epistemology/metodo/3.md (renamed from books/filosofia/metodo/3.md)0
-rw-r--r--books/epistemology/metodo/4.md (renamed from books/filosofia/metodo/4.md)0
-rw-r--r--books/epistemology/metodo/5.md (renamed from books/filosofia/metodo/5.md)0
-rw-r--r--books/epistemology/metodo/6.md (renamed from books/filosofia/metodo/6.md)0
-rw-r--r--books/epistemology/metodo/tetragrama.dot (renamed from books/filosofia/metodo/tetragrama.dot)0
-rw-r--r--books/epistemology/metodo/tetragrama.svg (renamed from books/filosofia/metodo/tetragrama.svg)0
-rw-r--r--books/filosofia.md3
-rw-r--r--books/history.md3
-rw-r--r--books/history/ibm-holocaust.md (renamed from books/historia/ibm-holocaust.md)2
-rw-r--r--books/history/ibm-holocaust/auschwitz.jpg (renamed from books/historia/ibm-holocaust/auschwitz.jpg)bin194058 -> 194058 bytes
-rw-r--r--books/history/ibm-holocaust/dehomag.png (renamed from books/historia/ibm-holocaust/dehomag.png)bin89196 -> 89196 bytes
-rw-r--r--books/life.md3
-rw-r--r--books/life/arte-da-vida.md (renamed from books/vida/arte-da-vida.md)0
-rw-r--r--books/life/arte-de-viver.md (renamed from books/vida/arte-de-viver.md)0
-rw-r--r--books/life/brevidade-da-vida.md (renamed from books/vida/brevidade.md)0
-rw-r--r--books/literature.md3
-rw-r--r--books/literature/mayombe.md (renamed from books/sociedade/mayombe.md)0
-rw-r--r--books/love.md3
-rw-r--r--books/love/amor-liquido.md (renamed from books/amor/liquido.md)0
-rw-r--r--books/love/arte-de-amar.md (renamed from books/amor/arte.md)0
-rw-r--r--books/love/enamoramento-e-amor.md (renamed from books/amor/enamoramento.md)0
-rw-r--r--books/love/livro-da-dor-e-do-amor.md (renamed from books/amor/dor.md)0
-rw-r--r--books/love/poesia-sabedoria.md (renamed from books/amor/poesia-sabedoria.md)0
-rw-r--r--books/love/sem-tesao-nao-ha-solucao.md (renamed from books/amor/tesao.md)0
-rw-r--r--books/philosophy.md3
-rw-r--r--books/philosophy/espionosa-filosofia-pratica.md (renamed from books/filosofia/espionosa-filosofia-pratica.md)0
-rw-r--r--books/philosophy/estoicismo.md (renamed from books/filosofia/estoicismo.md)0
-rw-r--r--books/psicologia.md3
-rw-r--r--books/psychology.md3
-rw-r--r--books/psychology/eros-civilization.md (renamed from books/psicologia/eros-civilization.md)0
-rw-r--r--books/psychology/eros-civilization/detours-to-death.png (renamed from books/psicologia/eros-civilization/detours-to-death.png)bin129210 -> 129210 bytes
-rw-r--r--books/psychology/psychology-of-intelligence.md (renamed from books/psicologia/psychology-of-intelligence.md)0
-rw-r--r--books/scifi.md2
-rw-r--r--books/sociedade.md3
-rw-r--r--books/sociology.md3
-rw-r--r--books/sociology/age-of-the-smart-machine.md (renamed from books/sociedade/age-of-the-smart-machine.md)2
-rw-r--r--books/sociology/burnout-society.md (renamed from books/sociedade/burnout-society.md)0
-rw-r--r--books/sociology/ends-of-sleep.md (renamed from books/sociedade/ends-of-sleep.md)0
-rw-r--r--books/sociology/ilha.md (renamed from books/sociedade/ilha.md)0
-rw-r--r--books/sociology/jogos-homens.md (renamed from books/sociedade/jogos-homens.md)0
-rw-r--r--books/sociology/one-dimensional-man.md (renamed from books/sociedade/one-dimensional-man.md)0
-rw-r--r--books/sociology/post-scarcity.md (renamed from books/sociedade/post-scarcity.md)0
-rw-r--r--books/sociology/preguica.md (renamed from books/sociedade/preguica.md)0
-rw-r--r--books/sociology/processo-civilizador.md (renamed from books/sociedade/processo-civilizador.md)0
-rw-r--r--books/sociology/segundo-sexo.md (renamed from books/sociedade/segundo-sexo.md)0
-rw-r--r--books/sociology/sociedade-contra-o-estado.md (renamed from books/sociedade/sociedade-contra-o-estado.md)0
-rw-r--r--books/sociology/tolice.md (renamed from books/sociedade/tolice.md)0
-rw-r--r--books/sociology/who-owns-the-future.md (renamed from books/sociedade/who-owns-the-future.md)0
-rw-r--r--books/sociology/youre-not-a-gadget.md (renamed from books/sociedade/youre-not-a-gadget.md)0
-rw-r--r--books/spy.md4
-rw-r--r--books/technology.md18
-rw-r--r--books/technology/cathedral-bazaar.md (renamed from books/tecnopolitica/cathedral-bazaar.md)0
-rw-r--r--books/technology/cybersyn.md (renamed from books/tecnopolitica/cybersyn.md)0
-rw-r--r--books/technology/maciunas-learning-machines.md (renamed from books/tecnopolitica/maciunas-learning-machines.md)0
-rw-r--r--books/technology/manifesto-contrassexual.md (renamed from books/tecnopolitica/manifesto-contrassexual.md)0
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png)bin127282 -> 127282 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png)bin49578 -> 49578 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png)bin146579 -> 146579 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png)bin158178 -> 158178 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png)bin144815 -> 144815 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png)bin117319 -> 117319 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png)bin107630 -> 107630 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png)bin143924 -> 143924 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png)bin142698 -> 142698 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png)bin148722 -> 148722 bytes
-rw-r--r--books/technology/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png (renamed from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png)bin117005 -> 117005 bytes
-rw-r--r--books/technology/spaceship-earth.md (renamed from books/sociedade/spaceship.md)0
-rw-r--r--books/tecnopolitica.md3
-rw-r--r--books/vida.md3
-rw-r--r--meta.md7
-rw-r--r--tags.md3
-rw-r--r--templates/page.tmpl1
81 files changed, 87 insertions, 55 deletions
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
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
index 33e6c04..33e6c04 100644
--- a/books/filosofia/cristal-fumaca.md
+++ b/books/epistemology/cristal-fumaca.md
diff --git a/books/filosofia/metodo.md b/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
index 4b00e17..4b00e17 100644
--- a/books/filosofia/metodo/1.md
+++ b/books/epistemology/metodo/1.md
diff --git a/books/filosofia/metodo/2.md b/books/epistemology/metodo/2.md
index ba26fae..ba26fae 100644
--- a/books/filosofia/metodo/2.md
+++ b/books/epistemology/metodo/2.md
diff --git a/books/filosofia/metodo/3.md b/books/epistemology/metodo/3.md
index 8f2960e..8f2960e 100644
--- a/books/filosofia/metodo/3.md
+++ b/books/epistemology/metodo/3.md
diff --git a/books/filosofia/metodo/4.md b/books/epistemology/metodo/4.md
index df491ab..df491ab 100644
--- a/books/filosofia/metodo/4.md
+++ b/books/epistemology/metodo/4.md
diff --git a/books/filosofia/metodo/5.md b/books/epistemology/metodo/5.md
index ea0835e..ea0835e 100644
--- a/books/filosofia/metodo/5.md
+++ b/books/epistemology/metodo/5.md
diff --git a/books/filosofia/metodo/6.md b/books/epistemology/metodo/6.md
index 61a3ee4..61a3ee4 100644
--- a/books/filosofia/metodo/6.md
+++ b/books/epistemology/metodo/6.md
diff --git a/books/filosofia/metodo/tetragrama.dot b/books/epistemology/metodo/tetragrama.dot
index 937e2ed..937e2ed 100644
--- a/books/filosofia/metodo/tetragrama.dot
+++ b/books/epistemology/metodo/tetragrama.dot
diff --git a/books/filosofia/metodo/tetragrama.svg b/books/epistemology/metodo/tetragrama.svg
index fe4c6ed..fe4c6ed 100644
--- a/books/filosofia/metodo/tetragrama.svg
+++ b/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
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
index e4c21f0..e4c21f0 100644
--- a/books/historia/ibm-holocaust/auschwitz.jpg
+++ b/books/history/ibm-holocaust/auschwitz.jpg
Binary files differ
diff --git a/books/historia/ibm-holocaust/dehomag.png b/books/history/ibm-holocaust/dehomag.png
index 9e2ee32..9e2ee32 100644
--- a/books/historia/ibm-holocaust/dehomag.png
+++ b/books/history/ibm-holocaust/dehomag.png
Binary files differ
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
index 9854d53..9854d53 100644
--- a/books/vida/arte-da-vida.md
+++ b/books/life/arte-da-vida.md
diff --git a/books/vida/arte-de-viver.md b/books/life/arte-de-viver.md
index c5930b9..c5930b9 100644
--- a/books/vida/arte-de-viver.md
+++ b/books/life/arte-de-viver.md
diff --git a/books/vida/brevidade.md b/books/life/brevidade-da-vida.md
index 4e21a25..4e21a25 100644
--- a/books/vida/brevidade.md
+++ b/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
index 6e11b51..6e11b51 100644
--- a/books/sociedade/mayombe.md
+++ b/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
index 15f1c5c..15f1c5c 100644
--- a/books/amor/liquido.md
+++ b/books/love/amor-liquido.md
diff --git a/books/amor/arte.md b/books/love/arte-de-amar.md
index 48493ea..48493ea 100644
--- a/books/amor/arte.md
+++ b/books/love/arte-de-amar.md
diff --git a/books/amor/enamoramento.md b/books/love/enamoramento-e-amor.md
index 9776a64..9776a64 100644
--- a/books/amor/enamoramento.md
+++ b/books/love/enamoramento-e-amor.md
diff --git a/books/amor/dor.md b/books/love/livro-da-dor-e-do-amor.md
index 70052cf..70052cf 100644
--- a/books/amor/dor.md
+++ b/books/love/livro-da-dor-e-do-amor.md
diff --git a/books/amor/poesia-sabedoria.md b/books/love/poesia-sabedoria.md
index 8ade9af..8ade9af 100644
--- a/books/amor/poesia-sabedoria.md
+++ b/books/love/poesia-sabedoria.md
diff --git a/books/amor/tesao.md b/books/love/sem-tesao-nao-ha-solucao.md
index 29c2d2a..29c2d2a 100644
--- a/books/amor/tesao.md
+++ b/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
index 434c97d..434c97d 100644
--- a/books/filosofia/espionosa-filosofia-pratica.md
+++ b/books/philosophy/espionosa-filosofia-pratica.md
diff --git a/books/filosofia/estoicismo.md b/books/philosophy/estoicismo.md
index cbdd2ce..cbdd2ce 100644
--- a/books/filosofia/estoicismo.md
+++ b/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
index fdd41ab..fdd41ab 100644
--- a/books/psicologia/eros-civilization.md
+++ b/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
index 3012525..3012525 100644
--- a/books/psicologia/eros-civilization/detours-to-death.png
+++ b/books/psychology/eros-civilization/detours-to-death.png
Binary files differ
diff --git a/books/psicologia/psychology-of-intelligence.md b/books/psychology/psychology-of-intelligence.md
index be516af..be516af 100644
--- a/books/psicologia/psychology-of-intelligence.md
+++ b/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
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
index de995c0..de995c0 100644
--- a/books/sociedade/burnout-society.md
+++ b/books/sociology/burnout-society.md
diff --git a/books/sociedade/ends-of-sleep.md b/books/sociology/ends-of-sleep.md
index 1e2152f..1e2152f 100644
--- a/books/sociedade/ends-of-sleep.md
+++ b/books/sociology/ends-of-sleep.md
diff --git a/books/sociedade/ilha.md b/books/sociology/ilha.md
index ecf2186..ecf2186 100644
--- a/books/sociedade/ilha.md
+++ b/books/sociology/ilha.md
diff --git a/books/sociedade/jogos-homens.md b/books/sociology/jogos-homens.md
index 105b13c..105b13c 100644
--- a/books/sociedade/jogos-homens.md
+++ b/books/sociology/jogos-homens.md
diff --git a/books/sociedade/one-dimensional-man.md b/books/sociology/one-dimensional-man.md
index af5a90a..af5a90a 100644
--- a/books/sociedade/one-dimensional-man.md
+++ b/books/sociology/one-dimensional-man.md
diff --git a/books/sociedade/post-scarcity.md b/books/sociology/post-scarcity.md
index 4b1a1b0..4b1a1b0 100644
--- a/books/sociedade/post-scarcity.md
+++ b/books/sociology/post-scarcity.md
diff --git a/books/sociedade/preguica.md b/books/sociology/preguica.md
index 4726746..4726746 100644
--- a/books/sociedade/preguica.md
+++ b/books/sociology/preguica.md
diff --git a/books/sociedade/processo-civilizador.md b/books/sociology/processo-civilizador.md
index a82b834..a82b834 100644
--- a/books/sociedade/processo-civilizador.md
+++ b/books/sociology/processo-civilizador.md
diff --git a/books/sociedade/segundo-sexo.md b/books/sociology/segundo-sexo.md
index 27cb049..27cb049 100644
--- a/books/sociedade/segundo-sexo.md
+++ b/books/sociology/segundo-sexo.md
diff --git a/books/sociedade/sociedade-contra-o-estado.md b/books/sociology/sociedade-contra-o-estado.md
index 04ce2fe..04ce2fe 100644
--- a/books/sociedade/sociedade-contra-o-estado.md
+++ b/books/sociology/sociedade-contra-o-estado.md
diff --git a/books/sociedade/tolice.md b/books/sociology/tolice.md
index 59292d4..59292d4 100644
--- a/books/sociedade/tolice.md
+++ b/books/sociology/tolice.md
diff --git a/books/sociedade/who-owns-the-future.md b/books/sociology/who-owns-the-future.md
index e53d275..e53d275 100644
--- a/books/sociedade/who-owns-the-future.md
+++ b/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
index eac4d9b..eac4d9b 100644
--- a/books/sociedade/youre-not-a-gadget.md
+++ b/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
index d9416d2..d9416d2 100644
--- a/books/tecnopolitica/cathedral-bazaar.md
+++ b/books/technology/cathedral-bazaar.md
diff --git a/books/tecnopolitica/cybersyn.md b/books/technology/cybersyn.md
index 4d39522..4d39522 100644
--- a/books/tecnopolitica/cybersyn.md
+++ b/books/technology/cybersyn.md
diff --git a/books/tecnopolitica/maciunas-learning-machines.md b/books/technology/maciunas-learning-machines.md
index 3d6dd0c..3d6dd0c 100644
--- a/books/tecnopolitica/maciunas-learning-machines.md
+++ b/books/technology/maciunas-learning-machines.md
diff --git a/books/tecnopolitica/manifesto-contrassexual.md b/books/technology/manifesto-contrassexual.md
index d575a84..d575a84 100644
--- a/books/tecnopolitica/manifesto-contrassexual.md
+++ b/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
index b4b8d58..b4b8d58 100644
--- 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
Binary files differ
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
index f14e580..f14e580 100644
--- 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
Binary files differ
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
index f66d0b7..f66d0b7 100644
--- 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
Binary files differ
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
index db1f732..db1f732 100644
--- 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
Binary files differ
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
index 95d6ff6..95d6ff6 100644
--- 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
Binary files differ
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
index f9761c1..f9761c1 100644
--- 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
Binary files differ
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
index 8dd9424..8dd9424 100644
--- 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
Binary files differ
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
index b187740..b187740 100644
--- 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
Binary files differ
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
index 2f951dd..2f951dd 100644
--- 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
Binary files differ
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
index 87fd73f..87fd73f 100644
--- 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
Binary files differ
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
index c9a53c0..c9a53c0 100644
--- 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
Binary files differ
diff --git a/books/sociedade/spaceship.md b/books/technology/spaceship-earth.md
index 86ec30d..86ec30d 100644
--- a/books/sociedade/spaceship.md
+++ b/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>