X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/05fdc4b5ecc0735e8eb0cd199f9d89ae9e029c3a..a6ea1a1fa2e612852376b6deab07cb2388608fc8:/Makefile

diff --git a/Makefile b/Makefile
index 9b8fe2f..d8da053 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
-DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources
-CONFIGFILES := aliases compton.conf git mpv offlineimap ranger retroarch xbindkeys xkb
+DOTFILES := goobookrc msmtp* profile tmux.conf weechat Xresources
+CONFIGFILES := compton.conf mpv offlineimap ranger retroarch xbindkeys xkb
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
@@ -10,15 +10,24 @@ install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 ~/.config:
 	mkdir -p ~/.config
 
-vim:
+git: ~/.config
+	ln -sfT $(APATH)/git ~/.config/git
+.PHONY: git
+
+vim: ~/.config
 	ln -sfT $(APATH)/vim ~/.config/vim
 	mkdir -p ~/.local/share/vim
 	git clone https://github.com/gmarik/vundle ~/.local/share/vim/vundle
 .PHONY: vim
 
+mutt: ~/.config
+	ln -sfT $(APATH)/mutt ~/.config/mutt
+.PHONY: mutt
+
 gdb:
 	ln -sfT $(APATH)/gdbinit ~/.gdbinit
 	ln -sfT $(APATH)/cgdb ~/.cgdb
+.PHONY: gdb
 
 awesome: ~/.config
 	ln -sfT $(APATH)/awesome ~/.config/awesome
@@ -36,12 +45,12 @@ mpd: systemd
 	systemctl --user start mpd
 .PHONY: mpd
 
-ncmpcpp:
+ncmpcpp: ~/.config
 	ln -sfT $(APATH)/ncmpcpp ~/.config/ncmpcpp
 	mkdir -p ~/.local/share/mpd/lyrics
 .PHONY: ncmpcpp
 
-systemd:
+systemd: ~/.config
 	ln -sfT $(APATH)/$@ ~/.config/$@
 .PHONY: systemd
 
@@ -51,11 +60,12 @@ gnupg: systemd
 	systemctl --user start gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
 .PHONY: gnupg
 
-zsh:
+zsh: ~/.config
 	ln -sfT $(APATH)/zshrc ~/.zshrc
 	ln -sfT $(APATH)/zprofile ~/.zprofile
 	ln -sfT $(APATH)/zshenv ~/.zshenv
 	ln -sfT $(APATH)/zsh ~/.config/zsh
+	ln -sfT $(APATH)/aliases ~/.config/aliases
 	mkdir -p ~/.cache/zsh
 .PHONY: zsh
 
@@ -63,15 +73,15 @@ xprofile:
 	ln -sfT $(APATH)/xprofile ~/.xprofile
 .PHONY: xprofile
 
-dircolors:
+dircolors: ~/.config
 	ln -sfT $(APATH)/dircolors ~/.config/dircolors
 .PHONY: dircolors
 
-urxvt:
+urxvt: ~/.config
 	ln -sfT $(APATH)/urxvt ~/.config/urxvt
 .PHONY: urxvt
 
-$(FILES): 
+$(FILES):
 	@if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
 	    if [[ -d $@ ]]; then \
 	      cp -r ~/$@/* $@; \
@@ -79,10 +89,10 @@ $(FILES):
 	      cp -r ~/$@ $@; \
 	    fi; \
 	    rm -r ~/$@; \
-	fi; 
+	fi;
 	ln -sfT $(APATH)/$@ ~/$@
 
-$(DOTFILES): 
+$(DOTFILES):
 	@if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
 	    if [[ -d .$@ ]]; then \
 	      cp -r ~/.$@/* $@; \
@@ -90,7 +100,7 @@ $(DOTFILES):
 	      cp -r ~/.$@ $@; \
 	    fi; \
 	    rm -r ~/.$@; \
-	fi; 
+	fi;
 	ln -sfT $(APATH)/$@ ~/.$@
 
 $(CONFIGFILES):  ~/.config
@@ -101,5 +111,5 @@ $(CONFIGFILES):  ~/.config
 	      cp -r ~/.config/$@ $@; \
 	    fi; \
 	    rm -r ~/.config/$@; \
-	fi; 
+	fi;
 	ln -sfT $(APATH)/$@ ~/.config/$@