From 64a7732987c3345ab9a4e0912bd4d7348cca03a9 Mon Sep 17 00:00:00 2001
From: Trevor Merritt <trevor.merritt@gmail.com>
Date: Fri, 30 Dec 2022 09:36:46 -0500
Subject: [PATCH] update ssh config for git.geekback.dev

---
 configs/git/gitconfig   | 8 +++++++-
 configs/ssh/config      | 5 +++--
 install.conf.yaml       | 3 ---
 scripts/setupGraalVM.sh | 7 +++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/configs/git/gitconfig b/configs/git/gitconfig
index 00ef110..27e759a 100644
--- a/configs/git/gitconfig
+++ b/configs/git/gitconfig
@@ -21,9 +21,11 @@
 [merge]
   ff = only
 [commit]
-#   template = ~/.gitmessage
+   template = ~/.gitmessage
 [fetch]
   prune = true
+  pruneTags = true
+  recurseSubmodules = true
 [rebase]
   autosquash = true
   autostash = true
@@ -31,3 +33,7 @@
   path = ~/.gitconfig.local
 [diff]
   colorMoved = zebra
+[branch]
+  autoSetupRebase=always
+[checkout]
+  defaultRemote=origin
diff --git a/configs/ssh/config b/configs/ssh/config
index cdb218b..d4db942 100644
--- a/configs/ssh/config
+++ b/configs/ssh/config
@@ -25,5 +25,6 @@ Host api.okteto
 Host git.geekback.dev
   Port 2222
   IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_rsa
-  PubkeyAcceptedKeyTypes +ssh-rsa
+  IdentityFile ~/.ssh/id_ed25519.pub
+# to generate new key
+# ssh-keygen -t ed25519 -C "tmerritt@yourcoolhost.xyz"
diff --git a/install.conf.yaml b/install.conf.yaml
index 8160115..497cfd5 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -23,9 +23,6 @@
     ~/.gitmessage:
       path: configs/ssh/gitmessage
       create: true
-    ~/.gitmessage:
-      path: configs/ssh/gitmessage
-      create: true
     # ZSH
     ~/.zshrc: configs/zsh/zshrc
     ~/.zshenv: configs/zsh/zshenv
diff --git a/scripts/setupGraalVM.sh b/scripts/setupGraalVM.sh
index e394b3f..d46dbce 100755
--- a/scripts/setupGraalVM.sh
+++ b/scripts/setupGraalVM.sh
@@ -11,12 +11,11 @@ then
     echo "GraalVM Already Installed.  Have a nice day."
 else
     echo "Starting to setup GraalVM from $GRAAL_INSTALL_URL to $GRAAL_INSTALL_DIR"
-
     mkdir -p $GRAAL_INSTALL_DIR
     cd $GRAAL_INSTALL_DIR
     wget $GRAAL_INSTALL_URL
     tar xzvf $GRAAL_INSTALL_FILENAME --strip-components=1
-fi
-    rm $GRAAL_INSTALL_FILENAME 
+    rm $GRAAL_INSTALL_FILENAME
     bin/gu install native-image
-fi 
+fi
+