I am not a programmer nor am I in IT, but I like to use some of the same tools they use. I use Emacs for writing fiction and I like it a lot. One of the packages I use with Emacs is git-timemachine, which allows me to visualize all the previously commited versions of the file I am currently working on. It serves as a very good and very reliable undo system. All my writing is on a private repo on Github. My usage is so simple and basic, Git/Github only serves as a kind of backup and undo (I know Git is not a backup, so I regularly download my repos as zips and send to OneDrive as an extra. They are also always available offline in the machines work, of course).

The problem is, sometimes I work on different machines, and sometimes on different operating systems on the same machine (via dual boot). So I would like to know if there's an easy way to always "sync" the local mirror I am currently working on with the latest changes (also making sure that all changes are pushed). Essentially, I am asking if I can make Git work like Dropbox or OneDrive by automatically accept changes as long as they are the most recent version of a file. I do not wish to go through diffs approving every single change.

I understand I could use something like rclone for that, but their bisync feature is still very new and not considered reliable. Also, I already use Git and it is good for me. So I would prefer not adding an extra piece to the puzzle.

I am familiar with cron, have an elementary understanding of shell scripts, and can follow instructions.

So, can Git do the job?

I've been using syncthing for a while now and more recently I've started to use a VPS but I find it to be a mild pain in the ass to setup and I'm wondering if there's a better way or just how are you administering?

I've been just editing the config.xml file and restarting it. It feels clunky editing it in nano especially when I have to delete a folder or remove a device.

I'm starting up on a new VPS and doing this initial setup again is mildly frustrating.

Another question, a friend is also going to be backing up some files onto this server (both of us treating it as untrusted), would it be better practice to set up 2 users each running their own syncthing@user service or just have it all under one?

I have a NAS with a ton of photos and documents that have remained untouched for around 6 years. I uploaded all that stuff to OneDrive. Tidied it up and kept using OneDrive mostly. But I also sent stuff to the NAS. They have diverged.

I'm thinking about ways of restructuring/sorting my NAS to match my OneDrive so that I can then sync the two. I thought about making a python script that would just match on file names and move them to the correct location.

Figured before I did I'd ask if anyone else had any other suggestions

It seems to be very good as an even easier way to send files like AirDrop but also to keep them in one distributed place in a privacy-affirming and respectful way.

Is there a catch or is it really a free lunch in this regard?

So I've spent the last few days trying to sync everything up between devices, with the following thoughts in mind:

1. how fucked am I going to be if a device gets corrupted/stolen/lost?
2. how can I easily access everything I need from a mobile device/device not belonging to me?
3. how can I avoid using services from the big tech companies, and keep things open source, as much as possible?

I'm by no means an expert in the field, and I'm hoping in this thread to get a discussion going as to the pros and cons of using different services/setups, to get a general idea as to what others are doing to keep their daily lives simpler and more secure, and to perhaps see what are the future steps for me to take when I feel like playing around again.

Servers & Storage
I span up a 25GB VPS with Vultr for 'active use data', and also took out some 'deep storage'(?) from Wasabi for things which I need to keep, but not really access that much.

Mail
Protonmail with custom domain. Using the ProtonMail app for mobile, and Linux ProtonMail bridge with Evolution mail for desktop.

Pics/Vids
Nextcloud autoupload feature on mobile automatically uploads my pics to an 'autoupload' folder on Nextcloud server. Here, I categorise pics into folders and share what needs sharing before deleting anything I don't need and wiping the pics on my phone.

Passwords
Nothing yet. Looking at getting KeyPass synced across devices.

Bookmarks
Again, nothing yet. Had Firefox Sync running to connect Fennec and Firefox, but am looking for a more open approach which involves Nextcloud somehow, and allows me to tag and order things more effectively as opposed to dragging things around in the sidebar.

Calendar/Contacts
Evolution calendar on desktop, simple calendar on mobile, hooked up to Nextcloud and all synced using davx5

Programs and General Setup
Here, I'd like to somehow take an image/backup of my Ubuntu configs of importance and experiment with getting my setup and customisaitons replicated on another machine quickly and without taking up too much space in storage (i.e. don't need to bakckup all my files as they're already on cloud).

Also, I am very curious as to whether anybody is using Syncthing across their devices? And if so, how are they finding the experience?