From bdb210af3a0ffa9c4f718e7ef4ffd80b939d8942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?deniz=20g=C3=B6k=C3=A7in?= <33603535+dgokcin@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:49:47 +0100 Subject: [PATCH] refactor: clean-up personal gitconfig (#144) --- README.md | 3 +-- base.gitconfig | 7 +------ makefiles/gitconfigs.mk | 1 - makefiles/utils.mk | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 96d8223..db631fb 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,6 @@ For a full list of available commands, run `make help`. ### Git Configuration - `base.gitconfig`: Common Git configuration -- `personal.gitconfig`: Personal Git settings - `work.gitconfig`: Work-specific Git settings ### Shell Configuration @@ -109,6 +108,6 @@ These AI-assisted tools and prompts are designed to enhance your development wor You can customize the setup by modifying the relevant configuration files: - Edit `.zshrc` for shell customizations -- Modify Git configs in `base.gitconfig`, `personal.gitconfig`, or `work.gitconfig` +- Modify Git configs in `base.gitconfig`, or `work.gitconfig` - Adjust editor settings in their respective configuration files - Customize AI prompts in the `ai-stuff/cursor/prompts` directory diff --git a/base.gitconfig b/base.gitconfig index 3a2a9af..06bcc00 100644 --- a/base.gitconfig +++ b/base.gitconfig @@ -1,6 +1,6 @@ [user] - # Change this to your name name = Deniz Gökçin + email = dgokcin@gmail.com [init] defaultBranch = main @@ -184,11 +184,6 @@ # Automatically correct and execute mistyped commands autocorrect = 1 -# Default personal config loaded first relative to the git config directory -[include] - path = personal.gitconfig - # Work config will override personal settings when in work directories [includeIf "gitdir:~/codes/work/"] path = work.gitconfig - diff --git a/makefiles/gitconfigs.mk b/makefiles/gitconfigs.mk index 8a91c63..806ecd4 100644 --- a/makefiles/gitconfigs.mk +++ b/makefiles/gitconfigs.mk @@ -4,7 +4,6 @@ setup-git: ## Setup git config $(call mkdir_safe,${HOME}/.config/git) $(call mkdir_safe,${XDG_CONFIG_HOME}/git) $(call symlink,base.gitconfig,${XDG_CONFIG_HOME}/git/config) - $(call symlink,personal.gitconfig,${XDG_CONFIG_HOME}/git/personal.gitconfig) $(call symlink,work.gitconfig,${XDG_CONFIG_HOME}/git/work.gitconfig) $(call symlink,.inputrc,${HOME}/.inputrc) diff --git a/makefiles/utils.mk b/makefiles/utils.mk index 00e99f6..5dd9851 100644 --- a/makefiles/utils.mk +++ b/makefiles/utils.mk @@ -17,7 +17,6 @@ clean: $(call remove_file,${HOME}/.gvimrc) $(call remove_file,${HOME}/.gitconfig) $(call remove_file,${XDG_CONFIG_HOME}/git/config) - $(call remove_file,${XDG_CONFIG_HOME}/git/personal.gitconfig) $(call remove_file,${XDG_CONFIG_HOME}/git/work.gitconfig) $(call remove_file,${HOME}/.bash_profile) $(call remove_file,${HOME}/.aliases)