From 76a12851f55d1c3b64d0137b60238c8e40e3ce15 Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@occitech.fr>
Date: Wed, 15 Jun 2016 07:18:07 +0200
Subject: [PATCH] Editors updates and HTTPie not in docker anymore

... because it sucks at some point to have a tool using network in docker
---
 .zshrc           |  1 -
 dotfiles.yml     | 33 ++++++++++++++++++++++++++-------
 requirements.txt |  3 ++-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.zshrc b/.zshrc
index a0cf954..23d7739 100644
--- a/.zshrc
+++ b/.zshrc
@@ -28,7 +28,6 @@ source $ZSH/oh-my-zsh.sh
 export EDITOR='vim'
 
 # Convenient aliases
-alias http='docker run -it --rm --name http-${PWD##*/} -v /etc/hosts:/etc/hosts:ro --net=host clue/httpie'
 alias dc=docker-compose
 alias dcr='docker-compose run --rm'
 alias copy="xclip -selection c"
diff --git a/dotfiles.yml b/dotfiles.yml
index 7cc49d3..f404a37 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -1,7 +1,7 @@
 ---
 - name: Setup the machine as a root user
   hosts: localhost
-  become: yes 
+  become: yes
   roles:
     - {
         role: flyinggecko.i3,
@@ -29,7 +29,7 @@
     - {
         role: kosssi.phpstorm,
         tags: phpstorm,
-        phpstorm_version: "2016.1"
+        phpstorm_version: "2016.1.2"
       }
     - {
         role: ansiblebit.oracle-java,
@@ -54,7 +54,7 @@
     - {
         role: franklinkim.docker-compose,
         tags: docker,
-        docker_compose_version: 1.4.1
+        docker_compose_version: 1.7.0
       }
     - {
         role: glennr.oh-my-zsh,
@@ -68,9 +68,20 @@
       }
     - {
         role: jdauphant.sublimetext,
-        sublimetext_build: 3103,
+        sublimetext_build: 3114,
         tags: sublimetext
       }
+    - {
+        role: mglaman.atom,
+        atom_ver : '1.8.0',
+        atom_packages_packages: [
+          'docker',
+          'editorconfig',
+          'git-time-machine',
+          'minimap',
+        ],
+        tags: atom
+      }
   tasks:
     - name: Window manager related packages are installed
       apt: name={{ item }} state=present
@@ -95,7 +106,7 @@
        - curl
        - filezilla
        - freemind
-       - kazam 
+       - kazam
        - gimp
        - htop
        - libreoffice
@@ -108,11 +119,17 @@
        - exfat-utils
        - exfat-fuse
        - ncdu
+       - python-pip
        - tree
        - unison
        - whois
        - xclip
        - zeal
+    - name: Other convenient Python tools are installed
+      pip: name={{ item }}
+      tags: tools
+      with_items:
+       - http-prompt
     - name: Thinkpad related packages are installed
       apt: name={{ item }} state=present
       tags: thinkpad
@@ -192,8 +209,10 @@
 # http://askubuntu.com/questions/292696/ubuntu-crashes-when-on-battery-power
 #   ou http://askubuntu.com/questions/598224/cpu-frequency-control ou truc du genre
 #
-# Chrome : 
+# Chrome :
 # - { role: devbox.chrome, tags: browser }
-# 
+#
+# https://github.com/donnemartin/gitsome/blob/master/README.md
+#
 # Refactoring:
 #   Nginx-proxy: move the config file by copying it where it belongs
diff --git a/requirements.txt b/requirements.txt
index e2b8209..15260a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,5 @@ franklinkim.docker-compose
 glennr.oh-my-zsh
 devbox.chrome
 flyinggecko.i3
-nickjj.dnsmasq
\ No newline at end of file
+nickjj.dnsmasq
+mglaman.atom
\ No newline at end of file