From 1cb3648eab871c404eda238ebb2f7a027429ff0a Mon Sep 17 00:00:00 2001
From: Florian Beisel <florian.beisel@intersport.de>
Date: Fri, 27 Sep 2024 20:49:21 +0200
Subject: [PATCH] Update .gitconfig Update .logseq/config/plugins.edn Update
 Library/Application Support/Code/User/settings.json Update .local/bin/vpn
 Update .ssh/config

---
 dot_gitconfig                                 |  9 ++++--
 dot_logseq/config/plugins.edn                 |  4 ++-
 .../private_Code/User/settings.json           | 29 ++++++++++++++++---
 private_dot_local/bin/executable_vpn          |  2 +-
 private_dot_ssh/config                        | 21 ++++++++++++--
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/dot_gitconfig b/dot_gitconfig
index f5707cd..df043dd 100644
--- a/dot_gitconfig
+++ b/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"
diff --git a/dot_logseq/config/plugins.edn b/dot_logseq/config/plugins.edn
index 15e3535..2bd35c1 100644
--- a/dot_logseq/config/plugins.edn
+++ b/dot_logseq/config/plugins.edn
@@ -1,3 +1,5 @@
 {:logseq-bujo-theme {:version "1.3.5", :repo "stdword/logseq-bujo-theme", :effect false, :theme true}
  :logseq-bullet-threading {:version "v1.1.4", :repo "pengx17/logseq-plugin-bullet-threading", :effect false, :theme false}
- :logseq-markdown-table {:version "v1.8.1", :repo "haydenull/logseq-plugin-markdown-table", :effect false, :theme false}}
+ :logseq-markdown-table {:version "v1.8.1", :repo "haydenull/logseq-plugin-markdown-table", :effect false, :theme false}
+ :logseq-pdf-export-plugin {:version "2.2.10", :repo "sawhney17/logseq-pdf-export", :effect true, :theme false}
+ :logseq-pdf-extract {:version "0.1.1", :repo "e-zz/logseq-pdf-extract", :effect true, :theme false}}
diff --git a/private_Library/private_Application Support/private_Code/User/settings.json b/private_Library/private_Application Support/private_Code/User/settings.json
index 69a61f0..d029781 100644
--- a/private_Library/private_Application Support/private_Code/User/settings.json	
+++ b/private_Library/private_Application Support/private_Code/User/settings.json	
@@ -30,11 +30,11 @@
     "atlascode.bitbucket.enabled": false,
     "atlascode.jira.statusbar.showProduct": true,
     "atlascode.jira.statusbar.showUser": true,
-    "workbench.colorTheme": "SynthWave '84",
+    "workbench.colorTheme": "Catppuccin Macchiato",
     "workbench.iconTheme": "material-icon-theme",
     "projectManager.git.baseFolders": [
         "~/private/",
-        "~/work/"
+        "~/src/work/"
     ],
     "debug.console.fontFamily": "MesloLGS NF",
     "terminal.integrated.fontFamily": "MesloLGS NF",
@@ -42,10 +42,8 @@
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "gitlab.aiAssistedCodeSuggestions.enabled": false,
     "gitlens.showWelcomeOnInstall": false,
     "gitlens.showWhatsNewAfterUpgrades": false,
-    "projectManager.groupList": true,
     "[json]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
@@ -70,5 +68,28 @@
         "plaintext": false,
         "markdown": true,
         "scminput": false
+    },
+    "go.toolsManagement.autoUpdate": true,
+    "files.associations": {
+        "*.tm.hcl": "terramate"
+    },
+    "vscode-home-assistant.hostUrl": "http://192.168.80.87:8123",
+    "vscode-home-assistant.longLivedAccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2ZmY1ZmFiNWZmODc0YWVkOWU4NGQ1NjQ3YWUyZjA3ZiIsImlhdCI6MTcyMTk5MjE3NiwiZXhwIjoyMDM3MzUyMTc2fQ.zwfXV3qO-ACE8NFnspDlq85AQLoCZqvX42h95O7_BgU",
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[jsonc]": {
+        "editor.defaultFormatter": "vscode.json-language-features"
+    },
+    "[markdown]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "projectManager.groupList": true,
+    "projectManager.removeCurrentProjectFromList": false,
+    "workbench.productIconTheme": "macos-modern",
+    "gitlab.duoCodeSuggestions.enabled": false,
+    "git.confirmSync": false,
+    "[shellscript]": {
+        "editor.defaultFormatter": "shakram02.bash-beautify"
     }
 }
\ No newline at end of file
diff --git a/private_dot_local/bin/executable_vpn b/private_dot_local/bin/executable_vpn
index dffcf31..6db6f8b 100644
--- a/private_dot_local/bin/executable_vpn
+++ b/private_dot_local/bin/executable_vpn
@@ -17,7 +17,7 @@ case "$1" in
     up)
         # Start the VPN connection
         VPN_PASSWORD=$(get_vpn_password)
-        echo $VPN_PASSWORD | sudo openconnect --passwd-on-stdin --config $HOME/.config/openconnect/intersport.de.conf 
+        echo $VPN_PASSWORD | sudo openconnect --passwd-on-stdin --config $HOME/.config/openconnect/intersport.de.conf --servercert pin-sha256:ubN/pQqq4oHxnixTswjOlbVYf5qYf6DhbsuCLYndbvw=
 #> /dev/null 2>/dev/null
         ;;
     down)
diff --git a/private_dot_ssh/config b/private_dot_ssh/config
index d210202..4efd09c 100644
--- a/private_dot_ssh/config
+++ b/private_dot_ssh/config
@@ -1,6 +1,3 @@
-Host git.beisel.it
-  User git
-  IdentityFile ~/.ssh/id_ed25519-private
 
 Host gitlab.com
   User git
@@ -11,3 +8,21 @@ Host *.intersport.de
   IdentityFile ~/.ssh/id_ed25519-work
 
 AddKeysToAgent yes
+
+Host git.beisel.it
+  User git
+  IdentityFile ~/.ssh/id_ed25519-private
+
+Host *.beisel.it 95.216.116.5
+  IdentityFile ~/.ssh/id_ed25519-private
+ 
+Host github-private
+  HostName github.com
+  User git
+  IdentityFile ~/.ssh/id_ed25519-private
+
+Host github-work
+  HostName github.com
+  User git
+  IdentityFile ~/.ssh/id_ed25519-work
+