Update

Signed-off-by: Jacob Kiers <jacob@jacobkiers.net>

includes/bash_aliases.bash

@@ -15,14 +15,10 @@ 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,9 +24,6 @@ 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
 
@@ -43,16 +40,13 @@ if command -v apt >/dev/null 2>&1; then
     # Install apt packages
     sudo apt install -y \
         chromium-browser \
-        dkms virtualbox-5.1 \
+        dkms virtualbox-6.0 \
         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 \
@@ -60,14 +54,14 @@ if command -v apt >/dev/null 2>&1; then
 
     ## Docker Compose
     if [ ! -f /usr/local/bin/docker-compose ]; then
-        DOCKER_COMPOSE_VERSION=1.16.1
+        DOCKER_COMPOSE_VERSION=1.23.2
         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.0.0/vagrant_2.0.0_x86_64.deb -o vagrant.deb && sudo dpkg -i vagrant.deb && rm -rf vagrant.deb
+        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
     fi
 
 fi

tilde/bash_profile.bash

@@ -27,8 +27,8 @@ for option in autocd globstar; do
 done
 
 # Locale
-export LC_ALL=en_US.UTF-8
+export LC_ALL=en_GB.UTF-8
-export LANG="en_US"
+export LANG="en_GB"
 
 # Set the composer home.
 export COMPOSER_HOME="$HOME/.composer"
@@ -41,7 +41,7 @@ function _prepend_path() {
 }
 
 # Construct $PATH
-PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+PATH="/snap/bin:/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,3 +124,7 @@ 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,3 +1,5 @@
 # https://github.com/janmoesen/tilde/blob/master/.bashrc
 
-[ -n "$PS1" ] && source ~/.bash_profile;
+[ -n "$BASH_PROFILE_LOADED" ] && source ~/.bash_profile;
+
+[ -n "$PS1" ] && source ~/.bash_profile;

tilde/gitconfig

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

tilde/gitignore

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