From 7f1ddd1d21e8d444f742cc5819fa0a959f5534d2 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Thu, 5 Mar 2020 17:33:50 +0100
Subject: Removing tmux, profile Refactoring zsh and vim config

---
 Makefile | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6a759c0..f75bbc8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,13 @@
-DOTDIR = $(HOME)/dotfiles
-ZSHRC = .zshrc
-VIMRC = .vimrc
-TMUXCONF = .tmux.conf
-BASHRC = .bashrc
+DOTDIR    = $(HOME)/dotfiles
+ZSHRC     = .zshrc
+VIMRC     = .vimrc
+BASHRC    = .bashrc
 BASHALIAS = .bash_aliases
-PROFILE = .profile
-GHCI = .ghci
-GDB = .gdbinit
+GHCI      = .ghci
+GDB       = .gdbinit
 GITCONFIG = .gitconfig
-CONFFILES = $(HOME)/$(ZSHRC) $(HOME)/$(VIMRC) $(HOME)/$(TMUXCONF) $(HOME)/$(BASHRC) \
-			$(HOME)/$(BASHALIAS) $(HOME)/$(PROFILE) $(HOME)/$(GHCI) $(HOME)/$(GDB) \
-			$(HOME)/$(GITCONFIG)
+XMONADCONFIG = .xmonad/xmonad.hs
+CONFFILES = $(addprefix $(HOME), $(ZSHRC) $(VIMRC) $(BASHRC) $(BASHALIAS) $(GHCI) $(GDB) $(GITCONFIG)) $(XMONADCONFIG)
 
 .PHONY: all
 all: $(CONFFILES)
@@ -23,10 +20,6 @@ $(HOME)/$(VIMRC): $(DOTDIR)/$(VIMRC)
 	touch $@
 	echo "so $<" > $@
 
-$(HOME)/$(TMUXCONF): $(DOTDIR)/$(TMUXCONF)
-	touch $@
-	echo "source-file $<" > $@
-
 $(HOME)/$(BASHRC): $(DOTDIR)/$(BASHRC)
 	touch $@
 	echo "source $<" > $@
@@ -35,10 +28,6 @@ $(HOME)/$(BASHALIAS): $(DOTDIR)/$(BASHALIAS)
 	touch $@
 	echo "source $<" > $@
 
-$(HOME)/$(PROFILE): $(DOTDIR)/$(PROFILE)
-	touch $@
-	echo "source $<" > $@
-
 $(HOME)/$(GHCI): $(DOTDIR)/$(GHCI)
 	touch $@
 	cat $< > $@
@@ -51,6 +40,9 @@ $(HOME)/$(GITCONFIG): $(DOTDIR)/$(GITCONFIG)
 	touch $@
 	cat $< >> $@
 
+$(HOME)/$(XMONADCONFIG): $(DOTDIR)/xmonad.hs
+	cp $< $@
+
 .PHONY: clean
 clean:
 	rm -f $(CONFFILES)
-- 
cgit