summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2021-01-04 19:47:49 -0800
committerFranck Cuny <franck@fcuny.net>2021-01-04 19:47:49 -0800
commit0454a3536bdef1657510faa1e472fc5aa9d518a7 (patch)
treee2b561ea5d6acc2b368641b57abab8ee5fd9dd9c /Makefile
parentmake: split between Darwin and Linux (diff)
downloademacs.d-0454a3536bdef1657510faa1e472fc5aa9d518a7.tar.gz
git: store configuration under XDG_CONFIG_HOME
Since `git` understand `$XDG_CONFIG_HOME`, let's gather all the
configuration files there.
Diffstat (limited to '')
-rw-r--r--Makefile5
-rw-r--r--Makefile.darwin2
-rw-r--r--Makefile.linux4
3 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 38f2b61..8323e15 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,12 @@ endif
 
 .PHONY: install-general
 install-general:
+	@mkdir -p $(HOME)/.config
 	@mkdir -p $(HOME)/workspace/
 	@curl -s https://github.com/fcuny.keys -o $(HOME)/.ssh/authorized_keys
 	$(LN) $(PWD)/aspell.en.pws $(HOME)/.aspell.en.pws
-	$(LN) $(PWD)/gitconfig $(HOME)/.gitconfig
-	$(LN) $(PWD)/gitignore $(HOME)/.gitignore
+	$(LN) $(PWD)/config/git $(HOME)/.config/
+	$(LN) $(PWD)/emacs $(HOME)/.config/
 	$(LN) $(PWD)/tmux.conf $(HOME)/.tmux.conf
 	$(LN) $(PWD)/zshenv $(HOME)/.zshenv
 	$(LN) $(PWD)/zshrc $(HOME)/.zshrc
diff --git a/Makefile.darwin b/Makefile.darwin
index 3621942..8b573fa 100644
--- a/Makefile.darwin
+++ b/Makefile.darwin
@@ -1,6 +1,6 @@
 .PHONY: install-darwin-symlinks
 install-darwin-symlinks: install-general
-	$(LN) $(PWD)/gitconfig.twitter $(HOME)/.gitconfig.private
+	$(LN) $(PWD)/config/git/user.work $(HOME)/.config/user
 	$(LN) $(PWD)/emacs.d $(HOME)/.emacs.d
 
 install: install-darwin-symlinks
diff --git a/Makefile.linux b/Makefile.linux
index 256cd33..a5490dd 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,18 +1,16 @@
 .PHONY: install-linux-symlinks
 install-linux-symlinks: install-general
-	@mkdir -p $(HOME)/.config
 	@mkdir -p $(HOME)/.config/systemd
 	$(LN) $(PWD)/Xmodmap $(HOME)/.Xmodmap
 	$(LN) $(PWD)/Xresources $(HOME)/.Xresources
 	$(LN) $(PWD)/config/alacritty $(HOME)/.config/
+	$(LN) $(PWD)/config/git/user.personal $(HOME)/.config/git/user
 	$(LN) $(PWD)/config/i3/ $(HOME)/.config/
 	$(LN) $(PWD)/config/mpd/ $(HOME)/.config/
 	$(LN) $(PWD)/config/redshift.conf $(HOME)/.config/redshift.conf
 	$(LN) $(PWD)/config/systemd/user/backup.service $(HOME)/.config/systemd/user/backup.service
 	$(LN) $(PWD)/config/systemd/user/ssh-agent.service $(HOME)/.config/systemd/user/ssh-agent.service
 	$(LN) $(PWD)/config/user-dirs.dirs $(HOME)/.config/user-dirs.dirs
-	$(LN) $(PWD)/emacs.d/ $(HOME)/.config/
-	$(LN) $(PWD)/gitconfig.personal $(HOME)/.gitconfig.private
 	$(LN) $(PWD)/pam_environment $(HOME)/.pam_environment
 	$(LN) $(PWD)/xsession $(HOME)/.xsession