diff --git a/bash_aliases b/bash_aliases index b10fde3..86b47fd 100644 --- a/bash_aliases +++ b/bash_aliases @@ -50,8 +50,9 @@ doPsKill(){ } alias pskill=doPsKill -alias docker-nuke="docker rm $(docker ps -a -q) && docker rmi $(docker images -q)" -alias dc='docker-compose' -alias docker-rm-untagged='docker rmi -f $(docker images | grep "^" | awk "{print $3}")' - +if ! type "docker" > /dev/null; then + alias docker-nuke="docker rm $(docker ps -a -q) && docker rmi $(docker images -q)" + alias dc='docker-compose' + alias docker-rm-untagged='docker rmi -f $(docker images | grep "^" | awk "{print $3}")' +fi diff --git a/install.sh b/install.sh index 9b51c07..138d922 100755 --- a/install.sh +++ b/install.sh @@ -45,3 +45,20 @@ fi # Setup default locales sudo locale-gen "en_IE.UTF-8" + +#install default packages +curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - + +sudo apt -y install exuberant-ctags build-essential cmake python-dev vim-youcompleteme autojump nodejs htop ncdu + + + + + +git clone git@github.com:fergalmoran/vimfiles.git ~/.vim +ln -s ~/.vim/.vimrc ~/.vimrc + +cd ~/.vim +git submodule init +git submodule update +