neovim and stuff

1 files changed, 53 insertions, 36 deletions

diff --git a/.gitconfig b/.gitconfig
index f03a42d..9c4eb6a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,51 +1,68 @@
+[user]
+name = Simen A. W. Olsen
+email = so@bjerk.io
+signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCyUn5BfmAnd/6xi0X1mYF/+jPOmCS0bpNUePF55gCY
+
 [apply]
-	# Detect whitespace errors when applying a patch
-	whitespace = fix
+# Detect whitespace errors when applying a patch
+whitespace = fix
+
 [core]
-	# Make `git rebase` safer on OS X
-	# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
-	trustctime = false
-	editor = emacs
+# Make `git rebase` safer on OS X
+# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
+trustctime = false
+editor = nvim 
+excludesfile = /Users/cobraz/.gitignore_global
+
 [color]
-	# Use colors in Git commands that are capable of colored output when
-	# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
-	ui = auto
+# Use colors in Git commands that are capable of colored output when
+# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
+ui = auto
 
 [color "branch"]
-	current = yellow reverse
-	local = yellow
-	remote = green
+current = yellow reverse
+local = yellow
+remote = green
 
 [color "diff"]
-	meta = yellow bold
-	frag = magenta bold # line info
-	old = red # deletions
-	new = green # additions
+meta = yellow bold
+frag = magenta bold # line info
+old = red           # deletions
+new = green         # additions
 
 [color "status"]
-	added = yellow
-	changed = green
-	untracked = cyan
+added = yellow
+changed = green
+untracked = cyan
 
 [diff]
-	# Detect copies as well as renames
-	renames = copies
+# Detect copies as well as renames
+renames = copies
+
 [help]
-	# Automatically correct and execute mistyped commands
-	autocorrect = 1
+# Automatically correct and execute mistyped commands
+autocorrect = 1
+
 [merge]
-	# Include summaries of merged commits in newly created merge commit messages
-	log = true
-#[commit]
-#	gpgsign = true
-#[pull]
-#	rebase = true
-# [gpg]
-# 	program = gpg
-[user]
-	name = Simen A. W. Olsen
-	email = so@bjerk.io
+# Include summaries of merged commits in newly created merge commit messages
+log = true
+
+[push]
+autoSetupRemote = true
+
+[gpg]
+program = ssh
+format = ssh
+
 [github]
-	user = cobraz
+user = simenandre
+
 [pull]
-	rebase = true
+rebase = true
+
+[url "git@github.com:"]
+	insteadOf = https://github.com/
+[gpg "ssh"]
+	program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
+[commit]
+	gpgsign = true