flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 15:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:flancian/garden

Browse Source
This commit is contained in:
Flancian
2021-07-09 22:08:36 +02:00
parent 6bd130dbd6 4677d9bcb0
commit a960192509
6 changed files with 314 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.obsidian/workspace
Vendored
+258 -55
View File
@@ -4,46 +4,18 @@
"type": "split",
"children": [
{
"id": "11cbe105accfc77d",
"type": "split",
"children": [
{
"id": "63f809452cff7c43",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-05.md",
"mode": "source"
}
}
},
{
"id": "7050f5d245741dcd",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "chelsea hotel.md",
"mode": "source"
}
}
},
{
"id": "6bf5733da4a61bdc",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source"
}
}
"id": "dfca63b6438bb043",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "book.md",
"mode": "source"
}
],
"direction": "horizontal"
}
},
{
<<<<<<< HEAD
"id": "102fe6accb268a77",
"type": "split",
"children": [
@@ -79,61 +51,248 @@
"mode": "source"
}
}
}
],
"direction": "horizontal"
},
{
"id": "1f94d8e6aef3ebfe",
=======
"id": "daf2cbd4f904097f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-04.md",
"mode": "source"
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
}
}
},
{
"id": "8f8a26d73243fcd4",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "agora social media integration.md",
"mode": "source"
}
}
},
{
"id": "a9652862b141b584",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-04.md",
"mode": "source"
}
}
},
{
"id": "e35c7985c4116762",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "deta.md",
"mode": "source"
}
}
},
{
"id": "bd5278bb18646798",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "web native.md",
"mode": "source"
}
}
},
{
"id": "54b3b17b599c494f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "cloud computer.md",
"mode": "source"
}
}
},
{
"id": "253742e9df381de2",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-04.md",
"mode": "source"
}
}
},
{
"id": "e37fe7256c0fa8db",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "wikipedia.md",
"mode": "source"
}
}
},
{
"id": "ffee18e4b059aea4",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "2021-07-07.md",
"mode": "source"
}
}
},
{
"id": "dc48b62f3dfe1e38",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "2021-07-09.md",
=======
"file": "2021-07-06.md",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"mode": "source"
}
}
},
{
<<<<<<< HEAD
"id": "58c67cff51ac0208",
=======
"id": "339f9c924bf4e2fb",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "luciana.md",
=======
"file": "2021-07-08.md",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"mode": "source"
}
}
},
{
<<<<<<< HEAD
"id": "55e7708b4a1b5ace",
=======
"id": "c74f05c0266decce",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "moondog.md",
=======
"file": "brian mock.md",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"mode": "source"
}
}
},
{
<<<<<<< HEAD
"id": "4c6ff7bb411b67a6",
=======
"id": "e91d03c32f5dc547",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "what about human rights.md",
=======
"file": "agora bot.md",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"mode": "source"
}
}
},
{
<<<<<<< HEAD
"id": "c9cab91c10439f0b",
=======
"id": "07ab9c32e6c5777d",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "human rights.md",
=======
"file": "would you agree.md",
"mode": "source"
}
}
},
{
"id": "471e8d5ffc499afd",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "the future of note taking.md",
"mode": "source"
}
}
},
{
"id": "59db8db05b79c3fc",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "future of note taking.md",
"mode": "source"
}
}
},
{
"id": "7fa69ee82c4e4e81",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "lightning talks.md",
"mode": "source"
}
}
},
{
"id": "a2ef93a32f0a482b",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "tienson qin.md",
"mode": "source"
}
}
},
{
"id": "a153b20f56786261",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "logseq.md",
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
"mode": "source"
}
}
@@ -172,14 +331,6 @@
}
}
},
{
"id": "8af6596dc98ffa6b",
"type": "leaf",
"state": {
"type": "starred",
"state": {}
}
},
{
"id": "aa0f3e910050164c",
"type": "leaf",
@@ -205,9 +356,10 @@
"type": "tabs",
"children": [
{
"id": "30e969c9166f9896",
"id": "eaa7f99b4cf5444a",
"type": "leaf",
"state": {
<<<<<<< HEAD
"type": "backlink",
"state": {
"file": "conflict-files-obsidian-git.md",
@@ -219,26 +371,63 @@
"backlinkCollapsed": false,
"unlinkedCollapsed": false
}
=======
"type": "empty",
"state": {}
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
}
},
{
"id": "a62fc60423ac06f4",
"id": "49a0eb72df05c98e",
"type": "leaf",
"state": {
<<<<<<< HEAD
"type": "outline",
"state": {
"file": "conflict-files-obsidian-git.md"
}
=======
"type": "empty",
"state": {}
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
}
}
],
"currentTab": 1
]
},
{
"id": "9852b3b70c9ace3c",
"type": "tabs",
"children": [
{
"id": "ba82168a0acbacba",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
}
]
},
{
"id": "297c54846b597552",
"type": "tabs",
"children": [
{
"id": "35550c211233c6a5",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
<<<<<<< HEAD
"active": "6bf5733da4a61bdc",
"lastOpenFiles": [
"conflict-files-obsidian-git.md",
@@ -251,5 +440,19 @@
"sundar pichai.md",
"argh.md",
"watching.md"
=======
"active": "c74f05c0266decce",
"lastOpenFiles": [
"brian mock.md",
"opening design.md",
"bmock.md",
"2021-07-08.md",
"2021-07-06.md",
"2021-07-07.md",
"agora bot.md",
"would you agree.md",
"conflict-files-obsidian-git.md",
"2021-07-04.md"
>>>>>>> 4677d9bcb0010ca2470f43b4dde0c58fc64b5d3c
]
}
2021-07-08.md
+1
View File
@@ -0,0 +1 @@
- [[bmock]]
bmock.md
+1 -2
View File
@@ -1,2 +1 @@
# Bmock
- [[pull]] [[brian mock]]
brian mock.md
+51
View File
@@ -0,0 +1,51 @@
- a [[person]]
- [[twitter]] https://twitter.com/bmock
- likes [[christopher alexander]]
- interested in [[sustainability]], [[utopias]] (and their dangers)
## [[2021-07-08]]
- greetings!
- dialing in from Iowa
- exploring the US
- spent seven months in Italy (Sorrento!)
- [[sorrento]]: [[building beauty]]
- about [[christopher alexander]]'s work, hands on building
- 50 fundamental transformation
- [[the nature of order]]
- fourth volume is more religious
- "breaks down god and then builds it back up"
- some solipsism in it though
- "I stuff"
- starts up in book one
- [[mirror of the self]]
- wants to build an objective definition of beauty (?)
- [[degrees of life]]
- [[gate maker]]
- [[bryan]]
- undergrad in architecture
- got a job building homes for the mega rich, didn't like it
- worked for smaller offices after that
- came back to [[iowa]]
- trying to figure out how to work remotely, would like to work 3-4h a day
- like also working with [[leather]], [[clay]]; ornamental building
- [[flancian]]
- interested in:
- [[flancia]]
- started as a [[utopia]]
- [[protopia]]
- [[agora]]
- what do you do about bad actors?
- what about people that want to take over? or want to own intellectual property
- [[bryan]]
- mad about how the world is, but still hopeful
- have tried a few times to get people together
- dream is now to build a prototype for an ornamental building
- finding people that want similar living arrangements
- [[twitter]]
- village life
- [[bolo bolo]]
- [[sutty]]
- [[patterning]] == [[reading alexander]]
- [[building beauty]]
- [[opening design]]
conflict-files-obsidian-git.md
+1 -1
View File
@@ -1,3 +1,3 @@
# Conflict files
Please resolve them and commit per command (This file will be deleted before the commit).
- Not a file: .obsidian-git-data
- Not a file: .obsidian/workspace
opening design.md
+2
View File
@@ -0,0 +1,2 @@
- an [[architectural studio]]
- [[go]] http://openingdesign.com/