diff --git a/.bashrc b/.bashrc
index 23afed4..583df93 100644
--- a/.bashrc
+++ b/.bashrc
@@ -128,3 +128,12 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+
+# Junit setup
+export JUNIT_HOME=/home/andrei/.junit
+export CLASSPATH=$JUNIT_HOME/junit4.12.jar:$JUNIT_HOME/hamcrest-core-1.3.jar
+
+# editor setup
+export VISUAL=vim
+export EDITOR="$VISUAL"
+
diff --git a/.gitconfig b/.gitconfig
index 169b934..ebd02b2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,3 +15,6 @@
    lol = log --decorate --pretty=oneline --abbrev-commit
    lg = log --pretty=format:'%C(auto) %h,%C(green) \"%s\"%Creset, %aN,%C(blue) %cD'
 
+[core]
+	editor = vim
+	autocrlf = input
diff --git a/.tmux.conf##Linux b/.tmux.conf##Linux
index 70ade64..2e816d7 100644
--- a/.tmux.conf##Linux
+++ b/.tmux.conf##Linux
@@ -23,3 +23,7 @@ set-window-option -g mode-keys vi
 
 # status bar
 set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y '
+
+# default shell
+set -g default-terminal "screen-256color" /bin/bash
+#set-option -g default-shell /bin/bash
diff --git a/.vimrc b/.vimrc
index 1071f84..2cf1484 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,6 +12,7 @@ set autoindent
 set shiftwidth=2
 set smartindent
 set softtabstop=2
+set tabstop=2
 set ruler
 set undolevels=1000
 set backspace=indent,eol,start