X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/638342a08e62388aa223d6da5de0f40efab47056..abd7add3283174112dd5eb0cb4087015f493b95a:/Makefile

diff --git a/Makefile b/Makefile
index 48a4ccb..e4f5e15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,51 @@
 APATH := $(realpath .)
-RPATH := $(subst $(wildcard ~/),,$(APATH))
 
-FILES :=
-DOTFILES := bash* flexget vim*
+FILES := bin
+DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc
+CONFIGFILES := aliases compton.conf git gnupg mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh
 
-.PHONY: install $(FILES) $(DOTFILES)
-install: $(FILES) $(DOTFILES)
+.PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
+install: $(FILES) $(DOTFILES) $(CONFIGFILES)
+
+mpd:
+	ln -sfT $(APATH)/mpd ~/.config/mpd
+	mkdir -p ~/.local/share/mpd/playlists
+.PHONY: mpd
+
+ncmpcpp:
+	ln -sfT $(APATH)/ncmpcpp ~/.config/ncmpcpp
+	mkdir -p ~/.local/share/mpd/lyrics
+.PHONY: ncmpcpp
 
 $(FILES): 
-	@if [[ -f ~/$@ || -d ~/$@ ]]; then \
-	  if [[ -d $@ ]]; then \
-	    cp -r ~/$@/* $@; \
-	  else \
-	    cp -r ~/$@ $@; \
-	  fi; \
-	  rm -r ~/$@; \
+	@if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
+	    if [[ -d $@ ]]; then \
+	      cp -r ~/$@/* $@; \
+	    else \
+	      cp -r ~/$@ $@; \
+	    fi; \
+	    rm -r ~/$@; \
 	fi; 
-	ln -sf $(RPATH)/$@ ~/.$@ 
+	ln -sfT $(APATH)/$@ ~/$@
 
 $(DOTFILES): 
-	@if [[ -f ~/.$@ || -d ~/.$@ ]]; then \
-	  if [[ -d $@ ]]; then \
-	    cp -r ~/.$@/* $@; \
-	  else \
-	    cp -r ~/.$@ $@; \
-	  fi; \
-	  rm -r ~/.$@; \
+	@if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
+	    if [[ -d .$@ ]]; then \
+	      cp -r ~/.$@/* $@; \
+	    else \
+	      cp -r ~/.$@ $@; \
+	    fi; \
+	    rm -r ~/.$@; \
+	fi; 
+	ln -sfT $(APATH)/$@ ~/.$@
+
+$(CONFIGFILES): 
+	@if [[ -e ~/.config/$@ && ! -L ~/.config/$@ ]]; then \
+	    if [[ -d .config/$@ ]]; then \
+	      cp -r ~/.config/$@/* $@; \
+	    else \
+	      cp -r ~/.config/$@ $@; \
+	    fi; \
+	    rm -r ~/.config/$@; \
 	fi; 
-	ln -sf $(RPATH)/$@ ~/.$@ 
+	ln -sfT $(APATH)/$@ ~/.config/$@