From c9a3d1b81a98871f8b3cf392577e96505e07acd9 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 7 Nov 2021 19:19:08 +0100 Subject: [PATCH 1/5] Default commit message, part of an automated flow. --- cannabis in buddhism.md | 6 ++++++ journal/2021-11-07.md | 2 +- la censura de buddha.md | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 cannabis in buddhism.md diff --git a/cannabis in buddhism.md b/cannabis in buddhism.md new file mode 100644 index 000000000..90bc0d8bc --- /dev/null +++ b/cannabis in buddhism.md @@ -0,0 +1,6 @@ +# cannabis in buddhism + +- [[wp]] https://en.wikipedia.org/wiki/Cannabis_and_religion#Buddhism + - interesting, I thought [[cannabis]] would conflict with the [[paramitas]], but apparently most [[buddhist]] traditions are open minded about it? + - the [[dalai lama]] accepts [[medical marijuana]] + diff --git a/journal/2021-11-07.md b/journal/2021-11-07.md index af42edbe4..969625d07 100644 --- a/journal/2021-11-07.md +++ b/journal/2021-11-07.md @@ -6,5 +6,5 @@ - [[push]] [[dinner]] - [[tortilla de papas]] - [[la censura de buddha]] -======= - [[short story]] +- [[cannabis in buddhism]] diff --git a/la censura de buddha.md b/la censura de buddha.md index b21079383..7f31948a2 100644 --- a/la censura de buddha.md +++ b/la censura de buddha.md @@ -4,5 +4,4 @@ Cuál es la censura de Buddha? A veces me pregunto sobre ella; [[Shakyamuni Buddha]], [[Siddharta Gautama]] no escribió (como Sócrates), y también como en el caso del heleno otros escribieron sobre él. Pero mientras que [[Platón]] fue contemporáneo de [[Sócrates]] hay una tradición de preservación oral de más de tres siglos que media entre Gautama y sus lectores y discípulos futuros. -Qué discursos de Buddha se perdieron? Parece improbable que el número sea cero. Qué historias fueron censuradas por bikkhus opinionados? Qué historias fueron coartadas por una muerte inesperada? - +Qué discursos de Buddha se perdieron? Parece improbable que el número sea cero. Qué historias fueron censuradas por bikkhus opinionados? Qué historias fueron coartadas por una muerte inesperada? \ No newline at end of file From b8b5afd1b4084d31bb3225fd2c75ff2807593ee7 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 7 Nov 2021 19:21:31 +0100 Subject: [PATCH 2/5] Default commit message, part of an automated flow. --- chores.md | 5 +++++ clean the kitchen.md | 4 ++++ journal/2021-11-07.md | 7 +++---- tasks.md | 6 ++++++ 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 chores.md create mode 100644 clean the kitchen.md create mode 100644 tasks.md diff --git a/chores.md b/chores.md new file mode 100644 index 000000000..b3d284b52 --- /dev/null +++ b/chores.md @@ -0,0 +1,5 @@ +# chores + +- Things that are [[maintenance]] and can't be automated. +- Pushing entropy back; [[cleaning]], although cleaning can be fun. + diff --git a/clean the kitchen.md b/clean the kitchen.md new file mode 100644 index 000000000..5d80dffb1 --- /dev/null +++ b/clean the kitchen.md @@ -0,0 +1,4 @@ +# clean the kitchen + +- Cleaning the kitchen is one of my [[tasks]] in our household, and I try to enjoy it. + diff --git a/journal/2021-11-07.md b/journal/2021-11-07.md index e391c3dfe..8b8413049 100644 --- a/journal/2021-11-07.md +++ b/journal/2021-11-07.md @@ -9,12 +9,10 @@ - [[will]] - [[loas a buda]] - [[la censura de buddha]] -<<<<<<< HEAD - [[short story]] -- [[cannabis in buddhism]] -======= - [[short story]] or [[essay]]? - [[buddha]] or [[buda]] == [[en]] or [[es]] +- [[cannabis in buddhism]] - [[flancia]] - [[revolution]] - [[push]] [[virality]] @@ -28,4 +26,5 @@ - improve [[user pages]]: they are really bare now - fix tweet pulling, it seems broken? - oh, perhaps I disabled it for unbreaking org mode pages and I forgot? ->>>>>>> d201f4187567fa9d89b8e70a1686c8d4e4746c3a +- [[push]] [[do]] + - [[clean the kitchen]] diff --git a/tasks.md b/tasks.md new file mode 100644 index 000000000..dc7e80ab3 --- /dev/null +++ b/tasks.md @@ -0,0 +1,6 @@ +# tasks + +- [[pull]] [[do]] [[later]] +- [[pull]] [[agora plan]] +- [[pull]] [[chores]] + From 56dd2ec2dcf0d6f708ebdf268a111b2e391f2213 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 7 Nov 2021 19:22:46 +0100 Subject: [PATCH 3/5] Default commit message, part of an automated flow. --- journal/2021-11-07.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/journal/2021-11-07.md b/journal/2021-11-07.md index 8b8413049..5913e93db 100644 --- a/journal/2021-11-07.md +++ b/journal/2021-11-07.md @@ -26,5 +26,9 @@ - improve [[user pages]]: they are really bare now - fix tweet pulling, it seems broken? - oh, perhaps I disabled it for unbreaking org mode pages and I forgot? -- [[push]] [[do]] + - [[uprank]] [[autopush]] + - in particular over [[autopull]], which seems less critical currently? + - except perhaps for [[lists]], which should auto pull items of the right [[class]]. + +- [[push]] [[tasks]] - [[clean the kitchen]] From f8a165124e55cd510b3d5bcad5093026c6a08ae3 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 7 Nov 2021 19:55:38 +0100 Subject: [PATCH 4/5] Default commit message, part of an automated flow. --- journal/2021-11-07.md | 4 ++-- lady burup.md | 6 +++++- ocell.md | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/journal/2021-11-07.md b/journal/2021-11-07.md index 5913e93db..8e9ef37d2 100644 --- a/journal/2021-11-07.md +++ b/journal/2021-11-07.md @@ -28,7 +28,7 @@ - oh, perhaps I disabled it for unbreaking org mode pages and I forgot? - [[uprank]] [[autopush]] - in particular over [[autopull]], which seems less critical currently? - - except perhaps for [[lists]], which should auto pull items of the right [[class]]. - + - except perhaps for [[lists]], which should auto pull items of the right [[category]]. - [[push]] [[tasks]] - [[clean the kitchen]] +- [[ocell]] == [[lady burup]] diff --git a/lady burup.md b/lady burup.md index b1f6edf31..aac23c6ec 100644 --- a/lady burup.md +++ b/lady burup.md @@ -1 +1,5 @@ -- [[pull]] [[ocell]] \ No newline at end of file + +- a [[cat]]. + - I [[love]] [[them]]. + - [[pull]] [[ocell]] + diff --git a/ocell.md b/ocell.md index b264a2b2e..178ae023a 100644 --- a/ocell.md +++ b/ocell.md @@ -2,11 +2,13 @@ - a [[cat]] - [[friend]] + - I [[love]] them. - She lives with us: https://twitter.com/flancian/status/1325024046346539008/photo/1 - A Spanish shelter cat. We adopted her when she was a bit over a year old. - We picked her up in Brugg on [[2020-11-07]]. - Technically her name is masculine (it means "bird" in Catalan) but I don't think she cares about grammatical gender. - - Also known as [[lady burup]]. + - [[pull]] [[lady burup]]. + - a.k.a. - [[slides]] https://docs.google.com/presentation/d/1RUXIvwPQyy1_7ujltbT7NEFYTePtl6zhSuXUBJb4oy0/edit#slide=id.p From 6fc93290232a7e9f03e274d04306cd78ff440f32 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 7 Nov 2021 19:55:50 +0100 Subject: [PATCH 5/5] Default commit message, part of an automated flow. --- lady burup.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lady burup.md b/lady burup.md index aac23c6ec..63ee43a05 100644 --- a/lady burup.md +++ b/lady burup.md @@ -1,5 +1,6 @@ - a [[cat]]. - - I [[love]] [[them]]. + - [[friend]]. + - I [[love]] [[them]]. - [[pull]] [[ocell]]