clean up remaining markdown files and merge conflicts

1 files changed, 0 insertions, 196 deletions

diff --git a/content/wiki/ios.md b/content/wiki/ios.md
deleted file mode 100644
index 0cce6b0..0000000
--- a/content/wiki/ios.md
+++ /dev/null
@@ -1,196 +0,0 @@
-+++
-title = "iOS"
-updated = 2024-03-13
-draft = false
-+++
-
-Related:
-
-- [Hardware](/wiki/hardware/)
-
-My primary mobile OS. Currently running iOS 17. This wiki page contains most of
-the apps I have used at one point or another across my different iPhones.
-
-[`*`] = My favorites
-
-## Configuration
-
-### Display
-
-- Light Mode
-    - 10:00 to 16:00
-- Dark Mode
-    - 16:00 to 10:00
-
-### Focus Modes
-
-- Personal Focus
-    - 06:00 to 21:00
-    - Allow Notifications From:
-        - Alarms
-        - Calendar
-        - Contacts (1 person)
-        - Messages
-        - Phone
-        - Reminders
-        - Signal
-        - UniFi Protect
-- Sleep Focus
-    - 21:00 to 06:00
-    - Allow Notifications From:
-        - Alarms
-        - Contacts (1 person)
-        - Reminders
-        - Signal
-
-### Privacy & Security
-
-I generally follow the [principle of least
-privilege](https://en.wikipedia.org/wiki/Principle_of_least_privilege) by only
-permitting the bare minimum privileges and revoking as soon as they are no
-longer required.
-
-Here's the baseline I start with:
-
-- Disable:
-    - Analytics & Improvements
-    - Apple Advertising
-    - Apple ID > Sign-In & Security > Two-Factor Authentication
-    - Location Services > System Services > Product Improvement
-    - Tracking > Allow Apps to Request to Track
-    - Safari > Advanced > Privacy Preserving Ad Measurement
-- Enable:
-    - Apple ID > iCloud > Advanced Data Protection
-    - Apple ID > Personal Information > Communication Preferences
-    - App Privacy Report
-    - Location Services only for Camera, Find My, UDisc, & WiFiman (`While
-      Using`)
-    - Safari > Prevent Cross-Site Tracking
-    - Safari > Hide IP Address
-    - Safari > Advanced > Advanced Tracking and Fingerprinting Protection
-
-## Native Apps
-
-### Business
-
-- [Element](https://apps.apple.com/us/app/element-messenger/id1083446067) - A
-  cross-platform messenger, based on Matrix
-- [LinkedIn](https://apps.apple.com/us/app/linkedin-network-job-finder/id288429040) -
-  One of the only social media apps I use
-
-### Developer Tools
-
-- [Harbour](https://testflight.apple.com/join/F2vK7xo4) - Easily manage your
-  Portainer service
-- [iSH](https://apps.apple.com/us/app/ish-shell/id1436902243) - A local shell
-  with SSH functionality
-
-### Entertainment
-
-- [Plex](https://apps.apple.com/us/app/plex-watch-live-tv-and-movies/id383457673) -
-  A client for the Plex Media Server
-- [Steam](https://apps.apple.com/us/app/steam-mobile/id495369748) - The top
-  gaming marketplace for computers
-
-### Lifestyle
-
-- [Home](https://apps.apple.com/us/app/home/id1110145103) [`*`] - Apple homekit
-  powered smart home manager
-- [Hue](https://apps.apple.com/us/app/philips-hue/id1055281310) - Philips Hue
-  smart home manager
-- [iRobot](https://apps.apple.com/us/app/irobot-home/id1012014442) - Manage
-  iRobot Roomba devices
-- [UniFi Protect](https://apps.apple.com/us/app/unifi-protect/id1392492235) -
-  View and manage most UniFi Protect cameras and settings
-
-### Music
- 
-- [Apple Music](https://apps.apple.com/us/app/apple-music/id1108187390) [`*`] -
-  Apple's native music streaming app
-- [Plexamp](https://apps.apple.com/us/app/plexamp/id1500797510) [`*`] -
-  Top-notch music app for your Plex Media Server, with a neural network that
-  provides excellent radio/shuffle suggestions
-
-### News
-
-- [NetNewsWire](https://apps.apple.com/us/app/netnewswire-rss-reader/id1480640210) -
-  A free and open source RSS reader for Mac, iPhone, and iPad
-
-### Photo & Video
-
-- [Aislingeach](https://testflight.apple.com/join/Q6WyyEpS) - A quick way to
-  generate and rate images from the Stable Horde
-- [Unsplash](https://apps.apple.com/us/app/unsplash/id1290631746) - Premium
-  images, mostly free
-
-### Productivity
-
-- [beorg](https://apps.apple.com/us/app/beorg-to-do-list-agenda/id1238649962) -
-  An org-mode editor, outline, and scheduler with paid extensions
-- [Bitwarden](https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744)
-  [`*`] - An open source password manager
-- [Cryptomator](https://apps.apple.com/us/app/cryptomator/id1560822163) - A
-  cross-platform encryption program
-- [Obsidian](https://apps.apple.com/us/app/obsidian-connected-notes/id1557175442)
-  [`*`] - A nice Markdown-based editor based on a "vault" structure. Offers a
-  paid sync solution and community extensions
-- [Strongbox](https://apps.apple.com/us/app/strongbox-password-manager/id897283731) -
-  Keepass password manager for iOS & macOS
-- [UniFi Network](https://apps.apple.com/us/app/unifi/id1057750338) - View and
-  manage most UniFi Network settings
-
-### Safari Extensions
-
-- [AdGuard](https://apps.apple.com/us/app/adguard-adblock-privacy/id1047223162) -
-  Ad blocker
-- [Dark
-  Reader](https://apps.apple.com/us/app/dark-reader-for-safari/id1438243180) -
-  Dark mode for all the sites
-- [PiPifier](https://apps.apple.com/us/app/pipifier/id1234771095) - Force videos
-  to support PiP
-- [Privacy
-  Redirect](https://apps.apple.com/us/app/privacy-redirect/id1578144015) -
-  Redirect select websites to others, usually to privacy-focused alternatives
-
-### Social Networking
-
-- [MultiTab T](https://apps.apple.com/us/app/multitab-for-tumblr/id1071533778)
-  [`*`] - A gallery-based Tumblr client with some unique features, such as tab
-  history and sync
-- [Signal](https://apps.apple.com/us/app/signal-private-messenger/id874139669)
-  [`*`] - A simple, powerful, and secure messenger
-- [Three Cheers](https://testflight.apple.com/join/mpVk1qIy) - A client for
-  Tildes.net with a design focus that matches the intent of Tildes
-- [Voyager](https://apps.apple.com/us/app/voyager-for-lemmy/id6451429762) - A
-  Lemmy client
-
-### Sports
-
-- [Apple Sports](https://apps.apple.com/us/app/apple-sports/id6446788829) -
-  Apple's new sports app - lacks notifications and live events
-- [UDisc](https://apps.apple.com/us/app/udisc-disc-golf/id1072228953) - Disc
-  golf course maps, score cards, and more
-
-### Utilities
-
-- [Backblaze](https://apps.apple.com/us/app/backblaze/id628638330) - Quickly
-  view and manage Backblaze b2 cloud storage
-- [Mullvad VPN](https://apps.apple.com/us/app/mullvad-vpn/id1488466513) [`*`] -
-  A private VPN service
-- [OTP Auth](https://apps.apple.com/us/app/otp-auth/id659877384) [`*`] - A
-  minimalistic OTP app with support for biometrics, custom icons, import/export,
-  and iCloud sync
-- [Plex Dash](https://apps.apple.com/us/app/plex-dash/id1500797677) - Stats
-  about your Plex Media Server
-- [Safari](https://apps.apple.com/us/app/safari/id1146562112) - iOS default
-  browser
-- [Unifi WiFiman](https://apps.apple.com/us/app/ubiquiti-wifiman/id1385561119) -
-  Create visual layouts of WiFi strength and save heat maps to your phone
-
-## Web Apps & Shortcuts
-
-- [Brutalist Report](https://brutalist.report/) - Minimal news aggregator
-- [_Cyber.Report](https://cyber.report/) - Cybersecurity news aggregator
-- [Hacker News](https://news.ycombinator.com/) - Mostly technical news
-- [NextDNS](https://nextdns.io/) - NextDNS statistics dashboard
-- [Readspike](https://readspike.com/) - Minimal news aggregator