style: format .gitignore and script files consistently

gitconfig.d/.gitignore

@@ -1,5 +1,5 @@
-/*
+/*
-!.gitignore
+!.gitignore
-!example.gitconfig
+!example.gitconfig
-!base.gitconfig
+!base.gitconfig
 !var

gitconfig.d/var/example.gitconfig

@@ -1,14 +1,14 @@
-[user]
+[user]
-	email = user@mail
+	email = user@mail
-	name = John Doe
+	name = John Doe
-	signingkey = 1234
+	signingkey = 1234
-[credential]
+[credential]
-	helper = store
+	helper = store
-[push]
+[push]
-	autoSetupRemote = true
+	autoSetupRemote = true
-[core]
+[core]
-	autocrlf = true
+	autocrlf = true
-[pull]
+[pull]
-	rebase = true
+	rebase = true
-[commit]
+[commit]
-	gpgsign = true
+	gpgsign = true

scripts/install

@@ -40,8 +40,14 @@ if [ -f "$HOME/.zshrc" ] && [ ! -L "$HOME/.zshrc" ]; then
 fi
 
 mkdir -p "$HOME/.ssh"
-echo "Include $HOME/.config/ssh/*" >> "$HOME/.ssh/config"
+if ! grep -Fxq "Include ~/.config/ssh/*" "$HOME/.ssh/config" 2>/dev/null; then
+  echo "Include ~/.config/ssh/*" >> "$HOME/.ssh/config"
+fi
 
- ln -s $DOTFILES_INSTALL_DIR/scripts/post-merge .git/hooks/post-merge
+if [ -f "$DOTFILES_INSTALL_DIR/.git/hooks/post-merge" ]; then
+  rm "$DOTFILES_INSTALL_DIR/.git/hooks/post-merge"
+fi
 
-./setup
+ln -s $DOTFILES_INSTALL_DIR/scripts/post-merge .git/hooks/post-merge
+
+./scripts/setup

scripts/post-merge

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-./setup
+./scripts/setup

scripts/setup

@@ -10,15 +10,6 @@ git submodule update --init --recursive
 
 find . -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix > /dev/null 2>&1
 
-echo "[+] Creating Gitconfigs..."
-
-(
-    for config in $PWD/.gitconfig.d/*.gitconfig; do
-        echo "[include]"
-        echo "    path = $config"
-    done;
-) > "$HOME/.gitconfig"
-
 ./scripts/gitconfig
 
 echo