diff --git a/bash/.bash_profile b/bash/.bash_profile
new file mode 100644
index 0000000..031ab84
--- /dev/null
+++ b/bash/.bash_profile
@@ -0,0 +1,12 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+	. ~/.bashrc
+fi
+
+# User specific environment and startup programs
+
+PATH=$PATH:$HOME/.local/bin:$HOME/bin
+
+export PATH
diff --git a/bash/.bashrc b/bash/.bashrc
new file mode 100644
index 0000000..b033df7
--- /dev/null
+++ b/bash/.bashrc
@@ -0,0 +1,21 @@
+# .bashrc
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+
+# User specific aliases and functions
+alias l.='ls -lh --color=auto' 2>/dev/null
+alias l='ls -lh'
+alias ll='ls -lh'
+set -o vi
+
+#golang stuff
+export GOPATH=$HOME/gopath
+export PATH=$GOPATH:$GOPATH/bin:$PATH
+
+export EDITOR=/usr/bin/vim
diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf
new file mode 100644
index 0000000..4751cf4
--- /dev/null
+++ b/conky/.config/conky/conky.conf
@@ -0,0 +1,61 @@
+-- vim: ts=4 sw=4 noet ai cindent syntax=lua
+--[[
+Conky, a system monitor, based on torsmo
+
+Any original torsmo code is licensed under the BSD license
+
+All code written since the fork of torsmo is licensed under the GPL
+
+Please see COPYING for details
+
+Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+All rights reserved.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+]]
+
+conky.config = {
+	own_window = true,
+    background = false,
+    cpu_avg_samples = 2,
+	default_color = 'white',
+    default_outline_color = 'white',
+    default_shade_color = 'white',
+    draw_borders = false,
+    draw_graph_borders = true,
+    draw_outline = false,
+    draw_shades = false,
+    use_xft = true,
+    font = 'Terminus',
+    gap_x = 5,
+    gap_y = 60,
+    minimum_height = 5,
+	minimum_width = 5,
+    net_avg_samples = 2,
+    no_buffers = true,
+    out_to_console = true,
+	out_to_x = false,
+    out_to_stderr = false,
+    extra_newline = false,
+    stippled_borders = 0,
+    update_interval = 1.0,
+    uppercase = false,
+    use_spacer = 'none',
+    show_graph_scale = false,
+    show_graph_range = false
+}
+
+conky.text = [[
+$loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %H:%M} ${time %m.%d}
+]]
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
new file mode 100644
index 0000000..d80683c
--- /dev/null
+++ b/tmux/.tmux.conf
@@ -0,0 +1,15 @@
+#change C-b to Ca
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+# enable mouse control (clickable windows, panes, resizable panes)
+# as of tmux 2.1 you can just do this ...
+set -g mouse on
+# stop tmux from renaming the window every time you run a command
+set-option -g allow-rename off
+set-option -g pane-active-border-fg blue
diff --git a/vim/.vim/bundle/SimpylFold b/vim/.vim/bundle/SimpylFold
new file mode 160000
index 0000000..9e7c1c9
--- /dev/null
+++ b/vim/.vim/bundle/SimpylFold
@@ -0,0 +1 @@
+Subproject commit 9e7c1c9d9bd7404dc136c184fcc9680fc36a8ed9
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
new file mode 160000
index 0000000..88688fe
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7
diff --git a/vim/.vim/bundle/ctrlp.vim b/vim/.vim/bundle/ctrlp.vim
new file mode 160000
index 0000000..564176f
--- /dev/null
+++ b/vim/.vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981
diff --git a/vim/.vim/bundle/indentpython.vim b/vim/.vim/bundle/indentpython.vim
new file mode 160000
index 0000000..6aaddfd
--- /dev/null
+++ b/vim/.vim/bundle/indentpython.vim
@@ -0,0 +1 @@
+Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
new file mode 160000
index 0000000..eee431d
--- /dev/null
+++ b/vim/.vim/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit eee431dbd44111c858c6d33ffd366cae1f17f8b3
diff --git a/vim/.vim/bundle/python-mode b/vim/.vim/bundle/python-mode
new file mode 160000
index 0000000..f7ccee5
--- /dev/null
+++ b/vim/.vim/bundle/python-mode
@@ -0,0 +1 @@
+Subproject commit f7ccee54743800ef2aab264dafeed3d5a4ec1fbd
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
new file mode 160000
index 0000000..78c0d21
--- /dev/null
+++ b/vim/.vim/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit 78c0d21a9b0329766732ca2743a848af1c49e791
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
new file mode 160000
index 0000000..b56a064
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline
@@ -0,0 +1 @@
+Subproject commit b56a064377fcd4340e60ffd9a7fcf157f8a26939
diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes
new file mode 160000
index 0000000..6026eb7
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline-themes
@@ -0,0 +1 @@
+Subproject commit 6026eb78bf362cb3aa875aff8487f65728d0f7d8
diff --git a/vim/.vim/bundle/vim-flake8 b/vim/.vim/bundle/vim-flake8
new file mode 160000
index 0000000..91818a7
--- /dev/null
+++ b/vim/.vim/bundle/vim-flake8
@@ -0,0 +1 @@
+Subproject commit 91818a7d5f5a0af5139e9adfedc9d00fa963e699
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
new file mode 160000
index 0000000..b754bc2
--- /dev/null
+++ b/vim/.vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37
diff --git a/vim/.vimrc b/vim/.vimrc
new file mode 100644
index 0000000..d980f13
--- /dev/null
+++ b/vim/.vimrc
@@ -0,0 +1,95 @@
+set nocompatible
+filetype off
+
+" general settings
+set encoding=utf-8
+let mapleader=","
+set nu
+set laststatus=2
+set hidden
+set incsearch
+
+" Indent settings - this is for PEP8 compatibility
+set expandtab
+set autoindent
+set tabstop=4
+set softtabstop=4
+set textwidth=79
+set shiftwidth=4
+set fileformat=unix
+
+set cursorline
+set showmatch
+let pythong_highlight_all = 1
+syntax on
+
+set foldmethod=indent
+set foldlevel=99
+
+" specify the location of the splits
+set splitbelow
+set splitright
+
+" remap ctrl + hjkl to move between splits
+nnoremap <C-j> <C-W><C-J>
+nnoremap <C-k> <C-W><C-K>
+nnoremap <C-l> <C-W><C-L>
+nnoremap <C-h> <C-W><C-H>
+" use jj to escape insert mode 
+inoremap jj <Esc>
+
+nnoremap <leader>l :ls<CR>:b<Space>
+nnoremap <Tab> :bnext<CR>
+nnoremap <S-Tab> :bprev<CR>
+
+nnoremap <leader>p :CtrlPBuffer<CR>
+nnoremap <space> za
+
+" NERDTree
+map <C-n> :NERDTreeToggle<CR>
+
+"airline - show buffers in the tabline if theres only one tab (always)
+let g:airline#extensions#tabline#enabled = 1
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" " let Vundle manage Vundle, required
+Plugin 'VundleVim/Vundle.vim'
+"
+Plugin 'tpope/vim-fugitive'
+Plugin 'kien/ctrlp.vim'
+Plugin 'scrooloose/nerdtree'
+Plugin 'tmhedberg/SimpylFold'
+Plugin 'vim-scripts/indentpython.vim'
+Plugin 'scrooloose/syntastic'
+" PEP8 checking plugin
+Plugin 'nvie/vim-flake8'
+"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
+"Plugin 'klen/python-mode'
+
+call vundle#end()            " required
+filetype plugin indent on    " required
+" "
+" " Brief help
+" " :PluginList       - lists configured plugins
+" " :PluginInstall    - installs plugins; append `!` to update or just
+" :PluginUpdate
+" " :PluginSearch foo - searches for foo; append `!` to refresh local cache
+" " :PluginClean      - confirms removal of unused plugins; append `!` to
+" auto-approve removal
+" "
+" " see :h vundle for more details or wiki for FAQ
+" " Put your non-Plugin stuff after this line
+
+"python with virtualenv support
+py << EOF
+import os
+import sys
+if 'VIRTUAL_ENV' in os.environ:
+    project_base_dir = os.environ['VIRTUAL_ENV']
+    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
+    execfile(activate_this, dict(__file__=activate_this))
+EOF