]> gitweb.fluxo.info Git - blog.git/commitdiff
Reorganization
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 7 Aug 2018 13:05:58 +0000 (10:05 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 7 Aug 2018 13:05:58 +0000 (10:05 -0300)
81 files changed:
.htaccess
books.md
books/amor.md [deleted file]
books/epistemology.md [new file with mode: 0644]
books/epistemology/contra-metodo.md [moved from books/filosofia/contra-metodo.md with 99% similarity]
books/epistemology/cristal-fumaca.md [moved from books/filosofia/cristal-fumaca.md with 100% similarity]
books/epistemology/metodo.md [moved from books/filosofia/metodo.md with 95% similarity]
books/epistemology/metodo/1.md [moved from books/filosofia/metodo/1.md with 100% similarity]
books/epistemology/metodo/2.md [moved from books/filosofia/metodo/2.md with 100% similarity]
books/epistemology/metodo/3.md [moved from books/filosofia/metodo/3.md with 100% similarity]
books/epistemology/metodo/4.md [moved from books/filosofia/metodo/4.md with 100% similarity]
books/epistemology/metodo/5.md [moved from books/filosofia/metodo/5.md with 100% similarity]
books/epistemology/metodo/6.md [moved from books/filosofia/metodo/6.md with 100% similarity]
books/epistemology/metodo/tetragrama.dot [moved from books/filosofia/metodo/tetragrama.dot with 100% similarity]
books/epistemology/metodo/tetragrama.svg [moved from books/filosofia/metodo/tetragrama.svg with 100% similarity]
books/filosofia.md [deleted file]
books/history.md [new file with mode: 0644]
books/history/ibm-holocaust.md [moved from books/historia/ibm-holocaust.md with 99% similarity]
books/history/ibm-holocaust/auschwitz.jpg [moved from books/historia/ibm-holocaust/auschwitz.jpg with 100% similarity]
books/history/ibm-holocaust/dehomag.png [moved from books/historia/ibm-holocaust/dehomag.png with 100% similarity]
books/life.md [new file with mode: 0644]
books/life/arte-da-vida.md [moved from books/vida/arte-da-vida.md with 100% similarity]
books/life/arte-de-viver.md [moved from books/vida/arte-de-viver.md with 100% similarity]
books/life/brevidade-da-vida.md [moved from books/vida/brevidade.md with 100% similarity]
books/literature.md [new file with mode: 0644]
books/literature/mayombe.md [moved from books/sociedade/mayombe.md with 100% similarity]
books/love.md [new file with mode: 0644]
books/love/amor-liquido.md [moved from books/amor/liquido.md with 100% similarity]
books/love/arte-de-amar.md [moved from books/amor/arte.md with 100% similarity]
books/love/enamoramento-e-amor.md [moved from books/amor/enamoramento.md with 100% similarity]
books/love/livro-da-dor-e-do-amor.md [moved from books/amor/dor.md with 100% similarity]
books/love/poesia-sabedoria.md [moved from books/amor/poesia-sabedoria.md with 100% similarity]
books/love/sem-tesao-nao-ha-solucao.md [moved from books/amor/tesao.md with 100% similarity]
books/philosophy.md [new file with mode: 0644]
books/philosophy/espionosa-filosofia-pratica.md [moved from books/filosofia/espionosa-filosofia-pratica.md with 100% similarity]
books/philosophy/estoicismo.md [moved from books/filosofia/estoicismo.md with 100% similarity]
books/psicologia.md [deleted file]
books/psychology.md [new file with mode: 0644]
books/psychology/eros-civilization.md [moved from books/psicologia/eros-civilization.md with 100% similarity]
books/psychology/eros-civilization/detours-to-death.png [moved from books/psicologia/eros-civilization/detours-to-death.png with 100% similarity]
books/psychology/psychology-of-intelligence.md [moved from books/psicologia/psychology-of-intelligence.md with 100% similarity]
books/scifi.md
books/sociedade.md [deleted file]
books/sociology.md [new file with mode: 0644]
books/sociology/age-of-the-smart-machine.md [moved from books/sociedade/age-of-the-smart-machine.md with 99% similarity]
books/sociology/burnout-society.md [moved from books/sociedade/burnout-society.md with 100% similarity]
books/sociology/ends-of-sleep.md [moved from books/sociedade/ends-of-sleep.md with 100% similarity]
books/sociology/ilha.md [moved from books/sociedade/ilha.md with 100% similarity]
books/sociology/jogos-homens.md [moved from books/sociedade/jogos-homens.md with 100% similarity]
books/sociology/one-dimensional-man.md [moved from books/sociedade/one-dimensional-man.md with 100% similarity]
books/sociology/post-scarcity.md [moved from books/sociedade/post-scarcity.md with 100% similarity]
books/sociology/preguica.md [moved from books/sociedade/preguica.md with 100% similarity]
books/sociology/processo-civilizador.md [moved from books/sociedade/processo-civilizador.md with 100% similarity]
books/sociology/segundo-sexo.md [moved from books/sociedade/segundo-sexo.md with 100% similarity]
books/sociology/sociedade-contra-o-estado.md [moved from books/sociedade/sociedade-contra-o-estado.md with 100% similarity]
books/sociology/tolice.md [moved from books/sociedade/tolice.md with 100% similarity]
books/sociology/who-owns-the-future.md [moved from books/sociedade/who-owns-the-future.md with 100% similarity]
books/sociology/youre-not-a-gadget.md [moved from books/sociedade/youre-not-a-gadget.md with 100% similarity]
books/spy.md
books/technology.md [new file with mode: 0644]
books/technology/cathedral-bazaar.md [moved from books/tecnopolitica/cathedral-bazaar.md with 100% similarity]
books/technology/cybersyn.md [moved from books/tecnopolitica/cybersyn.md with 100% similarity]
books/technology/maciunas-learning-machines.md [moved from books/tecnopolitica/maciunas-learning-machines.md with 100% similarity]
books/technology/manifesto-contrassexual.md [moved from books/tecnopolitica/manifesto-contrassexual.md with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-03-17:01:45_660x638.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:33:43_533x291.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-02:38:12_569x683.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-08:45:50_521x709.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:01:41_427x719.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:04_419x584.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:29_419x543.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:42_441x731.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:02:55_424x733.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:03:16_430x733.png with 100% similarity]
books/technology/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png [moved from books/tecnopolitica/manifesto-contrassexual/2018-03-04-15:37:55_606x562.png with 100% similarity]
books/technology/spaceship-earth.md [moved from books/sociedade/spaceship.md with 100% similarity]
books/tecnopolitica.md [deleted file]
books/vida.md [deleted file]
meta.md
tags.md [new file with mode: 0644]
templates/page.tmpl

index 558a2267110f96cd5167235b9a271608a6f5c70b..d2a3bd88966591c951d53f8b4c0d46413a6d4f68 100644 (file)
--- 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>
index 4a5786eccd3c90edb683d28b0934bef145b9fc1b..9317092ecad307d138980ba4d107e5fb0661c916 100644 (file)
--- 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 (file)
index 35fbaf5..0000000
+++ /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 (file)
index 0000000..1944f9a
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Epistemologia"]]
+
+[[!inline pages="page(books/epistemology*)" archive="yes"]]
similarity index 99%
rename from books/filosofia/contra-metodo.md
rename to books/epistemology/contra-metodo.md
index d37e60f4353578a1fb62794edcaea8d9bc417920..b7d607e6f1d8ada566c8f0f57386a210e132eb9a 100644 (file)
@@ -96,3 +96,5 @@ Regular, irregular, regra: 213.
     que tem muitas vantagens mas também muitos inconvenientes.
 
     -- 225
+
+[[!tag epistemology philosophy]]
similarity index 95%
rename from books/filosofia/metodo.md
rename to books/epistemology/metodo.md
index cda57501cb0277cfd57b9510514e0aee33ac302f..848958fefcceab1c1ac5c040077ddb77bb412c18 100644 (file)
@@ -22,3 +22,5 @@
 * [Volume II](2).
 * [Volume III](3).
 * [Volume IV](4).
+
+[[!tag epistemology philosophy]]
diff --git a/books/filosofia.md b/books/filosofia.md
deleted file mode 100644 (file)
index 53647a5..0000000
+++ /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 (file)
index 0000000..27fdd9e
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - História"]]
+
+[[!inline pages="page(books/history*)" archive="yes"]]
similarity index 99%
rename from books/historia/ibm-holocaust.md
rename to books/history/ibm-holocaust.md
index d210856fbfc872ba1a17ac7207a4f1ea985d76b3..11ff4786075b75b874c70e5814b7f2d6f69d951e 100644 (file)
@@ -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/life.md b/books/life.md
new file mode 100644 (file)
index 0000000..f2c3b4b
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Vida"]]
+
+[[!inline pages="page(books/life*)" archive="yes"]]
diff --git a/books/literature.md b/books/literature.md
new file mode 100644 (file)
index 0000000..66ffa69
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Literatura Geral"]]
+
+[[!inline pages="page(books/literatura*)" archive="yes"]]
diff --git a/books/love.md b/books/love.md
new file mode 100644 (file)
index 0000000..b2948b7
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Amor"]]
+
+[[!inline pages="page(books/love*)" archive="yes"]]
diff --git a/books/philosophy.md b/books/philosophy.md
new file mode 100644 (file)
index 0000000..710cbb2
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Filosofia"]]
+
+[[!inline pages="page(books/philosophy*)" archive="yes"]]
diff --git a/books/psicologia.md b/books/psicologia.md
deleted file mode 100644 (file)
index d180f71..0000000
+++ /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 (file)
index 0000000..6850d65
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Psicologia"]]
+
+[[!inline pages="page(books/psychology*)" archive="yes"]]
index 1f6748aba4568b284aec97ae29213e2640e87c33..b402707a90478ee7286ddf77a1f4ac1303734b12 100644 (file)
@@ -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 (file)
index bed3738..0000000
+++ /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 (file)
index 0000000..dc240d3
--- /dev/null
@@ -0,0 +1,3 @@
+[[!meta title="Livros - Sociedade"]]
+
+[[!inline pages="page(books/sociology*)" archive="yes"]]
similarity index 99%
rename from books/sociedade/age-of-the-smart-machine.md
rename to books/sociology/age-of-the-smart-machine.md
index af891cebbd4b2f95599bb71aa84b270f92805ee5..eae8e19ba149a3424bea56875b51c98976a9dd7b 100644 (file)
@@ -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]]
index 20b115b73f47714309c9b6a9a77aa37c74c90acb..c0e128068cdc2c05d86ba844dde08775e1d4bbdf 100644 (file)
@@ -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 (file)
index 0000000..7f18cf7
--- /dev/null
@@ -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.md b/books/tecnopolitica.md
deleted file mode 100644 (file)
index fa35cd9..0000000
+++ /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 (file)
index a206df7..0000000
+++ /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 ed47971d40e44f5001a7c1f73906d470eda5c17f..5bf277576a5bcb44e3857ee367743bc2e2b0df79 100644 (file)
--- 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 (file)
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"]]
index 192d3670ca9bea289682cd8ae4f00be1b71b234b..424d92338d9c742a312bd2c9886f3b839b751ad9 100644 (file)
@@ -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>