diff --git a/.gitignore b/.gitignore index 8e6aedd..b0250db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pwfonts/ +bin/bin diff --git a/bash_aliases b/bash_aliases index a46ca26..0aa9d15 100644 --- a/bash_aliases +++ b/bash_aliases @@ -51,7 +51,7 @@ doPsKill(){ } alias pskill=doPsKill -if ! type "docker" > /dev/null; then +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}")' diff --git a/install.sh b/install.sh index 7cdd303..80d90cc 100755 --- a/install.sh +++ b/install.sh @@ -37,6 +37,7 @@ git clone https://github.com/powerline/fonts.git pwfonts cd pwfonts && ./install.sh echo "Setting up zsh" +git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh OMF=~/.oh-my-zsh/oh-my-zsh.sh if [ ! -f $OMF ]; then @@ -49,9 +50,9 @@ 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 python-pip -sudo pip install livereload - +sudo apt -y install exuberant-ctags build-essential cmake python-dev vim-youcompleteme autojump nodejs htop ncdu python-pip byobu zsh +sudo pip install livereload speedtest-cli virtualenv virtualenvwrapper +chsh -s /bin/zsh git clone git@github.com:fergalmoran/vimfiles.git ~/.vim ln -s ~/.vim/.vimrc ~/.vimrc @@ -59,4 +60,9 @@ ln -s ~/.vim/.vimrc ~/.vimrc cd ~/.vim git submodule init git submodule update +vim +BundleInstall +qall + +git config --global user.email "fergal.moran@gmail.com" +git config --global user.name "Fergal Moran" + diff --git a/zshrc b/zshrc index be10b53..f4a594d 100644 --- a/zshrc +++ b/zshrc @@ -2,7 +2,7 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH=/home/fergalm/.oh-my-zsh +export ZSH=~/.oh-my-zsh # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded.