summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitignore1
-rw-r--r--Makefile5
-rw-r--r--Makefile.darwin2
-rw-r--r--Makefile.linux4
-rw-r--r--config/git/config (renamed from gitconfig)3
-rw-r--r--config/git/ignore (renamed from gitignore)0
-rw-r--r--config/git/user.personal (renamed from gitconfig.personal)0
-rw-r--r--config/git/user.work (renamed from gitconfig.twitter)0
8 files changed, 7 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 0ff5b07..dff9282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ var/
 bookmarks
 custom-set-variables
 /emacs.d/transient/history.el
+/config/git/user
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
 
diff --git a/gitconfig b/config/git/config
index 02ec952..32f11aa 100644
--- a/gitconfig
+++ b/config/git/config
@@ -6,13 +6,12 @@
 
 [core]
 	whitespace = trailing-space,space-before-tab
-	excludesfile = ~/.gitignore
 
 [branch]
 	autosetuprebase = remote
 
 [include]
-	path = ~/.gitconfig.private
+	path = ~/.config/git/user
 
 [http]
 	postBuffer = 524288000
diff --git a/gitignore b/config/git/ignore
index c8124cb..c8124cb 100644
--- a/gitignore
+++ b/config/git/ignore
diff --git a/gitconfig.personal b/config/git/user.personal
index 092c2f1..092c2f1 100644
--- a/gitconfig.personal
+++ b/config/git/user.personal
diff --git a/gitconfig.twitter b/config/git/user.work
index d95b398..d95b398 100644
--- a/gitconfig.twitter
+++ b/config/git/user.work