From c48fae6cc0afd543e2b292ea48c3258b8d4c89be Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@occitech.fr>
Date: Tue, 28 Mar 2017 08:15:41 +0200
Subject: [PATCH] Improve local tooling

---
 .zshrc       | 8 ++++++++
 bin/composer | 2 +-
 bin/node     | 2 +-
 bin/npm      | 2 +-
 bin/php      | 2 +-
 bin/yarn     | 2 +-
 dotfiles.yml | 3 +++
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.zshrc b/.zshrc
index 5e8857a..70a8f75 100644
--- a/.zshrc
+++ b/.zshrc
@@ -65,4 +65,12 @@ caddy() {
 
 ngrok() {
   docker run --rm -it --link "$1":http wernight/ngrok ngrok http http:"$2"
+}
+
+ctop() {
+  docker run -ti -v /var/run/docker.sock:/var/run/docker.sock quay.io/vektorlab/ctop:latest
+}
+
+jq() {
+  docker run -i pinterb/jq:latest $@
 }
\ No newline at end of file
diff --git a/bin/composer b/bin/composer
index 7b6c1f7..e090f38 100644
--- a/bin/composer
+++ b/bin/composer
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -ti --rm --name composer-${PWD##*/} -v $(pwd):/app -v ~/.composer:/root/composer composer/composer "$@"
+docker run -ti --rm --name composer-${PWD##*/} -v $(pwd):$(pwd) -w $(pwd) -v ~/.composer:/root/composer composer/composer "$@"
diff --git a/bin/node b/bin/node
index 9782bf9..5f169b0 100644
--- a/bin/node
+++ b/bin/node
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -ti --rm --name node-${PWD##*/} -v `pwd`:/project -v ~/.npm:/root/.npm -w /project node:7.4-alpine node "$@"
\ No newline at end of file
+docker run -ti --rm --name node-${PWD##*/} -v -v $(pwd):$(pwd) -w $(pwd) -v ~/.npm:/root/.npm node:7.4-alpine node "$@"
\ No newline at end of file
diff --git a/bin/npm b/bin/npm
index 6b7b527..0c514a0 100644
--- a/bin/npm
+++ b/bin/npm
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -ti --rm --name npm-${PWD##*/} -e NPM_CONFIG_PROGRESS=false -v `pwd`:/project -v ~/.npm:/root/.npm -w /project node:7.4-alpine npm "$@"
\ No newline at end of file
+docker run -ti --rm --name npm-${PWD##*/} -e NPM_CONFIG_PROGRESS=false -v $(pwd):$(pwd) -w $(pwd) -v ~/.npm:/root/.npm node:7.4-alpine npm "$@"
\ No newline at end of file
diff --git a/bin/php b/bin/php
index 1d38559..3a1f675 100644
--- a/bin/php
+++ b/bin/php
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -ti --rm --user 1000:1000 --name php-${PWD##*/} -v `pwd`:/project -w /project php:latest php "$@"
\ No newline at end of file
+docker run -ti --rm --user 1000:1000 --name php-${PWD##*/} -v $(pwd):$(pwd) -w $(pwd) php:latest php "$@"
\ No newline at end of file
diff --git a/bin/yarn b/bin/yarn
index e30f3e9..033fd90 100644
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -ti --rm --user 1000:1000 --name yarn-${PWD##*/} -v `pwd`:/project -v ~/.yarn:/home/node/.cache/yarn -w /project kkarczmarczyk/node-yarn:latest yarn "$@"
\ No newline at end of file
+docker run -ti --rm --user 1000:1000 --name yarn-${PWD##*/} -v ~/.yarn:/home/node/.cache/yarn -v $(pwd):$(pwd) -w $(pwd) kkarczmarczyk/node-yarn:latest yarn "$@"
\ No newline at end of file
diff --git a/dotfiles.yml b/dotfiles.yml
index 3de907f..f08b401 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -137,6 +137,7 @@
       tags: tools
       with_items:
        - http-prompt
+       - httpie-oauth
     - name: Thinkpad related packages are installed
       apt: name={{ item }} state=present
       tags: thinkpad
@@ -188,6 +189,8 @@
 #       listen-address=127.0.0.1
 #       listen-address=172.17.0.1
 #
+# https://github.com/sindresorhus/pure#getting-started instead of oh-my-zsh
+#
 # i3 bugfixes/improvements:
 #   ++ http://www.draconianoverlord.com/2014/05/26/from-xmonad-to-i3.html
 #