From 740dbec5ab3cc9c8e5f3ec97db9ea7a69f71039f Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 25 Apr 2022 16:51:38 +0200 Subject: [PATCH] feat: add franco history and nvim stuff --- Resources/dev/neovim.md | 13 ++++++++++++ Resources/history/spain/franco.md | 27 +++++++++++++++++++++++++ Resources/history/spain/valencia.md | 3 +++ Resources/psychology/maslows-pyramid.md | 0 4 files changed, 43 insertions(+) create mode 100644 Resources/history/spain/franco.md create mode 100644 Resources/history/spain/valencia.md create mode 100644 Resources/psychology/maslows-pyramid.md diff --git a/Resources/dev/neovim.md b/Resources/dev/neovim.md index 0da470f..13bb955 100644 --- a/Resources/dev/neovim.md +++ b/Resources/dev/neovim.md @@ -11,3 +11,16 @@ ```bash 42G ``` + +## Surround stuff (with the vim-surround plugin) + +**surround word** +```bash +viwS +``` + +## Change Multiple Occurrences of the same word + +```bash +*ciw n.n.n.n.n +``` diff --git a/Resources/history/spain/franco.md b/Resources/history/spain/franco.md new file mode 100644 index 0000000..762ba23 --- /dev/null +++ b/Resources/history/spain/franco.md @@ -0,0 +1,27 @@ +# Francisco Franco + +4 December 1892 – 20 November 1975 → 82 Years + +Dictator of Spain from 1939 to 1975. + +Born into military family rose through military ranks, becoming the youngest general in Spain at the age of 33. + +Two years later he became the director of a military academy. + +He was a royalist and deeply regretted the abolition of the monarchy in 1931. + +After a failed military coup in 1936 which lead to the Spanish Civil War he rose through the military ranks again, becoming head of state in 1939. + +Then he consolidated all political parties and turned the country in to a de facto dictatorship. Supported by the catholic church he dismantled a lot of womens rights policies th previous government enacted. + +During his reign, he created concentration camps, executed political opponents and made use of forced labor. This era was later called the white terror. + +This era lead to the death of 30 to 50 thousand deaths. + +In the second world war he supported the axis, Germany and Italy, seriously damaging his countries international standing. + +After the second world war the regime relaxed some of its hard line policies. Because of this and the regimes anti-communist position it garnered the support from the United Stated. + +During the cold-war era Franco lead his country to economic prosperity thanks to his technocratic and liberal economic policies. + +In his final years he restored the monarchy being succeeded by Juan Carlos, King of Spain, who led the spanish transition to democracy. diff --git a/Resources/history/spain/valencia.md b/Resources/history/spain/valencia.md new file mode 100644 index 0000000..9724047 --- /dev/null +++ b/Resources/history/spain/valencia.md @@ -0,0 +1,3 @@ +# History of Valencia + +The city was founded by a roman consul 138AD. diff --git a/Resources/psychology/maslows-pyramid.md b/Resources/psychology/maslows-pyramid.md new file mode 100644 index 0000000..e69de29