add huge (bad ?) vimrc, fix path

diff --git a/.bash_aliases b/.bash_aliases
index e5ff6db7011b543ba588f92e4882a3a4a68b31f1..b9941c685d29e9bf8552f70b425a408199c6d80b 100644 (file)
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -73,3 +73,5 @@ alias dk='sudo docker run -i -t'
 alias py='python'
 alias ipy='ipython'
 
 alias py='python'
 alias ipy='ipython'
 

+alias dr='./manage.py runserver 9000'
+

diff --git a/.bashrc b/.bashrc
index 64ad5ea32481aa49b7efef5ba0e571785bf40c93..78dbc7ba73dfebfe809ab79330be368b04295b0e 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -105,7 +105,7 @@ export PATH=$PATH:~/bin:/usr/local/sbin:/usr/sbin:/sbin:$ANDROID_HOME
 export CONCURRENCY_LEVEL=4
 
 export PYTHONDONTWRITEBYTECODE=True
 export CONCURRENCY_LEVEL=4
 
 export PYTHONDONTWRITEBYTECODE=True

-export PYTHONPATH=$PYTHONPATH:~/dev/timeside/timeside:~/dev/telemeta/telemeta:~/dev/deefuzzer/deefuzzer
+export PYTHONPATH=$PYTHONPATH:~/dev/timeside/timeside:~/dev/telemeta/telemeta:~/dev/deefuzzer/deefuzzer:~/dev/timeside/plugins/timeside-diadems

 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 
 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 

diff --git a/.vimrc b/.vimrc
index e9abef59f68ea46cf7afe47ec3724e5d7318605d..05fb85486d5121261a8e2f8669263d260dad2357 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1 +1,34 @@
 syntax on
 syntax on

+filetype indent plugin on
+set smartindent
+set tabstop=4
+set shiftwidth=4
+set expandtab
+set noswapfile
+set nobackup
+set background=dark
+set modeline
+"set paste
+"set nopaste
+"set clipboard=unnamed
+set mouse=a
+
+" vim-powerline settings
+set nocompatible   " Disable vi-compatibility
+set laststatus=2   " Always show the statusline
+set encoding=utf-8 " Necessary to show Unicode glyphs
+set t_Co=256 " Explicitly tell Vim that the terminal supports 256 colors
+" indentLine char
+let g:indentLine_char = ' '
+" Pathogen load
+filetype off
+call pathogen#infect()
+call pathogen#helptags()
+filetype plugin indent on
+:colorscheme molokai
+let g:molokai_original = 1
+
+"autocmd VimEnter * NERDTree
+"autocmd BufEnter * NERDTreeMirror
+
+"autocmd VimEnter * wincmd w