From 50c0fa832690ebcf7c932a5848582b8c1f236ab5 Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Wed, 27 Jan 2021 11:26:24 +0100
Subject: [PATCH] config/git: reconfig push aliases

---
 .config/git/config            | 18 +++++++++++-------
 .config/nvim/init/general.vim |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index 898b954..40ed11b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -53,6 +53,15 @@
 	lowSpeedLimit = 1000
 	lowSpeedTime = 3
 
+[url "ssh://github.com/"]
+	pushInsteadOf = https://github.com/
+
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+
 [alias]
 	# GET INFO
 	st = status --short --branch --show-stash
@@ -126,7 +135,8 @@
 
 	# Change remote
 	luu = !git pull upstream $(git curbranch) && git push --no-verify
-	p = push -u
+	p = push
+	pu = push -u
 	pf = push --force-with-lease
 	cap = !git commit --all --amend --no-edit && git push --force-with-lease
 
@@ -142,9 +152,3 @@
 	journal = !git cme "notes/journal:" -- $(git root)/2-standards/notes/journal
 	note = !git cme "notes:" -- $(git root)/2-standards/notes
 	write = !git cme "writings:" -- $(git root)/2-standards/writing
-
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
diff --git a/.config/nvim/init/general.vim b/.config/nvim/init/general.vim
index e006898..bd2205b 100644
--- a/.config/nvim/init/general.vim
+++ b/.config/nvim/init/general.vim
@@ -13,7 +13,7 @@ let &backupext="_" . strftime("%y%m%dT%H%M")
 set wildmode=longest,list,full " Auto-completion for cmdline
 set clipboard+=unnamedplus " Merge with system clipboard
 
-set shiftwidth=2 " Indentation
+set shiftwidth=2 expandtab " Indentation
 "set shiftwidth=4 tabstop = 4 " Indentation for programming
 
 " visuals