Merge remote-tracking branch 'origin/master'

guitarrapc · Aug 8, 2023 · ea3922f · ea3922f
2 parents e8a2651 + 5b2bc16
commit ea3922f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -23,3 +23,9 @@ end_of_line = lf
 indent_style = tab
 insert_final_newline = true
 tab_width = 4
+
+[config]
+end_of_line = lf
+
+[*.conf]
+end_of_line = lf
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 Thumbs.db
 .gitconfig.lock
+conf.private.d/
diff --git a/home/.ssh/conf.d/aws.conf b/home/.ssh/conf.d/aws.conf
@@ -0,0 +1,2 @@
+host i-* mi-*
+  ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
diff --git a/home/.ssh/conf.d/github.conf b/home/.ssh/conf.d/github.conf
@@ -0,0 +1,7 @@
+# X: git clone git@github.com:Organisation/Repository
+# O: git clone github.com:Organisation/Repository
+Host github.com
+  User git
+  Hostname ssh.github.com
+  Port 443
+  IdentityFile ~/.ssh/gitkraken_rsa
diff --git a/home/.ssh/config b/home/.ssh/config
@@ -1,8 +1,4 @@
-Host github.com
-  User git
-  Hostname ssh.github.com
-  Port 443
-  IdentityFile ~/.ssh/gitkraken_rsa
+Include conf.d/*
 
-host i-* mi-*
-  ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
+# add your private config files here
+Include conf.private.d/*
diff --git a/home/scoop/apps/vscode/current/data/user-data/User/settings.json b/home/scoop/apps/vscode/current/data/user-data/User/settings.json
@@ -72,4 +72,5 @@
     "markdown": true,
     "scminput": false
   },
+  "go.toolsManagement.autoUpdate": true,
 }