Update .gitconfig

Update .logseq/config/plugins.edn
Update Library/Application Support/Code/User/settings.json
Update .local/bin/vpn
Update .ssh/config

dot_gitconfig

@@ -1,8 +1,8 @@
 # ~/.gitconfig
 
-[includeIf "gitdir:~/work/"]
+[includeIf "gitdir:~/src/work/"]
     path = .gitconfig-work
-[includeIf "gitdir:~/private/"]
+[includeIf "gitdir:~/src/private/"]
     path = .gitconfig-private
 
 # Special Cases
@@ -20,3 +20,8 @@
 	autocrlf = input
 [push]
 	autoSetupRemote = true
+[init]
+	defaultBranch = main
+[alias]
+	accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
+	accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"