Merge remote-tracking branch 'origin/main'

Author: chiubaca

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "2025-08-23"
             }
+          },
+          {
+            "id": "421dd6f6e495725b",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       },
       {
         "id": "ae1c38a3a5401878",
@@ -193,10 +208,11 @@
       "obsidian-kanban:Create new board": false
     }
   },
-  "active": "8348e79006ab5d80",
+  "active": "421dd6f6e495725b",
   "lastOpenFiles": [
-    "permanent-notes/media-server.md",
     "fleeting-notes/2025-08-23.md",
+    "conflict-files-obsidian-git.md",
+    "permanent-notes/media-server.md",
     "permanent-notes/whats-installed-on-my-macbook.md",
     "permanent-notes/managing-your-self-learning.md",
     "permanent-notes/to-baby-calvin.md",
@@ -231,7 +247,6 @@
     "Clippings/supermacroneverthrow Type-Safe Errors for JS & TypeScript.md",
     "Clippings",
     "retrospectives/2025/04.md",
-    "retrospectives/2025/01-02-03.md",
     "planning/Face Wall Game.canvas",
     "planning/TikTok Filters.canvas",
     "to-learn",

conflict-files-obsidian-git.md

@@ -0,0 +1,17 @@
+# Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- [[permanent-notes/media-server]]
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```

permanent-notes/media-server.md

@@ -1,39 +1,39 @@
 ---
-title: Setting up my media server
+title: How I self-host my media server for a free Netflix experience
 publish_date: 2025-08-17
 last_updated: 2025-08-17
-description: A meaningful description for this note
+description: How I self-host my home media server
 status: live
 tags:
   - home-hacking
 ---
-Few notes on how I've setup my media server.
+
+Few notes on how I've setup my media server and achieve that Netflix experience.
 
 ## Server
 
- Repurposed my old MakeBook D laptop  and installed ubuntu Desktop 24. Thought it might be useful to have a GUI desktop for RDP or Desktop streaming. Turns out this is an absolute nightmare. I got it working, sort of, but I learnt using using RDP on Linux is nothing like on Windows. It has to create a completely new user session and its very cumbersome to set up a GUI desktop, Ubuntu GNOME desktop does not play nicely so you have to use xRDP instead. Its long, its not worth it. SSH is the main means of remote configurations
+Repurposed my old MakeBook D laptop and installed ubuntu Desktop 24. Thought it might be useful to have a GUI desktop for RDP or Desktop streaming. Turns out this is an absolute nightmare. I got it working, sort of, but I learnt using using RDP on Linux is nothing like on Windows. It has to create a completely new user session and its very cumbersome to set up a GUI desktop, Ubuntu GNOME desktop does not play nicely so you have to use xRDP instead. Its long, its not worth it. SSH is the main means of remote configurations
 
 ## Tailscale
 
 VPN which that-just-works™️.
 
-I have my MacBook Air , Matebook D and phone all the same tailnet, which acts my  secure VPN.
+I have my MacBook Air , Matebook D and phone all the same tailnet, which acts my secure VPN.
 
 ## Jellyfin
 
-I went down some wrong turns trying to install jellyfin on Ubuntu.  All you need to do its run:
+I went down some wrong turns trying to install jellyfin on Ubuntu. All you need to do its run:
 
 ```bash
 curl https://repo.jellyfin.org/install-debuntu.sh | sudo bash
 ```
 
 Don't use `apt` , don't use the the Ubuntu store. It will give you a messed up installation and I lost many hours to this.
 
-
 ## Torrenting
 
-installed [`qbittorrent-nox`](https://github.com/qbittorrent/qBittorrent/wiki/Running-qBittorrent-without-X-server-(WebUI-only,-systemd-service-set-up,-Ubuntu-15.04-or-newer)) which lets you run qbittorent in a headless mode, then connect to via web gui instead which means via tailscale I can remotely add magnet links and download my shows.
+installed [`qbittorrent-nox`](<https://github.com/qbittorrent/qBittorrent/wiki/Running-qBittorrent-without-X-server-(WebUI-only,-systemd-service-set-up,-Ubuntu-15.04-or-newer)>) which lets you run qbittorent in a headless mode, then connect to via web gui instead which means via tailscale I can remotely add magnet links and download my shows.
 
 ## Amazon Firestick
 
-These lil things can run a Jellyfin client out-the-box. It's able to detect the instance of Jellyfin running on my local network without the need for Tailscale. 
+These lil things can run a Jellyfin client out-the-box. It's able to detect the instance of Jellyfin running on my local network without the need for Tailscale.