Merge branch 'master' of github.com:skaterdude97/dotfiles

.bash_aliases

@@ -2,8 +2,10 @@ alias clj='rlwrap java -cp ~/Clojure/clojure-1.8.0.jar clojure.main'
 alias ll='ls -l'
 alias la='ls -A'
 alias l='ls -CF'
-alias gpwd="pwd | xclip -i"
+alias gpwd='pwd | xclip -i -selection clipboard'
-alias cdpwd="cd \$(xclip -o)"
+alias cdclip="cd \$(xclip -o -selection clipboard)"
+alias clipi='xclip -i -selection clipboard'
+alias clipo='xclip -o -selection clipboard'
 alias ml='livestreamer --config ~/.livestreamerrc -v'
 alias jblive='mpv rtmp://jblive.videocdn.scaleengine.net/jb-live/play/jblive.stream'
 alias twit='livestreamer --config ~/.livestreamerrc -v http://www.ustream.tv/leolaporte'

.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"
+

.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

.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

.tmux.conf##Linux.a-server

@@ -0,0 +1,29 @@
+# remap prefix from 'C-b' to 'C-a'
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# Enable mouse control (clickable windows, panes, resizable panes)
+set -g mouse on
+
+# Initialize sesions
+bind W source-file ~/.tmux/work
+
+# reload config
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
+
+# spliting windoww
+unbind %
+unbind '"'
+bind | split-window -h
+bind - split-window -v
+
+# setting vi mode
+set-window-option -g mode-keys vi
+
+# status bar
+set -g status-right '%H:%m %d-%b-%y '
+
+# default shell
+set -g default-terminal "screen-256color" /bin/bash
+#set-option -g default-shell /bin/bash

.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