Skip to content

Commit

Permalink
add more short treks
Browse files Browse the repository at this point in the history
  • Loading branch information
Am3ra committed Jun 8, 2021
1 parent 0f02e9d commit 73d3c03
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 10 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ gem "webrick", "~> 1.7"
gem "nokogiri"
gem "jekyll-feed"
gem "liquid_reading_time"
gem 'jgd'
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ GEM
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jgd (1.12)
jekyll (>= 1.5.1)
trollop (= 2.9.9)
kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -73,6 +76,7 @@ GEM
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
trollop (2.9.9)
unicode-display_width (1.7.0)
webrick (1.7.0)

Expand All @@ -83,6 +87,7 @@ DEPENDENCIES
jekyll (~> 4.0)
jekyll-feed
jekyll-last-modified-at!
jgd
liquid_reading_time
nokogiri
webrick (~> 1.7)
Expand Down
2 changes: 1 addition & 1 deletion _includes/notes_graph.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions _notes/Guide-to-being-human-folder/a-guide-to-being-human.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ Or, things I wish someone told me.
## Contents of this document

- [A guide to being human](#a-guide-to-being-human)
- [Contents of this document](#contents-of-this-document)
- [Contents of the Guide](#contents-of-the-guide)
- [To do:](#to-do)
- [Contents of this document](#contents-of-this-document)
- [Contents of the Guide](#contents-of-the-guide)
- [To do:](#to-do)

## Contents of the Guide

I want to talk about the following things:

- [ ] Happiness
- [ ] [[Happiness]]
- [ ] [[Tetrafarmakos]]
- [ ] Enjoying life
- [ ] Agency
Expand Down Expand Up @@ -70,7 +70,7 @@ I want to talk about the following things:
- A series of short essays?

[//begin]: # "Autogenerated link references for markdown compatibility"
[personal philosophy]: ../personal-philosophy "Personal Philosophy"
[personal philosophy]: ../personal-philosophy "personal-philosophy"
[Tetrafarmakos]: tetrafarmakos "Tetrafarmakos"
[todo]: ../todo "Todo"
[todo]: ../todo "todo"
[//end]: # "Autogenerated link references"
23 changes: 20 additions & 3 deletions _notes/Guide-to-being-human-folder/tetrafarmakos.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
---
---

# Tetrafarmakos

[[todo]]
[[seedling]]

- [Introduction](#introduction)
- [Rule 1: Don't Fear God](#rule-1-dont-fear-god)
- [Rule 2: Don't Worry About Death](#rule-2-dont-worry-about-death)
- [Rule 3: What is good is easy to get](#rule-3-what-is-good-is-easy-to-get)
- [Rule 4: What is terrible is easy to endure](#rule-4-what-is-terrible-is-easy-to-endure)
## Introduction

[[Diogenes Laërtius]]

## Rule 1: Don't Fear God

## Rule 2: Don't Worry About Death

## Rule 3: What is good is easy to get

## Rule 4: What is terrible is easy to endure

[//begin]: # "Autogenerated link references for markdown compatibility"
[todo]: ../todo "Todo"
[todo]: ../todo "todo"
[seedling]: ../seedling "seedling"
[//end]: # "Autogenerated link references"
12 changes: 12 additions & 0 deletions _notes/diogenes-laërtius.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
---

[[seedling]]
[[todo]]

Diogenes Laërtius, one of my favorite philosophers, biographer, and main source of information of greek philosphy.

[//begin]: # "Autogenerated link references for markdown compatibility"
[seedling]: seedling "seedling"
[todo]: todo "todo"
[//end]: # "Autogenerated link references"
1 change: 1 addition & 0 deletions _notes/fire.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
title: F.I.R.E
---


Expand Down
36 changes: 36 additions & 0 deletions _notes/happiness.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
---


[[seedling]]

[[short trek]]

One aspect of life that should not be under-estimated is a focus on happiness.

Quite frankly, one of the bases of my [[personal philosophy]], and topics such as [[purpose of society]] is a maximization of personal pleasure.

Some basic factors are [[personal finances]] and [[personal health]], as well as social factors.

If you're looking to increase your own happiness, [[tetrafarmakos]] might be a good place to start.

## Financial aspect of happiness

As the saying goes,

> Money can't buy happiness.
Except for the fact that it kind of can. Poverty destroys health, both mental and physical, and increases personal risk, all things which can be detrimental for happiness.

On the other hand, some studies have found a correlation between personal income and happiness, up to a certain point. What this means is that although money can't buy infinite happiness, it *can* buy a base amount, and can reduce a lot of unhappiness

## Health aspect of happiness

## Social aspect of happiness

Something overlooked in increasing personal happiness, is increasing social, or group happiness. Often, increasing the happiness of those around you, increases your own personal happiness.

[//begin]: # "Autogenerated link references for markdown compatibility"
[seedling]: seedling "seedling"
[tetrafarmakos]: Guide-to-being-human-folder/tetrafarmakos "Tetrafarmakos"
[//end]: # "Autogenerated link references"
3 changes: 3 additions & 0 deletions _notes/you-re-a-hypocrite-but-so-am-i.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ title: You're a hypocrite, but so am I

- [What is language?](#what-is-language)
- [Words as labels for concepts](#words-as-labels-for-concepts)
- [Platonic Ideals (Explain relevance)](#platonic-ideals-explain-relevance)

Why is the language you speak the way it is? Why is capitalism the norm? Why is saying "Amiges" or "Amigxs" so controversial in Spanish?

Expand Down Expand Up @@ -44,6 +45,8 @@ It looks a little like this:
<img src="{{site.baseurl}}" alt="An illustration showing how a word can map to different concepts"/>


## Platonic Ideals (Explain relevance)

[//begin]: # "Autogenerated link references for markdown compatibility"
[seedling]: seedling "seedling"
[//end]: # "Autogenerated link references"

0 comments on commit 73d3c03

Please sign in to comment.