From 375c954e2b9dede6305f6609372b1b62fcd1646c Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Mon, 4 May 2020 19:21:59 +0200
Subject: [PATCH] [ssh] moved github to config.d/

---
 .install.conf.yaml  | 1 +
 git/config          | 9 ++++++---
 profiles/main.sh    | 4 ++--
 ssh/config          | 4 ----
 ssh/config.d/github | 3 +++
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 ssh/config.d/github

diff --git a/.install.conf.yaml b/.install.conf.yaml
index 122e1ec..64460cf 100644
--- a/.install.conf.yaml
+++ b/.install.conf.yaml
@@ -20,6 +20,7 @@
     ~/.config/systemd/mpDris2.service: mpd/mpDris2.service
     ~/.profile: profile.sh
     ~/.ssh/config: ssh/config
+    ~/.ssh/config.d/github: ssh/config.d/github
     ~/.tmux.conf: tmux/tmux.conf
     ~/.vimrc: vim/vimrc
     ~/.xinitrc: X11/xinitrc
diff --git a/git/config b/git/config
index ea1dc29..4d39b53 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,9 @@
 [diff]
 	tool = vimdiff
 [alias]
-lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-lg2 = 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)' --all
-lg = !"git lg1"
+	# Short Fancy Logs
+	lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
+	lg2 = 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)' --all
+	lg = !"git lg1"
+
+	dif = diff
diff --git a/profiles/main.sh b/profiles/main.sh
index 842c124..77a7cce 100644
--- a/profiles/main.sh
+++ b/profiles/main.sh
@@ -7,9 +7,9 @@ DOTFILES="$XDG_DOTFILES_DIR"
 addpath() { case ":${PATH:=$1}:" in *:$1:*) ;; *) PATH="$1:$PATH" ;; esac; }
 
 # add ~/.local/bin to PATH
-if [ -d "~/.local/bin" ]
+if [ -d "$HOME/.local/bin" ]
 then
-	addpath "~/.local/bin"
+	addpath "$HOME/.local/bin"
 fi
 
 # add DOTFILES/bin to PATH
diff --git a/ssh/config b/ssh/config
index 6f275c2..a050b08 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1,10 +1,6 @@
 # Include separate configs from ~/.ssh/config.d/
 Include ~/.ssh/config.d/*
 
-# Github
-Host github.com
-User git
-
 # Defaults
 Host *
 IdentitiesOnly yes
diff --git a/ssh/config.d/github b/ssh/config.d/github
new file mode 100644
index 0000000..a249cbc
--- /dev/null
+++ b/ssh/config.d/github
@@ -0,0 +1,3 @@
+# Github
+Host github.com
+User git