bin/xdebug

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-VERSION=$1
-shift 1
-
 COMMAND=$1;
 shift 1
 
@@ -15,4 +12,4 @@ if [ ! -f "${COMMAND}" ]; then
     exit 1;
 fi
 
-PHP_IDE_CONFIG="serverName=local" XDEBUG_CONFIG="remote_enable=1 remote_mode=req remote_port=9000 remote_host=127.0.0.1 remote_connect_back=0" php$VERSION -d zend_extension=xdebug.so $COMMAND "$@"
+PHP_IDE_CONFIG="serverName=local" XDEBUG_CONFIG="remote_enable=1 remote_mode=req remote_port=9000 remote_host=127.0.0.1 remote_connect_back=0" php -d zend_extension=xdebug.so $COMMAND "$@"

includes/bash_aliases.bash

@@ -15,10 +15,14 @@ alias t="tmux"
 alias x+="chmod +x"
 alias +x="chmod +x"
 
+# Devstack
+alias comup='pushd ~/src/comandi/dashboard; vagrant up; popd'
+alias comdown='pushd ~/src/comandi/dashboard; vagrant halt; popd'
+
+
 if [ `uname` == 'Linux' ]; then
     alias open='xdg-open'
 fi
-
 # Remove all local branches already merged in master.
 alias gitclean='git branch --merged master | grep -v "\smaster$" | grep -v "*" | xargs --no-run-if-empty git branch -d'
 alias gist='gist -c'

setup/apps.sh

@@ -24,6 +24,9 @@ if command -v apt >/dev/null 2>&1; then
 
     # Add repositories
 
+    ## Hipchat
+    sudo sh -c 'echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client $(lsb_release -c -s) main" > /etc/apt/sources.list.d/atlassian-hipchat4.list'
+
     ## Ondrej PHP PPA
     sudo add-apt-repository -y ppa:ondrej/php
 
@@ -40,13 +43,16 @@ if command -v apt >/dev/null 2>&1; then
     # Install apt packages
     sudo apt install -y \
         chromium-browser \
-        dkms virtualbox-6.0 \
+        dkms virtualbox-5.1 \
         dnsmasq \
         docker-ce \
         git \
+        hipchat \
         htop \
         jq \
+        linux-image-extra-$(uname -r) linux-image-extra-virtual \
         mysql-workbench \
+        openjdk-9-jdk openjdk-8-jdk \
         scdaemon pcscd libccid \
         transmission \
         vim \
@@ -54,14 +60,14 @@ if command -v apt >/dev/null 2>&1; then
 
     ## Docker Compose
     if [ ! -f /usr/local/bin/docker-compose ]; then
-        DOCKER_COMPOSE_VERSION=1.23.2
+        DOCKER_COMPOSE_VERSION=1.16.1
         sudo curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose && sudo chmod +x /usr/local/bin/docker-compose
         sudo curl -L https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
     fi
 
     ## Vagrant
     if [ ! -f /usr/bin/vagrant ]; then
-        sudo curl -L https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb -o vagrant.deb && sudo dpkg -i vagrant.deb && rm -rf vagrant.deb
+        sudo curl -L https://releases.hashicorp.com/vagrant/2.0.0/vagrant_2.0.0_x86_64.deb -o vagrant.deb && sudo dpkg -i vagrant.deb && rm -rf vagrant.deb
     fi
 
 fi

tilde/bash_profile.bash

@@ -27,8 +27,8 @@ for option in autocd globstar; do
 done
 
 # Locale
-export LC_ALL=en_GB.UTF-8
+export LC_ALL=en_US.UTF-8
-export LANG="en_GB"
+export LANG="en_US"
 
 # Set the composer home.
 export COMPOSER_HOME="$HOME/.composer"
@@ -41,7 +41,7 @@ function _prepend_path() {
 }
 
 # Construct $PATH
-PATH="/snap/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 [ -d /usr/local/sbin ] && _prepend_path "/usr/local/sbin"
 [ -d /usr/local/bin ] && _prepend_path "/usr/local/bin"
 [ -f /usr/bin/npm ] && _prepend_path "./node_modules/.bin"      # Node.js
@@ -124,7 +124,3 @@ export PAGER='less'
 true
 
 export PATH="$HOME/.cargo/bin:$PATH"
-
-# Disable microsoft telemetry
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export BASH_PROFILE_LOADED=1

tilde/bashrc.bash

@@ -1,5 +1,3 @@
 # https://github.com/janmoesen/tilde/blob/master/.bashrc
 
-[ -n "$BASH_PROFILE_LOADED" ] && source ~/.bash_profile;
+[ -n "$PS1" ] && source ~/.bash_profile;
-
-[ -n "$PS1" ] && source ~/.bash_profile;

tilde/gitconfig

@@ -15,8 +15,7 @@
     editor = vim -f
     # http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
     # If doesn't work, try: pager = less -+$LESS -FRX
-    pager = less -RFX
+    pager = diff-highlight | less -RFX
-#    pager = diff-highlight | less -RFX
 #    pager = less -r
     autocrlf = false
     safecrlf = false
@@ -100,9 +99,3 @@
     templatedir = ~/dotfiles/resources/git-template
 [pull]
 	ff = yes
-#[commit]
-#        gpgSign = true
-[tag]
-	forceSignAnnotated = true
-[user]
-	signingkey = 6652F0F4418231A7

tilde/gitignore

@@ -1,4 +1,3 @@
-
 # Python stuff
 *.pyc
 VENV
@@ -24,4 +23,3 @@ bower_components
 # IDEs stuff
 .idea
 atlassian-ide-plugin.xml
-.vscode