Commit Graph
827 Commits
Author SHA1 Message Date
Тайга 1a7fd403ba [2026-05-30] taiga sync: .stfolder/syncthing-folder-940f59.txt 2026-05-30 19:03:44 +00:00
Kraken 46abd3f67f [2026-05-31] vault sync: family/documents/movies-watchlist.md 2026-05-31 01:02:47 +06:00
Syncthing cb10d45d9a Merge remote-tracking branch 'origin/main' 2026-05-30 18:01:11 +00:00
Syncthing d5e9a77958 syncthing-1780164069 2026-05-30 18:01:09 +00:00
Alexey Martemyanov c251ef4a9f Merge remote-tracking branch 'nas/main' 2026-05-31 00:00:39 +06:00
Alexey Martemyanov 1ec6f0c2d6 [2026-05-30] sleep guard: rsync-active триггер + доки htpc-system.md и htpc.md 2026-05-30 23:05:04 +06:00
Тайга 652607a3a9 [2026-05-30] taiga sync: .stfolder/syncthing-folder-940f59.txt wiki/personal-os-catchup-plan-2026-04-27.md wiki/personal-os-schema.md wiki/personal-os-state-2026-04-27.md wiki/wiki-ingest-process.md 2026-05-30 17:03:50 +00:00
Alexey Martemyanov 5c9c895d83 [2026-05-30] personal os schema, state snapshot, catchup plan, wiki ingest process 2026-05-30 23:00:25 +06:00
Syncthing 670a2b7998 syncthing-1780157008 2026-05-30 16:03:28 +00:00
Тайга 943915a387 [2026-05-30] taiga sync: .stfolder/syncthing-folder-940f59.txt 2026-05-30 15:03:56 +00:00
Syncthing 6124dd2e4d Merge remote-tracking branch 'origin/main' 2026-05-30 14:03:26 +00:00
Syncthing 73eb860b70 syncthing-1780149806 2026-05-30 14:03:26 +00:00
Тайга 8da8234c12 [2026-05-30] taiga sync: work/briefs/daily/2026-05-30.md work/briefs/weekly/plan-2026-05-25.md 2026-05-30 14:03:25 +00:00
Alexey Martemyanov dd841e2fba [2026-05-30] restore daily brief and weekly plan deleted by syncthing 2026-05-30 19:07:44 +06:00
Тайга 24f825b795 [2026-05-30] taiga sync: work/briefs/inbox/2026-05-30.md 2026-05-30 13:04:00 +00:00
Alexey Martemyanov 29640c1bdc [2026-05-30] inbox triage 18:09 update 2026-05-30 19:01:09 +06:00
Syncthing c38c9ae81d syncthing: remove stale upstream-deleted files for real 2026-05-30 12:02:39 +00:00
Alexey Martemyanov c84dc83b05 [2026-05-30] daily brief, weekly plan Jun 1-5, inbox triage 17:00 update 2026-05-30 18:02:33 +06:00
Alexey Martemyanov 735430a7a6 Merge remote-tracking branch 'nas/main' 2026-05-30 18:02:16 +06:00
Syncthing d3bf71cadb syncthing: remove stale deleted files from upstream 2026-05-30 12:01:52 +00:00
Тайга df2f387708 resolve deleted files conflict 2026-05-30 12:01:25 +00:00
Syncthing f331b08cc3 syncthing-1780142472 2026-05-30 12:01:12 +00:00
Alexey Martemyanov b3b30047fd [2026-05-30] inbox triage: 16:03 → 16:34 window, no action items 2026-05-30 17:00:57 +06:00
Тайга 1e6326fe1f [2026-05-30] taiga sync: .stfolder/syncthing-folder-940f59.txt 2026-05-30 11:00:54 +00:00
Syncthing 65bee4bc5f Merge remote-tracking branch 'origin/main' 2026-05-30 10:03:32 +00:00
Syncthing 2ae24a4889 syncthing-1780135410 2026-05-30 10:03:30 +00:00
Тайга 6ee9753fcb [2026-05-30] taiga sync: family/how-to/htpc-discworld-noir-nq.md "family/sort/duty-free-\321\201\320\277\320\270\321\201\320\276\320\272.md" "family/sort/feedback-\320\270\320\264\320\265\320\270.md" "family/sort/grohe-\320\272\320\273\321\216\321\207-\320\260\320\272\321\202\320\270\320\262\320\260\321\206\320\270\320\270.md" family/sort/keep-2023-09-13_15_03_43.md 2026-05-30 10:03:29 +00:00
Alexey Martemyanov 0b91092a93 [2026-05-30] inbox sort: processed 19, deleted 19 2026-05-30 15:44:21 +06:00
Alexey Martemyanov 7e14bcf535 [2026-05-30] add wide grid poster procedure to steam-nonsteam-shortcuts doc 2026-05-30 15:05:50 +06:00
Alexey Martemyanov b937fc172d [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 15:01:38 +06:00
Syncthing 63560db12f Merge remote-tracking branch 'origin/main' 2026-05-30 09:01:04 +00:00
Syncthing 902b577066 syncthing-1780131664 2026-05-30 09:01:04 +00:00
Тайга 969bdb42c0 taiga-local-1780131662 2026-05-30 09:01:02 +00:00
Alexey Martemyanov e5bd816971 [2026-05-30] Discworld (ScummVM) — статус изменён на , документированы все 3 причины поломки 2026-05-30 14:44:44 +06:00
Alexey Martemyanov 60c0ea26fe [2026-05-30] merge noir+discworld into main proton doc, remove separate doc 2026-05-30 14:32:14 +06:00
Alexey Martemyanov f5a14fdfe0 [2026-05-30] update discworld noir doc: fstab fix, problems and solutions 2026-05-30 14:22:58 +06:00
Alexey Martemyanov 801b6070f3 [2026-05-30] add steam stop/start commands to htpc-system.md 2026-05-30 14:22:36 +06:00
Syncthing 6759ac1534 Merge remote-tracking branch 'origin/main' 2026-05-30 08:03:41 +00:00
Syncthing f3f4f22d4c syncthing-1780128220 2026-05-30 08:03:40 +00:00
Тайга 8a30fb26e8 taiga-local-1780128218 2026-05-30 08:03:38 +00:00
Alexey Martemyanov 40c33a6484 [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 14:01:09 +06:00
Alexey Martemyanov 009c61d1d7 [2026-05-30] add Data disk NTFS config to htpc-system.md 2026-05-30 13:12:03 +06:00
Syncthing 70205779ee Merge remote-tracking branch 'origin/main' 2026-05-30 07:03:14 +00:00
Syncthing b9042a200b syncthing-1780124591 2026-05-30 07:03:12 +00:00
Тайга 546b122e3e taiga-local-1780124590 2026-05-30 07:03:10 +00:00
Alexey Martemyanov 927cfbcf85 [2026-05-30] sync: merge conflicts present — manual review needed 2026-05-30 13:01:29 +06:00
Alexey Martemyanov 8a4663f1b2 [2026-05-30] inbox sort: processed 16 notes from family/sort/
New files:
- personal/ideas/life-product-ideas.md (feedback-идеи)

Merged into existing files:
- family/documents/kids-songs.md — added Barto poems list
- family/contacts/service-providers.md — added Айдар + Сергей contacts
- family/documents/recipes-wishlist.md — added настойки section

Deleted (already in vault):
- 10 keep-import files (altai-shopping, altai-house-inventory, car-notes,
  gift-ideas, books-reading-list already had the content)
- кофр-размер, лизе-на-день-рождения, лыжи-размеры, настойки-рецепты
2026-05-30 12:54:20 +06:00
Syncthing adcb1501cd Merge remote-tracking branch 'origin/main' 2026-05-30 06:03:59 +00:00
Syncthing c46fa9a29d syncthing-1780121038 2026-05-30 06:03:58 +00:00
Тайга 8d6f8b008b taiga-local-1780121037 2026-05-30 06:03:57 +00:00