🗄 chore: Move git package (#53)

See #40.

Author: tomy0000000

.github/workflows/test_macos.yml

@@ -17,7 +17,7 @@ jobs:
             "clean",
             "cli-network",
             "core",
-            # "git", # CI machine contains existed .gitconfig file
+            "git",
             "javascript",
             # "macos-alfred", # Script error to be fixed
             # "macos-app-dev", # Depends on `git`

.gitignore

@@ -35,6 +35,7 @@ Temporary Items
 # End of https://www.toptal.com/developers/gitignore/api/macos,nova
 
 # Custom
+/pkg/git/custom/custom.gitconfig
 /zsh/.zcompdump
 /zsh/.zsh_history
 /zsh/.zsh_sessions

Makefile

@@ -17,7 +17,7 @@ stow: $(OS)-stow
 zsh: $(OS)-zsh
 
 git: $(OS)-git
-	stow --no-folding --target "${HOME}" 'git'
+	ln -sf '.dotfiles/pkg/git/.gitconfig' "${HOME}"
 micro: $(OS)-micro
 	stow --no-folding --dir 'pkg/micro' --target "${HOME}" 'stow'
 ansible: stow

makefiles/macos.mk

@@ -112,7 +112,7 @@ macos-duti: macos-brew
 # This is a full suite of git plugins and configurations
 # Most other target that requires git don't need this
 macos-git: macos-brew
-	brew bundle --file brewfiles/git.Brewfile
+	brew bundle --file pkg/git/git.Brewfile
 
 macos-micro: macos-brew
 	brew install micro

makefiles/ubuntu.mk

@@ -17,7 +17,7 @@ ubuntu-essential: ubuntu-core ubuntu-locale-zhtw ubuntu-tz-taipei ubuntu-ssh
 	sudo apt-get install -y build-essential
 
 ubuntu-git: ubuntu-stow
-	xargs sudo apt-get install -y < aptfiles/git.Aptfile
+	xargs sudo apt-get install -y < pkg/git/git.Aptfile
 
 ubuntu-javascript:
 	echo "dotfiles are installed, but not the runtime environments."

git/.git_commit_template pkg/git/.git_commit_templategit/.git_commit_template renamed to pkg/git/.git_commit_template

@@ -55,11 +55,11 @@ updated = green bold
 ui = auto
 
 [commit]
-template = "~/.git_commit_template"
+template = "~/.dotfiles/pkg/git/.git_commit_template"
 
 [core]
-attributesFile = "~/.gitattributes"
-excludesFile = "~/.gitignore_global"
+attributesFile = "~/.dotfiles/pkg/git/.gitattributes"
+excludesFile = "~/.dotfiles/pkg/git/.gitignore"
 editor = "nano"
 
 [diff]
@@ -85,11 +85,11 @@ lineNumber = true
 autocorrect = prompt
 
 [include]
-path = "~/.gitconfig-custom" # include other customizations
-path = "~/.gitalias"
+path = "~/.dotfiles/pkg/git/custom/custom.gitconfig" # include other customizations
+path = "~/.dotfiles/pkg/git/alias.gitconfig"
 
 [includeIf "hasconfig:remote.*.url:https://github.com/**"]
-path = "~/github-tomy0000000.gitconfig" # include the user block
+path = "~/.dotfiles/pkg/git/github-tomy0000000.gitconfig" # include the user block
 
 [init]
 # https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/

git/.gitattributes pkg/git/.gitattributesgit/.gitattributes renamed to pkg/git/.gitattributes

@@ -1,3 +1,4 @@
+# https://git-scm.com/docs/gitignore
 # Created by https://www.toptal.com/developers/gitignore/api/macos,xcode,dropbox,visualstudiocode
 # Edit at https://www.toptal.com/developers/gitignore?templates=macos,xcode,dropbox,visualstudiocode