mutt: fix archive message path

[dotfiles.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a2c883db9effd8e206dbc0f57ce795efad8e2bb..f118edd6db73e62dc6bb5267a716858cd2061753 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,67 +1,131 @@
 APATH := $(realpath .)
 
 APATH := $(realpath .)
 

+XDG_CONFIG_HOME ?= ~/.config
+XDG_CACHE_HOME  ?= ~/.cache
+XDG_DATA_HOME   ?= ~/.local/share
+

 FILES := bin
 FILES := bin

-DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources
-CONFIGFILES := aliases compton.conf git gnupg mpv offlineimap ranger retroarch xbindkeys xkb
+DOTFILES := goobookrc profile tmux.conf Xresources
+CONFIGFILES := compton.conf mpv offlineimap ranger retroarch xbindkeys xkb
+
+.PHONY: core_files
+core_files: dircolors git ssh systemd vim zsh

 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 

-~/.config:
-       mkdir -p ~/.config
-
-vim:
-       ln -sfT $(APATH)/vim ~/.config/vim
-       mkdir -p ~/.local/share/vim
-       git clone https://github.com/gmarik/vundle ~/.local/share/vim/vundle
-.PHONY: vim
+$(XDG_DATA_HOME) $(XDG_CONFIG_HOME):
+       mkdir -p $@

 
 

-awesome: ~/.config
-       ln -sfT $(APATH)/awesome ~/.config/awesome
+awesome: $(XDG_CONFIG_HOME) xinit
+       ln -sfT $(APATH)/awesome $(XDG_CONFIG_HOME)/awesome
+       ln -sfT $(APATH)/xinitrc ~/.xinitrc
+       ln -sfT $(APATH)/zlogin ~/.zlogin

 .PHONY: awesome
 
 .PHONY: awesome
 

-qutebrowser: ~/.config
-       ln -sfT $(APATH)/qutebrowser ~/.config/qutebrowser
-       mkdir -p ~/downloads
-.PHONY: qutebrowser
+dircolors: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/dircolors $(XDG_CONFIG_HOME)/dircolors
+.PHONY: dircolors
+
+gdb:
+       mkdir $(XDG_DATA_HOME)/gdb
+       ln -sfT $(APATH)/gdb $(XDG_CONFIG_HOME)/gdb
+       ln -sfT $(APATH)/gdbinit ~/.gdbinit
+       ln -sfT $(APATH)/cgdb ~/.cgdb
+.PHONY: gdb
+
+git: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/git $(XDG_CONFIG_HOME)/git
+       ln -sfT $(APATH)/tig $(XDG_CONFIG_HOME)/tig
+.PHONY: git
+
+gnupg: systemd
+       ln -sfT $(APATH)/$@ $(XDG_CONFIG_HOME)/$@
+       chmod 700 $(XDG_CONFIG_HOME)/$@
+       systemctl --user enable gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
+       systemctl --user start gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
+.PHONY: gnupg

 
 mpd: systemd
 
 mpd: systemd

-       ln -sfT $(APATH)/mpd ~/.config/mpd
-       mkdir -p ~/.local/share/mpd/playlists
+       ln -sfT $(APATH)/mpd $(XDG_CONFIG_HOME)/mpd
+       mkdir -p $(XDG_DATA_HOME)/mpd/playlists

        systemctl --user enable mpd
        systemctl --user start mpd
 .PHONY: mpd
 
        systemctl --user enable mpd
        systemctl --user start mpd
 .PHONY: mpd
 

-ncmpcpp:
-       ln -sfT $(APATH)/ncmpcpp ~/.config/ncmpcpp
-       mkdir -p ~/.local/share/mpd/lyrics
+mbsync:
+       ln -sfT $(APATH)/mbsync $(XDG_CONFIG_HOME)/mbsync
+.PHONY: mbsync
+
+msmtp:
+       ln -sfT $(APATH)/msmtprc ~/.msmtprc
+       ln -sfT $(APATH)/msmtp ~/.msmtp
+.PHONY: msmtp
+
+mutt: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/mutt $(XDG_CONFIG_HOME)/mutt
+.PHONY: mutt
+
+mail: mbsync msmtp mutt
+.PHONY: mail
+
+ncmpcpp: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/ncmpcpp $(XDG_CONFIG_HOME)/ncmpcpp
+       mkdir -p $(XDG_DATA_HOME)/mpd/lyrics

 .PHONY: ncmpcpp
 
 .PHONY: ncmpcpp
 

-systemd:
-       ln -sfT $(APATH)/$@ ~/.config/$@
-.PHONY: systemd
+qutebrowser: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/qutebrowser $(XDG_CONFIG_HOME)/qutebrowser
+       mkdir -p ~/downloads
+.PHONY: qutebrowser

 
 

-zsh:
-       ln -sfT $(APATH)/zshrc ~/.zshrc
-       ln -sfT $(APATH)/zprofile ~/.zprofile
-       ln -sfT $(APATH)/zshenv ~/.zshenv
-       ln -sfT $(APATH)/zsh ~/.config/zsh
-       mkdir -p ~/.cache/zsh
-.PHONY: zsh
+ssh:
+       ln -sfT $(APATH)/ssh/config ~/.ssh/config
+.PHONY: ssh

 
 

-xprofile:
-       ln -sfT $(APATH)/xprofile ~/.xprofile
-.PHONY: xprofile
+systemd: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/$@ $(XDG_CONFIG_HOME)/$@
+.PHONY: systemd

 
 

-dircolors:
-       ln -sfT $(APATH)/dircolors ~/.config/dircolors
-.PHONY: dircolors
+task: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/taskrc $(XDG_CONFIG_HOME)/taskrc
+.PHONY: task

 
 

-urxvt:
-       ln -sfT $(APATH)/urxvt ~/.config/urxvt
+urxvt: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/urxvt $(XDG_CONFIG_HOME)/urxvt

 .PHONY: urxvt
 
 .PHONY: urxvt
 

-$(FILES): 
+vim: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/vim $(XDG_CONFIG_HOME)/vim
+       mkdir -p $(XDG_DATA_HOME)/vim
+       -git clone https://github.com/gmarik/vundle $(XDG_DATA_HOME)/vim/vundle
+.PHONY: vim
+
+yay: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/yay $(XDG_CONFIG_HOME)/yay
+       mkdir -p $(XDG_CACHE_HOME)/yay
+
+xinit: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/$@rc ~/.$@rc
+       ln -sfT $(APATH)/$@   $(XDG_CONFIG_HOME)/$@
+.PHONY: xinit
+
+weechat: $(XDG_CONFIG_HOME) $(XDG_CACHE_HOME)
+       ln -sfT $(APATH)/weechat $(XDG_CONFIG_HOME)/weechat
+       mkdir -p $(XDG_CACHE_HOME)/weechat
+.PHONY: weechat
+
+
+zsh: $(XDG_CONFIG_HOME)
+       ln -sfT $(APATH)/zshrc ~/.zshrc
+       ln -sfT $(APATH)/zshenv ~/.zshenv
+       ln -sfT $(APATH)/zsh $(XDG_CONFIG_HOME)/zsh
+       ln -sfT $(APATH)/aliases $(XDG_CONFIG_HOME)/aliases
+       mkdir -p $(XDG_CACHE_HOME)/zsh
+       mkdir -p $(XDG_DATA_HOME)/zsh
+.PHONY: zsh
+
+$(FILES):

        @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
            if [[ -d $@ ]]; then \
              cp -r ~/$@/* $@; \
        @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
            if [[ -d $@ ]]; then \
              cp -r ~/$@/* $@; \


@@ -69,10 +133,10 @@ $(FILES):
              cp -r ~/$@ $@; \
            fi; \
            rm -r ~/$@; \
              cp -r ~/$@ $@; \
            fi; \
            rm -r ~/$@; \

-       fi; 
+       fi;

        ln -sfT $(APATH)/$@ ~/$@
 
        ln -sfT $(APATH)/$@ ~/$@
 

-$(DOTFILES): 
+$(DOTFILES):

        @if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
            if [[ -d .$@ ]]; then \
              cp -r ~/.$@/* $@; \
        @if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
            if [[ -d .$@ ]]; then \
              cp -r ~/.$@/* $@; \


@@ -80,16 +144,16 @@ $(DOTFILES):
              cp -r ~/.$@ $@; \
            fi; \
            rm -r ~/.$@; \
              cp -r ~/.$@ $@; \
            fi; \
            rm -r ~/.$@; \

-       fi; 
+       fi;

        ln -sfT $(APATH)/$@ ~/.$@
 
        ln -sfT $(APATH)/$@ ~/.$@
 

-$(CONFIGFILES):  ~/.config
-       @if [[ -e ~/.config/$@ && ! -L ~/.config/$@ ]]; then \
+$(CONFIGFILES):  $(XDG_CONFIG_HOME)
+       @if [[ -e $(XDG_CONFIG_HOME)/$@ && ! -L $(XDG_CONFIG_HOME)/$@ ]]; then \

            if [[ -d .config/$@ ]]; then \
            if [[ -d .config/$@ ]]; then \

-             cp -r ~/.config/$@/* $@; \
+             cp -r $(XDG_CONFIG_HOME)/$@/* $@; \

            else \
            else \

-             cp -r ~/.config/$@ $@; \
+             cp -r $(XDG_CONFIG_HOME)/$@ $@; \

            fi; \
            fi; \

-           rm -r ~/.config/$@; \
-       fi; 
-       ln -sfT $(APATH)/$@ ~/.config/$@
+           rm -r $(XDG_CONFIG_HOME)/$@; \
+       fi;
+       ln -sfT $(APATH)/$@ $(XDG_CONFIG_HOME)/$@