Some additions to favorite apps.

crash_course_socialism.md

@@ -222,7 +222,7 @@ Both feudalism and slavery were thought to be highly stable systems, and even th
 
 The reason why most people are reticent to read anti-capitalist literature, and discouraged from participating in the class struggle through unionism and political movements, is due to **capitalist indoctrination**, capitalist media concentration, and police repression. In Marxist philosophy, [cultural hegemony](https://en.wikipedia.org/wiki/Cultural_hegemony) is the domination of a culturally diverse society by the ruling class, who manipulate the culture of that society (the beliefs, explanations, perceptions, values, and mores) so that their imposed, ruling-class world view becomes the accepted cultural norm; the universally valid dominant ideology, which justifies the social, political, and economic status quo as natural and inevitable, perpetual and beneficial for everyone, rather than as artificial social constructs that benefit only the ruling class.
 
-The police in Western bourgeois democracies are the **domestic enforcement arm of the capitalists**, much like the military is the external imperialist enforcement arm. They are the hired goons of the elite interests of their given city, protecting their factories and workplaces from unionization and worker control, oppressing the poor and homeless, and keeping them separated from other workers by intentional impoverishment via legal means. Cops have [a long history of killing workers and crushing unions](https://github.com/dessalines/essays/blob/master/us_atrocities.md#workers-and-the-poor).  
+The police in Western bourgeois democracies are the **domestic enforcement arm of the capitalists**, much like the military is the external imperialist enforcement arm. They are the hired goons of the elite interests of their given city, protecting their factories and workplaces from unionization and worker control, oppressing the poor and homeless, and keeping them separated from other workers by intentional impoverishment via legal means. Cops have [a long history of killing workers and crushing unions](https://github.com/dessalines/essays/blob/master/us_atrocities.md#workers-and-the-poor).
 
 ## The State, and Revolution
 

favorite_apps_and_services.md

@@ -1,84 +1,60 @@
 # Favorite apps and services
-
-
-
 ## Goals
-
 - Privacy conscious, [end-to-end encrypted (E2EE)](https://en.wikipedia.org/wiki/End-to-end_encryption).
 - Decentralized, **no reliance** on cloud providers like Google, Microsoft, Apple, Spotify, Netflix, etc. 
-- Self-hosted and self-reliant, simple files preferred.
+- Self-hosted and self-reliant, simple files preferred over running services.
 - Make sure no sites / services are US based.
 
-
-
 ## Media
-
 - Download all music / movies locally, using torrents behind a VPN. ([Don't use Tor for torrenting, it won't work and will just put unnecessary load to the Tor network](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea))
   - Use [AirVPN](https://airvpn.org/), [Mullvad](https://mullvad.net/), [NordVPN](https://nordvpn.com/), [ProtonVPN](https://protonvpn.com/) 
   - Use [qbittorrent](https://www.qbittorrent.org/), [deluge](https://www.deluge-torrent.org/), or [transmission](https://transmissionbt.com/) for a torrent client.
 - Use [MPV](https://mpv.io/) or [VLC](https://www.videolan.org/vlc/download-windows.html), open source media players to play media.
-- Use [emby](https://emby.media/) for streaming to other devices. 
+- Use [jellyfin](https://github.com/jellyfin/jellyfin) or sftp for streaming to other devices. 
 
 
-
-## Documents
-
+## Documents and Coding
 - Write all documents and notes in markdown.
-  - Use [typora](https://typora.io/), [Mark Text](https://marktext.github.io/website/), or [VS Code](https://github.com/Microsoft/vscode) as markdown and code editors.
+  - Use [typora](https://typora.io/), [Mark Text](https://marktext.github.io/website/), or vim as markdown editors / notes. 
+  - Use vim with  [vimrc](https://github.com/amix/vimrc) and [Youcompleteme](https://github.com/Valloric/YouCompleteMe) for code. 
 - Spreadsheets in [Libreoffice](https://www.libreoffice.org/).
 - Install [Syncthing](https://syncthing.net/), and put all your documents in a synced folder. 
 
-## Tasks
-
+## Tasks / Todos
 - Use a [todo.txt](http://todotxt.org/) file for a personal task list, synced with syncthing.
   - [QTodoTxt](http://qtodotxt.org/) as a desktop client, [Simpletask Cloudless](https://play.google.com/store/apps/details?id=nl.mpcjanssen.simpletask&hl=en_US) for Android.
 - For shared task lists, use [Etherpad](http://etherpad.org/).
-
-
+- No good solution yet for calendars, really wish there were good file-based calendar apps.
 
 ## Collaboration
-
 - Use [Etherpad](http://etherpad.org/).
 
-
-
 ## Browsing
-
 - Use Firefox or Tor Browser, with the addons:
   - [uBlock Origin](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/)
-  - [HTTPS Everywhere](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere)
   - [Privacy Badger](https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17)
   - [Facebook Container](https://addons.mozilla.org/en-US/firefox/addon/facebook-container) - As suggested, this keeps all Facebook stuff in it's own Firefox container.
   - [Google Container](https://addons.mozilla.org/en-US/firefox/addon/google-container/) - The above, but for Google.
-- [Startpage](https://www.startpage.com/), [Searx](https://searx.me/) ([onion service](http://searchb5a7tmimez.onion/)), or [DuckDuckGo](https://duckduckgo.com) ([onion service](https://3g2upl4pq6kufc4m.onion/)) as a search engine
+- [Startpage](https://www.startpage.com/), [Searx](https://searx.me/) ([onion service](http://searchb5a7tmimez.onion/)), as a search engine
 - If using Tor, use onion services if possible instead of clearnet.
 
 
 ## Passwords
-
-- Use [KeePassXC](https://keepassxc.org/).
+- Use [KeePassXC](https://keepassxc.org/). 
   - Install the Firefox KeePassXC plugin.
   - Use a long master pass phrase, with at least 10 words. 
 - Sync your password file everywhere you need using syncthing.
 
-
-
 ## Chat
-
-- Use [Signal](https://www.signal.org/) or Matrix / [Riot](https://about.riot.im/).
+- Use Matrix /  [Riot](https://about.riot.im/), or [Signal](https://www.signal.org/). 
 - Use [Thunderbird](https://www.thunderbird.net/en-US/) for email, e2ee with pgp if possible.
 
-
-
 ## Social Media
-
-- [Mastodon](https://mastodon.social/), [GNU Social](https://gnu.io/social/), or [diaspora*](https://diasporafoundation.org/)
-
-
+- Twitter alternative : [Mastodon](https://mastodon.social/)
+- Facebook : [Friendica](https://friendi.ca/)
+- Reddit : [PostMill](https://gitlab.com/edgyemma/Postmill), or [Lobste.rs](https://github.com/lobsters/lobsters)
+- Medium : [Plume](https://github.com/Plume-org/Plume)
 
 ## Operating system
-
 - Use Linux, preferably Arch Linux or a variant.
 
-
-

socialism_faq.md

@@ -537,7 +537,7 @@
 - https://www.theguardian.com/commentisfree/2019/jan/31/kamala-harris-laughed-jailing-parents-truancy
 
 ### Why don't socialists support a UBI / Universal Basic income?
-- [Would basic income fix our problems? In the game of monopoly, whenever you pass go, you collect a basic income!](https://www.reddit.com/r/socialism/comments/8p097l/i_just_realized_that_monopoly_has_integrated/)
+- [Would basic income fix our problems?](https://www.reddit.com/r/socialism/comments/8p097l/i_just_realized_that_monopoly_has_integrated/)
 - [A Marxist critique of Basic income.](https://www.reddit.com/r/communism/comments/8wizh9/marxist_critiques_on_the_universal_basic_income/)
 - [Why basic income is a bad idea - Paul Cockshott](https://www.reddit.com/r/socialism/comments/9lj3bh/why_basic_income_is_a_bad_idea/), [2](https://www.youtube.com/watch?v=QGBQwZsp3T0), [3](https://www.reddit.com/r/socialism/comments/9li3gj/what_do_socialists_think_about_a_universal_basic/)
 - [What would happen to workers in poorer countries?](https://www.reddit.com/r/communism/comments/5iznp8/opinions_on_universal_basic_income/)