From ccc6d8f7fa496797c87b6445197b008218d1e486 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 19:39:47 +0200 Subject: [PATCH 01/12] Default commit message, part of an automated flow. --- journal/2021-10-22.md | 3 +++ straw.md | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 straw.md diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index 39355c596..99e373435 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -8,6 +8,9 @@ - [[flow]] - [[249]] - [[the mind illuminated]] +- [[matrix]] + - [[xmpp]] + - [[straw]] told me about [[dino]] - [[i am cuba]] - [[es]] [[soy cuba]] - [[do]] diff --git a/straw.md b/straw.md new file mode 100644 index 000000000..95a9e4329 --- /dev/null +++ b/straw.md @@ -0,0 +1,5 @@ +# straw + +- a [[person]] + - [[mastodon]] @straw@socks.pinnoto.org + From e439a03b47555eaeccd08eedc7e6b051d4eba679 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 19:42:55 +0200 Subject: [PATCH 02/12] Default commit message, part of an automated flow. --- fauno.md | 2 ++ journal/2021-10-22.md | 4 +--- sutty.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fauno.md b/fauno.md index 8b09f2dc1..7110f2b97 100644 --- a/fauno.md +++ b/fauno.md @@ -1,5 +1,7 @@ + - a [[person]] - [[pirate]] - likes [[monkey island]] + - in [[sutty]] - [[go]] https://fauno.endefensadelsl.org/ - [[en]] https://fauno.endefensadelsl.org/en/ \ No newline at end of file diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index 2cd0c24f8..f052f6a5a 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -8,15 +8,13 @@ - [[flow]] - [[249]] - [[the mind illuminated]] -<<<<<<< HEAD +- [[fauno]] - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] -======= - [[knowledge graphs]] - [[an invitation to applied category theory]] - [[lemmy]] ->>>>>>> 0eb17a2163f4e4404b99620828862be73f3fbc6a - [[i am cuba]] - [[es]] [[soy cuba]] - [[do]] diff --git a/sutty.md b/sutty.md index 50286e329..e27b8ba1b 100644 --- a/sutty.md +++ b/sutty.md @@ -1,6 +1,7 @@ - a [[coop]] - [[web sites]] [[activism]] [[publisher]] - [[argentina]] + - in [[hypha]] - [[go]] https://sutty.nl - [[twitter]] https://twitter.com/suttyweb - [[miembros]] From a2caba17b6fdc04e98d05345646b1a3a60ae22b4 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 20:01:23 +0200 Subject: [PATCH 03/12] Default commit message, part of an automated flow. --- journal/2021-10-22.md | 1 + matterbridge.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index f052f6a5a..ae7a56882 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -12,6 +12,7 @@ - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] + - [[matterbridge]] - [[knowledge graphs]] - [[an invitation to applied category theory]] - [[lemmy]] diff --git a/matterbridge.md b/matterbridge.md index a48b0bd5f..3fa0b2d37 100644 --- a/matterbridge.md +++ b/matterbridge.md @@ -1,2 +1,6 @@ # Matterbridge +- a [[project]] + - [[bridge]] + - supports many chat standards, including [[matrix]] and [[xmpp]] + From 4549f6a2c1ea68fd788765fa9795ae1f835f8a41 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 20:02:03 +0200 Subject: [PATCH 04/12] Default commit message, part of an automated flow. --- matterbridge.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/matterbridge.md b/matterbridge.md index 3fa0b2d37..313db361e 100644 --- a/matterbridge.md +++ b/matterbridge.md @@ -1,6 +1,8 @@ # Matterbridge -- a [[project]] - - [[bridge]] - - supports many chat standards, including [[matrix]] and [[xmpp]] +- a [[bridge]] + - [[open source]] [[project]] + - supports many chat standards, including [[matrix]] and [[xmpp]] + - [[git]] https://github.com/42wim/matterbridge + - [[go]] [[git]] From 3a9024449478994824ab3028006fb925a9750ed2 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 20:36:52 +0200 Subject: [PATCH 05/12] Default commit message, part of an automated flow. --- fauno.md | 2 +- journal/2021-10-22.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fauno.md b/fauno.md index 7110f2b97..47714eca7 100644 --- a/fauno.md +++ b/fauno.md @@ -1,6 +1,6 @@ - a [[person]] - - [[pirate]] + - [[pirate]] [[friend]] - likes [[monkey island]] - in [[sutty]] - [[go]] https://fauno.endefensadelsl.org/ diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index ae7a56882..0cff99bde 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -13,6 +13,7 @@ - [[xmpp]] - [[straw]] told me about [[dino]] - [[matterbridge]] + - [[fauno]] - [[knowledge graphs]] - [[an invitation to applied category theory]] - [[lemmy]] From 0ae6439f5b0839ce22f00f687f22fec00b502e18 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 20:42:37 +0200 Subject: [PATCH 06/12] Default commit message, part of an automated flow. --- fauno.md | 4 +++- journal/2021-10-22.md | 1 + ubiquituous.md | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ubiquituous.md diff --git a/fauno.md b/fauno.md index 47714eca7..173771023 100644 --- a/fauno.md +++ b/fauno.md @@ -4,4 +4,6 @@ - likes [[monkey island]] - in [[sutty]] - [[go]] https://fauno.endefensadelsl.org/ - - [[en]] https://fauno.endefensadelsl.org/en/ \ No newline at end of file + - [[en]] https://fauno.endefensadelsl.org/en/ + - [[twitter]] unknown + - [[mastodon]] \ No newline at end of file diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index 0cff99bde..b15a41343 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -9,6 +9,7 @@ - [[249]] - [[the mind illuminated]] - [[fauno]] +- [[ubiquituous]] - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] diff --git a/ubiquituous.md b/ubiquituous.md new file mode 100644 index 000000000..e9e53e50e --- /dev/null +++ b/ubiquituous.md @@ -0,0 +1,4 @@ +# ubiquituous + +[[pull]] [[ubiquitous]] + From ff59678fa658ae82179bea879912781a6ba3d6ba Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:35:09 +0200 Subject: [PATCH 07/12] Default commit message, part of an automated flow. --- chögyam trungpa.md | 4 +++- cutting through spiritual materialism.md | 5 +++++ journal/2021-10-22.md | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 cutting through spiritual materialism.md diff --git a/chögyam trungpa.md b/chögyam trungpa.md index cc187f5f0..f8422250e 100644 --- a/chögyam trungpa.md +++ b/chögyam trungpa.md @@ -1,5 +1,7 @@ # chögyam trungpa -- I've been reading [[cutting through spiritual materialism]] and enjoying it a lot. +- a [[person]] + - [[bodhisattva]] + - I loved [[cutting through spiritual materialism]]. - https://twitter.com/flancian/status/1353858333480873985 diff --git a/cutting through spiritual materialism.md b/cutting through spiritual materialism.md new file mode 100644 index 000000000..fb48d7c32 --- /dev/null +++ b/cutting through spiritual materialism.md @@ -0,0 +1,5 @@ +# cutting through spiritual materialism + +- a [[book]] + - by [[chögyam trungpa]] + diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index b15a41343..159126d46 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -10,6 +10,9 @@ - [[the mind illuminated]] - [[fauno]] - [[ubiquituous]] +- *[[chögyam trungpa]]* + - loved [[cutting through spiritual materialism]] + - forgot to choose my new book of his or [[shambala]] - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] From 436e497ee7f12990f6712a65219fc2652dfb83b1 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:36:14 +0200 Subject: [PATCH 08/12] Default commit message, part of an automated flow. --- chogyam trungpa.md | 4 ++++ chögyam trungpa.md | 1 + journal/2021-10-22.md | 7 ++++--- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 chogyam trungpa.md diff --git a/chogyam trungpa.md b/chogyam trungpa.md new file mode 100644 index 000000000..bc6f4aa2b --- /dev/null +++ b/chogyam trungpa.md @@ -0,0 +1,4 @@ +# chogyam trungpa + +- [[pull]] [[chögyam trungpa]] + diff --git a/chögyam trungpa.md b/chögyam trungpa.md index f8422250e..ec6611c14 100644 --- a/chögyam trungpa.md +++ b/chögyam trungpa.md @@ -2,6 +2,7 @@ - a [[person]] - [[bodhisattva]] + - [[shambah]] - I loved [[cutting through spiritual materialism]]. - https://twitter.com/flancian/status/1353858333480873985 diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index 159126d46..0f42332ff 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -10,9 +10,10 @@ - [[the mind illuminated]] - [[fauno]] - [[ubiquituous]] -- *[[chögyam trungpa]]* - - loved [[cutting through spiritual materialism]] - - forgot to choose my new book of his or [[shambala]] +- [[chogyam trungpa]] + - *[[chögyam trungpa]]* + - loved [[cutting through spiritual materialism]] + - forgot to choose my new book of his or [[shambala]] - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] From 82cf97effed521e2b805c33a1439ea3e3b247c5c Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:49:49 +0200 Subject: [PATCH 09/12] Default commit message, part of an automated flow. --- chögyam trungpa.md | 2 +- journal/2021-10-22.md | 2 +- shambala.md | 4 ++++ shambhala.md | 4 ++++ shambhala: the sacred path of the warrior.md | 7 +++++++ the sacred path of the warrior.md | 4 ++++ 6 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 shambala.md create mode 100644 shambhala.md create mode 100644 shambhala: the sacred path of the warrior.md create mode 100644 the sacred path of the warrior.md diff --git a/chögyam trungpa.md b/chögyam trungpa.md index ec6611c14..e897351f1 100644 --- a/chögyam trungpa.md +++ b/chögyam trungpa.md @@ -2,7 +2,7 @@ - a [[person]] - [[bodhisattva]] - - [[shambah]] + - [[shambhala]] - I loved [[cutting through spiritual materialism]]. - https://twitter.com/flancian/status/1353858333480873985 diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md index 0f42332ff..94a8f69af 100644 --- a/journal/2021-10-22.md +++ b/journal/2021-10-22.md @@ -13,7 +13,7 @@ - [[chogyam trungpa]] - *[[chögyam trungpa]]* - loved [[cutting through spiritual materialism]] - - forgot to choose my new book of his or [[shambala]] + - forgot to choose my new book of his or [[shambhala]] - [[matrix]] - [[xmpp]] - [[straw]] told me about [[dino]] diff --git a/shambala.md b/shambala.md new file mode 100644 index 000000000..a94f89e26 --- /dev/null +++ b/shambala.md @@ -0,0 +1,4 @@ +# shambala + +- [[pull]] [[shambhala]] + diff --git a/shambhala.md b/shambhala.md new file mode 100644 index 000000000..d868ae4c1 --- /dev/null +++ b/shambhala.md @@ -0,0 +1,4 @@ +# shambhala + +- [[pull]] [[the sacred path of the warrior]] + diff --git a/shambhala: the sacred path of the warrior.md b/shambhala: the sacred path of the warrior.md new file mode 100644 index 000000000..9bc934656 --- /dev/null +++ b/shambhala: the sacred path of the warrior.md @@ -0,0 +1,7 @@ +# shambhala: the sacred path of the warrior + +- a [[book]] + - by [[chögyam trungpa]] (author), [[carolyn rose gimian]] (editor) + - [[amazon]] https://www.amazon.de/-/en/Carolyn-Rose-Gimian/dp/1590304519/ref=sr_1_1?dchild=1&keywords=warrior+shambhala&qid=1634932017&sr=8-1 + - + diff --git a/the sacred path of the warrior.md b/the sacred path of the warrior.md new file mode 100644 index 000000000..13332ad68 --- /dev/null +++ b/the sacred path of the warrior.md @@ -0,0 +1,4 @@ +# the sacred path of the warrior + +- [[pull]] [[shambhala: the sacred path of the warrior]] + From ff8f7a9ff31235aa1ded85f12d5ca7d4e72b08ee Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:51:08 +0200 Subject: [PATCH 10/12] Default commit message, part of an automated flow. --- shambhala buddhism.md | 6 ++++++ shambhala.md | 1 + shambhala: the sacred path of the warrior.md | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 shambhala buddhism.md diff --git a/shambhala buddhism.md b/shambhala buddhism.md new file mode 100644 index 000000000..5722dd218 --- /dev/null +++ b/shambhala buddhism.md @@ -0,0 +1,6 @@ +# shambhala buddhism + +- a [[teaching]] + - [[wp]]] https://en.wikipedia.org/wiki/Shambhala_Buddhism + - [[chögyam trungpa]] [[sakyon mipham]] + diff --git a/shambhala.md b/shambhala.md index d868ae4c1..888fab7db 100644 --- a/shambhala.md +++ b/shambhala.md @@ -1,4 +1,5 @@ # shambhala - [[pull]] [[the sacred path of the warrior]] +- [[pull]] [[shambhala buddhism]] diff --git a/shambhala: the sacred path of the warrior.md b/shambhala: the sacred path of the warrior.md index 9bc934656..8f160eead 100644 --- a/shambhala: the sacred path of the warrior.md +++ b/shambhala: the sacred path of the warrior.md @@ -3,5 +3,6 @@ - a [[book]] - by [[chögyam trungpa]] (author), [[carolyn rose gimian]] (editor) - [[amazon]] https://www.amazon.de/-/en/Carolyn-Rose-Gimian/dp/1590304519/ref=sr_1_1?dchild=1&keywords=warrior+shambhala&qid=1634932017&sr=8-1 - - + - [[goodreads]] https://www.goodreads.com/book/show/336248.Shambhala + - [[wp]] https://en.wikipedia.org/wiki/Shambhala:_The_Sacred_Path_of_the_Warrior From dbeeecd0c53428fb36e4d046461618535c6101c4 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:52:44 +0200 Subject: [PATCH 11/12] Default commit message, part of an automated flow. --- shambhala buddhism.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shambhala buddhism.md b/shambhala buddhism.md index 5722dd218..410fbc45b 100644 --- a/shambhala buddhism.md +++ b/shambhala buddhism.md @@ -1,6 +1,9 @@ # shambhala buddhism - a [[teaching]] + - [[subset]]/[[superset]] of [[buddhism]] + - I should [[write]] about this - [[wp]]] https://en.wikipedia.org/wiki/Shambhala_Buddhism - [[chögyam trungpa]] [[sakyon mipham]] + - I [[like]] it; might optimally represent me ([[researching]]) From c63942302e606a46665909e78e264bae5804f81f Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 22 Oct 2021 21:54:37 +0200 Subject: [PATCH 12/12] Default commit message, part of an automated flow. --- shambhala buddhism.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shambhala buddhism.md b/shambhala buddhism.md index 410fbc45b..a56b650bb 100644 --- a/shambhala buddhism.md +++ b/shambhala buddhism.md @@ -4,6 +4,10 @@ - [[subset]]/[[superset]] of [[buddhism]] - I should [[write]] about this - [[wp]]] https://en.wikipedia.org/wiki/Shambhala_Buddhism + - Since 2018, multiple reports of clergy sexual misconduct and power abuse by the Sakyong and some Shambhala leadership[2][3][4] have led to an institutional crisis - [[chögyam trungpa]] [[sakyon mipham]] - - I [[like]] it; might optimally represent me ([[researching]]) + - I [[like]] it; might optimally represent me in some ways ([[research]], might only be a significant subset)... although the power abuse and sexual misconduct accusations are very worrying. + - read [[cutting through spiritual materialism]] + - will read [[the sacred path of the warrior]] + - will read [[reports of misconduct]]