diff --git a/content-org/sites.org b/content-org/sites.org index 7708221..bc302ff 100644 --- a/content-org/sites.org +++ b/content-org/sites.org @@ -112,7 +112,7 @@ - *Headphones:* Audio-Technica ATH-M50x - *Microphone:* Marantz Pro MPM-1000 - *Earbuds*: Sennheiser CX True Wireless - - *Keyboard:* Ducky One2 Mini + - *Keyboard:* Ducky One2 Mini and Cherry MX-Board 3.0 - *Mouse:* Cherry MW4500 (wireless, vertical mouse) *** Laptop 1: Lenovo ThinkPad E490 @@ -121,9 +121,9 @@ - *CPU:* Intel Core i5-8265 @ 1.6GHz - *GPU:* Intel UHD Graphics 620 - - *RAM:* 16GB + - *RAM:* 32GB - *Storage:* 500GB NVMe-SSD and 500GB SATA-SSD - - *OS:* Microsoft Windows 11 Professional, Fedora Workstation 35, Debian 11 Bullseye + - *OS:* Microsoft Windows 11 Professional and Fedora Workstation 36 (native and WSL2) - *Display*: 14" 1920x1080 *** Laptop 2: Lenovo Y50-70 @@ -134,7 +134,7 @@ - *GPU:* NVIDIA GeForce GTX 860M and Intel HD Graphics 4600 - *RAM:* 12GB - *Storage:* 500GB SATA-SSD - - *OS:* Microsoft Windows 10 Education + - *OS:* Microsoft Windows 10 Education, Debian 11 (WSL2) - *Display*: 15", 3840x2160 The battery in this thing is completely broken and the WiFi never worked with Linux and also only for a short period in Windows. Therefore I use it as a desktop PC. @@ -147,13 +147,13 @@ - *GPU:* Intel Xe Graphics G7 (80EUs) - *RAM:* 32GB - *Storage:* 500GB NVMe-SSD - - *OS:* Fedora Workstation 35 + - *OS:* Fedora Workstation 36 - *Display*: 14", 1920x1080 *** Other hardware - *Home server:* BananaPi M2 Ultra with a 2TB HDD - - *Smartphone:* Sony Xperia X (F5121) + - *Smartphone:* Apple iPhone 13 - *Tablet:* Samsung Galaxy Tab S4 (TM-830) - *Smart-/Sportswatch:* Garmin vívoactive 3 - *Printer/Scanner*: Lexmark MC2425 (Duplex-Colour-Laser) @@ -174,7 +174,7 @@ - *E-Mail client:* Sometimes [[https://wiki.gnome.org/Apps/Evolution][Evolution]], sometimes [[https://www.thunderbird.net][Thunderbird]], sometimes [[https://www.djcbsoftware.nl/code/mu/mu4e.html][mu4e]] (though I prefer mu4e) - *Planner:* Todoist (personal) )and [[https://orgmode.org/][org-mode]] (work) - *Read it later service*: Pocket - - *Text editor:* [[https://www.gnu.org/software/emacs/][Emacs]], sometimes [[https://code.visualstudio.com/][Visual Studio Code]] and sometimes PhpStorm (especially for work) + - *Text editor/IDE:* [[https://www.gnu.org/software/emacs/][Emacs]], sometimes [[https://code.visualstudio.com/][Visual Studio Code]] and sometimes PhpStorm (especially for work) - *Notable Emacs extensions*: - [[https://magit.vc/][Magit]] (the Git client) - [[https://orgmode.org/][org-mode]] (notes, todo-lists, planning, ...) @@ -187,8 +187,8 @@ - [[https://oremacs.com/swiper/][Ivy, counsel, swiper]] and [[https://company-mode.github.io/][company-mode]] (completion system) - [[https://editorconfig.org/][editorconfig]] (defined and shared code styles) - [[https://github.com/akermu/emacs-libvterm][vterm]] (Emacs libvterm integration) - - *Photo management:* Adobe Lightroom Classic, Skylum Luminar Neo (once it's released, currently only testing it) - - *Photo editing:* [[https://affinity.serif.com/en-gb/photo/][Affinity Photo]], Adobe Photoshop, [[https://www.gimp.org/][GIMP]] + - *Photo management:* Adobe Lightroom Classic + - *Photo editing:* [[https://affinity.serif.com/en-gb/photo/][Affinity Photo]], Adobe Photoshop, Syklum Luminar Neo, [[https://www.gimp.org/][GIMP]] - *Vector graphics:* [[https://affinity.serif.com/en-gb/designer/][Affinity Designer]], Adobe Illustrator, [[https://inkscape.org/][Inkscape]] - *Desktop publishing*: [[https://affinity.serif.com/en-gb/publisher/][Affinity Publisher]] and [[https://www.latex-project.org/][LaTeX]] - *Video editing:* Currently switching to DaVinci Resolve, [[https://kdenlive.org/en/][kdenlive]] @@ -197,9 +197,11 @@ - *Music listening:* Spotify - *Accounting software*: [[https://hledger.org/][hledger]] -*** Mobile +*** Android - - *Browser:* Brave and Firefox + Currently I only have a tablet as an Android device, therefore there are some apps that I currently do not use but keep for future reference. + + - *Browser:* Firefox - *Messaging:* Conversation (XMPP), Discord, Linphone (softphone), [[https://github.com/MCMrARM/revolution-irc][Revolution IRC]], [[https://www.signal.org/][Signal]], Telegram, [[https://threema.ch/en][Threema]], WhatsApp - *Organization:* [[https://acalendar.tapirapps.de/en/support/home][aCalendar+]] (calendar), [[https://k9mail.app/][K-9 Mail]] (email), [[http://www.orgzly.com/][Orgzly]] (currently not), Todoist - *Music listening:* Spotify and [[http://y20k.org/transistor/][Transistor]] (radio) @@ -207,15 +209,22 @@ - *Privacy-tools:* [[https://jak-linux.org/projects/dns66/][DNS66]] - *Security:* [[https://github.com/andOTP/andOTP][andOTP]], [[https://github.com/PhilippC/keepass2android][Keepass2Android]] - *Software centres:* Google Play Store and [[https://f-droid.org/][F-Droid]] - - *Other notable apps:* [[https://wiki.openstreetmap.org/wiki/StreetComplete][StreetComplete]], AccuBattery, [[https://www.cgeo.org/][c:geo]], MuPDF Viewer, Pocket + - *Other notable apps:* [[https://osmand.net/][OsmAnd]], AccuBattery, [[https://www.cgeo.org/][c:geo]], Pocket + +*** iOS + + - *Messaging:* Discord, [[https://www.signal.org/][Signal]], Telegram, [[https://threema.ch/en][Threema]], WhatsApp + - *Social Networks:* [[https://apps.apple.com/us/app/metatext/id1523996615?l=en][Metatext]] (Mastodon) + - *Organizaton:* Todoist, [[https://1writerapp.com/][1Writer]] + - *Security:* [[https://apps.apple.com/us/app/freeotp-authenticator/id872559395][FreeOTP]], [[https://strongboxsafe.com/][Strongbox]] (KeePass-compatible password store) + - *Other notable apps:* [[https://osmand.net/][OsmAnd]], [[https://reederapp.com/][Reeder]] (RSS Reader), [[https://apps.apple.com/us/app/studycards-karteikarten/id1534325530][StudyCards]] (Spaced Repetition Flashcards) ** Self-hosted - Some services are publicly available and hosted on a cheap Hetzner VPS others are hosted on my home server. - Not really hosted but nevertheless still worth mentioning because I heavily rely on it is [[https://syncthing.net/][Syncthing]]. + Some services are publicly available and hosted on a Hetzner VPS others are running on my home server (see above in the hardware section). - - *Wiki:* [[https://moinmo.in/][MoinMoin]] - - *RSS:* [[https://freshrss.github.io/FreshRSS/en/][FreshRSS]] with [[https://github.com/RSS-Bridge/rss-bridge/wiki][RSS-bridge]] and currently also testing [[https://miniflux.app/][Miniflux]] + - *Wiki:* [[https://moinmo.in/][MoinMoin]] (for [[https://uulmhack.dev][uulmhack]]) + - *RSS:* [[https://freshrss.github.io/FreshRSS/en/][FreshRSS]] with [[https://github.com/RSS-Bridge/rss-bridge/wiki][RSS-bridge]] - *Cloud:* Nextcloud - *Git web interface:* [[https://gitea.io/][Gitea]] - *XMPP:* [[https://prosody.im/][Prosody]]