diff --git a/.bashrc b/.bashrc index daaa2d3..bc27926 100644 --- a/.bashrc +++ b/.bashrc @@ -1,79 +1,3 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ] && ! shopt -oq posix; then - . /etc/bash_completion -fi - prompt_command() { retval=$? branch=""; diff --git a/setup.sh b/setup.sh index a01906c..15b3317 100644 --- a/setup.sh +++ b/setup.sh @@ -2,11 +2,13 @@ pushd ~ sudo apt-get update -sudo apt-get install vim tmux git fluxbox aptitude default-jdk default-jdk-doc +sudo apt-get install vim tmux git fluxbox aptitude default-jdk default-jdk-doc fontconfig apt-file thefuck libxft-dev +sudo apt-file update mkdir ~/projects ~/programs ~/temp git clone _git@git.jdb-labs.com:jdb/dotfile temp/dotfiles cd ~/temp/dotfiles cp -r .fonts .tmux.conf .vimrc .vim .bash_aliases .gitconfig .screenrc .Xdefaults .config .gradle .xinitrc ~ +cat .bashrc >> ~/.bashrc # VIM mkdir -p ~/.vim/autoload ~/.vim/bundle && \ @@ -40,8 +42,8 @@ echo 'export PATH="$PATH:$GROOVY_HOME/bin:$GRADLE_HOME/bin"' >> ~/.profile # Setup Nim cd ~/programs -git clone https://github.com/nim-lang/Nim.git -cd Nim +git clone https://github.com/nim-lang/Nim.git nim +cd nim git clone --depth 1 https://github.com/nim-lang/csources cd csources && sh build.sh cd .. @@ -52,6 +54,8 @@ cd ~/programs git clone https://github.com/nim-lang/nimble cd nimble nim c -r src/nimble install -echo 'export PATH=$PATH:$HOME/.nimble/bin' >> ~/.profile + +echo 'export NIM_HOME="$HOME/programs/nim"' >> ~/.profile +echo 'export PATH="$PATH:$NIM_HOME/bin:$HOME/.nimble/bin"' >> ~/.profile popd