clean up merge conflicts in gitconfig

.gitmodules

@@ -42,7 +42,7 @@
 	url = https://github.com/nojhan/liquidprompt.git
 [submodule "dot-files/oh-my-zsh"]
 	path = dot-files/oh-my-zsh
-	url = https://github.com/robbyrussell/oh-my-zsh.git
+	url = git@github.com:robbyrussell/oh-my-zsh.git
 [submodule "dot-files/vim/bundle/SearchComplete"]
 	path = dot-files/vim/bundle/SearchComplete
 	url = https://github.com/vim-scripts/SearchComplete.git
@@ -61,3 +61,9 @@
 [submodule "lib/zgen"]
 	path = lib/zgen
 	url = https://github.com/tarjoilija/zgen
+[submodule "dot-files/vim/bundle/vim-go.git"]
+	path = dot-files/vim/bundle/vim-go.git
+	url = [email protected]:fatih/vim-go.git
+[submodule "dot-files/zsh_custom/themes/powerlevel10k"]
+	path = dot-files/zsh_custom/themes/powerlevel10k
+	url = [email protected]:romkatv/powerlevel10k.git

dot-files/gitconfig

@@ -1,10 +1,12 @@
 [user]
-	name = Peter Stone
-	email = [email protected]
+  name = Peter Stone
+  email = [email protected]
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP8oTkPQdemPHbTEOGiUt6YOlyRskb2tZFQlGg1fp78u
 
 [core]
-	excludesfile = $HOME/.cvsignore
-	autocrlf = input
+  excludesfile = $HOME/.cvsignore
+  autocrlf = input
+  pager = delta
 
 [alias]
   blog="log origin/master... --left-right"
@@ -15,19 +17,13 @@
   dc=diff --cached
   di=diff
   ds="diff --staged"
-  fixup="commit --fixup"
   ff="pull --ff-only"
+  fixup="commit --fixup"
   flog="log --pretty=fuller --decorate"
+  force="push --force-with-lease"
   llog="log --date=local"
   lol="log --graph --decorate --oneline"
   lola="log --graph --decorate --oneline --all"
-  root = rev-parse --show-toplevel
-  rum="rebase master@{u}"
-  squash="commit --squash"
-  st = status
-  sta=stash
-  sur="submodule update --init --recursive"
-  unstage="reset HEAD"
   pr = "!f() { git fetch $1 refs/pull-requests/$2/merge:pr-$2; git checkout pr-$2; } ; f"
   prettylog =  log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
   root = rev-parse --show-toplevel
@@ -39,21 +35,54 @@
   unstage="reset HEAD"
 
 [color]
-	interactive = always
-	ui = auto
+  interactive = always
+  ui = auto
 
-[grep]
-	lineNumber = true
+[commit]
+  gpgsign = true
 
-[rebase]
-	stat = true
+[delta]
+  navigate = true
+    side-by-side = true
+[diff]
+  colorMoved = default
 
-[push]
-	default = simple
 [fetch]
-	prune = true
+  prune = true
+
+[gpg]
+  format = ssh
+
+[gpg "ssh"]
+  program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
+
+[grep]
+  lineNumber = true
+
+[interactive]
+  diffFilter = delta --color-only
 
 [init]
-	defaultBranch = main
+  defaultBranch = main
+
+[merge]
+  conflictstyle = zdiff3
+
 [pull]
-	ff = only
+  ff = only
+
+[push]
+  default = simple
+
+[rebase]
+  stat = true
+
+[rerere]
+  enabled = true 
+
+
+[url "[email protected]:"]
+  insteadOf = https://github.com/
+[url "[email protected]:"]
+  insteadOf = https://gitlab.eng.vmware.com/
+