aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2016-11-14 16:57:51 +0100
committerJoris2016-11-14 16:57:51 +0100
commitf5c6d4769363dae5d55ea900a6ca885cb02e41e7 (patch)
tree3f73d6f4a1e66877bbdd62125df4147d2255186a
parent11b77ffc8b283260a9781aa12189ac7ed469f318 (diff)
Update tooling
-rw-r--r--.tmuxinator.yml2
-rw-r--r--Makefile5
-rw-r--r--README.md2
-rwxr-xr-xbuild2
-rwxr-xr-xdev2
-rw-r--r--shell.nix5
6 files changed, 9 insertions, 9 deletions
diff --git a/.tmuxinator.yml b/.tmuxinator.yml
index 34b8cc4..518c502 100644
--- a/.tmuxinator.yml
+++ b/.tmuxinator.yml
@@ -1,4 +1,4 @@
-name: sharedCost
+name: leboncoin-listener
windows:
- main:
diff --git a/Makefile b/Makefile
index 7f2c9d4..e87bf64 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,17 @@ all: build
clean:
@cabal clean > /dev/null
- @rm -r node_modules >/dev/null 2>&1 || true
install:
@cabal2nix --shell . > leboncoin-listener.nix
@nix-shell leboncoin-listener.nix -I ~ --command 'cabal configure'
- @npm install
watch:
- @./node_modules/nodemon/bin/nodemon.js -e hs,conf --exec 'make build-and-launch'
+ @nodemon -e hs,conf --exec 'make build-and-launch'
build-and-launch:
@(pkill leboncoin-listener || true) && (cabal run || true)
+.PHONY: build
build:
@cabal build || true
diff --git a/README.md b/README.md
index 2d17e1c..41acb3f 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ curl https://nixos.org/nix/install | sh
Inside the project directory, open a nix shell:
```
-nix-shell
+./dev
```
Configuration
diff --git a/build b/build
new file mode 100755
index 0000000..9e5cca5
--- /dev/null
+++ b/build
@@ -0,0 +1,2 @@
+#!/bin/sh
+nix-shell --command "make clean install build"
diff --git a/dev b/dev
new file mode 100755
index 0000000..ddd2ada
--- /dev/null
+++ b/dev
@@ -0,0 +1,2 @@
+#!/bin/sh
+nix-shell --command "tmuxinator local"
diff --git a/shell.nix b/shell.nix
index cc4be36..64bbcc9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,10 +6,7 @@ with import <nixpkgs> {}; {
cabal2nix
tmux
tmuxinator
+ nodePackages.nodemon
];
- shellHook = ''
- tmux kill-session -t leboncoin-listener >/dev/null 2>&1
- tmuxinator local
- '';
};
}