1 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index e350236..446fb18 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,21 @@ start:
 	@nix-shell --command "tmuxinator local"
 
 stop:
-	@nix-shell --command "tmux kill-session -t personalPage"
+	@tmux kill-session -t personalPage
 
 clean:
-	@cabal new-clean > /dev/null
+	@stack exec personalPage clean > /dev/null 2>&1 || true
+	@stack clean > /dev/null
 
-watch:
-	@nodemon --watch src/ application.conf ./data.yaml resume/ --ext hs,conf,yaml,cls --exec 'clear && make build-and-launch-server --silent'
-
-build-and-launch-server:
-	@(pkill personalPage || true) && (cabal new-run || true)
+install:
+	@stack setup
 
-.PHONY: build
 build:
-	@cabal new-build || true
+	@stack build
+	@stack exec personalPage build
+
+watch:
+	@nodemon --watch src -e hs --exec 'make watch-command --silent'
+
+watch-command:
+	@(killall personalPage || :) && sleep 1 && stack build && stack exec personalPage clean && stack exec personalPage watch