customize files

Xdefaults

@@ -1,39 +0,0 @@
-! rxvt-unicode ---------------------------------------------------------------
-urxvt*background: #000000
-urxvt*foreground: #949494
-! black
-urxvt*color0  : #0f0f0f
-urxvt*color8  : #666666
-! red
-urxvt*color1  : #AA0000
-urxvt*color9  : #EF2929
-! green
-urxvt*color2  : #4E9A06
-urxvt*color10 : #8AE234
-! yellow
-urxvt*color3  : #C4A000
-urxvt*color11 : #FCE94F
-! blue
-urxvt*color4  : #3465A4
-urxvt*color12 : #87d7ff
-! magenta
-urxvt*color5  : #75507B
-urxvt*color13 : #AD7FA8
-! cyan
-urxvt*color6  : #06cbdb
-urxvt*color14 : #34E2E2
-! white
-urxvt*color7  : #949494
-urxvt*color15 : #c4c4c4
-
-urxvt*geometry:          800x600
-urxvt*depth:             32
-urxvt*scrollBar:         false
-urxvt*font:              xft:ubuntumono:size=13,style=regular
-urxvt*boldFont:          xft:ubuntumono:size=13,style=bold
-
-urxvt*urgentOnBell:      true
-urxvt*saveLines:         32767
-
-urxvt*keysym.Home:       \033[1~
-urxvt*keysym.End:        \033[4~

gitconfig

@@ -1,16 +1,13 @@
 [user]
-    email = danieln@selfnet.de
-    name = Daniel Nägele
+    email = git@as-webservices.de
+    name = Arne Schauf
 [alias]
     ci = commit
     co = checkout
-    a = add
-    p = pull --ff-only
-    s = status -sb
+    sup = log --all --graph --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
     lv = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
     lg = log --graph --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
     grep = grep -Ii
-    ready = rebase -i @{u}
 [push]
     default = current
 [color]

init.sh

@@ -2,8 +2,5 @@ mkdir -p ~/.backup
 ln -snf `pwd`/vimrc ~/.vimrc
 ln -snf `pwd`/tmux.conf ~/.tmux.conf
 ln -snf `pwd`/zshrc.local ~/.zshrc.local
-ln -snf `pwd`/zshrc.pre ~/.zshrc.pre
 ln -snf `pwd`/gitconfig ~/.gitconfig
-ln -snf `pwd`/screenrc ~/.screenrc
-ln -snf `pwd`/Xdefaults ~/.Xdefaults
 wget -O ~/.zshrc http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc

screenrc

@@ -1,7 +0,0 @@
-vbell off
-bell_msg '^G'
-term screen-256color
-hardstatus alwayslastline '%{= kK}%{w}%H %{K}%= %{= kw}%?%-Lw%?%{B}(%{W}%n*%f %t%?(%u)%?%{B})%{w}%?%+Lw%?%?%= %{K}%{B} %{w}%c%{K}'
-startup_message off
-altscreen on
-defutf8 on

vimrc

@@ -5,6 +5,11 @@
 set nocompatible " vi compatibility off
 scriptencoding utf-8
 
+"" Vundle
+filetype off
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
 "" filetype plugin and syntax
 syntax on
 filetype indent plugin on
@@ -46,52 +51,9 @@ set hlsearch
 set incsearch
 set showmatch
 
-"####################################################################
-" visual style {{{
-"####################################################################
-"" colorscheme
-"colorscheme wombat256mod " set after the bundles at the end of this file!
-set background=dark
-set t_Co=256 " force more colors
-
-"" highlight the current line and column
-set cul
-set cuc
-
-"" statusbar
-set cmdheight=2
-set laststatus=2
-set showcmd
-
-"" linenumbers
 set number
-set relativenumber
-set ruler
-"" }}}
 
-"####################################################################
-" general auto commands {{{
-"####################################################################
-" autoremove trailing whitespace
-autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif
-
-" salt syntax highlighting
-au BufRead,BufNewFile *.sls set filetype=sls
-
-" arduino syntax highlightning
-au BufRead,BufNewFile *.ino set filetype=c
-"" }}}
-
-"####################################################################
-" keymaps {{{
-"####################################################################
-
-let mapleader = "\<Space>"
-
-" some easy ones
-nnoremap <Leader>o :CtrlP<CR>
-nnoremap <Leader>w :w<CR>
-nnoremap <Leader>q :wq<CR>
+let mapleader = ","
 
 " jump to visual lines
 nnoremap j gj
@@ -101,19 +63,9 @@ nnoremap k gk
 vnoremap < <gv
 vnoremap > >gv
 
-" replace dollar and acute
-nnoremap B ^
-nnoremap E $
-
-" highlight last inserted text
-nnoremap gV `[v`]
-
 " change Y from yy to y$
 map Y y$
 
-" alternative esc
-inoremap jk <esc>
-
 " remove search hl
 nnoremap <silent><C-C> :nohl<CR>
 
@@ -132,57 +84,31 @@ cmap w!! w !sudo tee %
 cmap ack Ack!
 cmap grep grep!
 
-"" }}}
-
-"####################################################################
-" autoinstall vundle and bundles {{{
-" Credit to: https://github.com/erikzaadi
-"####################################################################
-
-" automatic installation of vundle on fresh deployments
-let installed_vundle=0
+" Setting up Vundle - the vim plugin bundler
+let iCanHazVundle=1
 let vundle_readme=expand('~/.vim/bundle/vundle/README.md')
 if !filereadable(vundle_readme)
-    echo "Installing Vundle..."
+    echo "Installing Vundle.."
     echo ""
     silent !mkdir -p ~/.vim/bundle
     silent !git clone https://github.com/gmarik/vundle ~/.vim/bundle/vundle
-    let installed_vundle=1
+    let iCanHazVundle=0
 endif
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
-
-" begin bundles
 Bundle 'gmarik/vundle'
+
+if iCanHazVundle == 0
+    echo "Installing Bundles, please ignore key map error messages"
+    echo ""
+    :BundleInstall
+endif
+
 Bundle 'myusuf3/numbers.vim'
 Bundle 'tpope/vim-fugitive'
 Bundle 'Lokaltog/vim-easymotion'
 Bundle 'kien/ctrlp.vim'
 Bundle 'scrooloose/nerdtree'
-Bundle 'tomtom/tcomment_vim'
-Bundle 'vim-scripts/taglist.vim'
-Bundle 'saltstack/salt-vim'
-Bundle 'vim-scripts/wombat256.vim'
-Bundle 'bling/vim-airline'
-Bundle 'goldfeld/vim-seek'
-Bundle 'davidhalter/jedi-vim'
-Bundle 'airblade/vim-gitgutter'
-Bundle 'ivyl/vim-bling'
-Bundle 'mileszs/ack.vim'
-Bundle 'sjl/gundo.vim'
-Bundle 'terryma/vim-expand-region'
-"Bundle 'Yggdroot/indentLine' " good with my urxvt config: let g:indentLine_color_term = 239
-
-if installed_vundle == 1
-    :BundleInstall
-endif
-"" }}}
-
-"####################################################################
-" bundle options {{{
-"####################################################################
-
-" NERDTree
 nnoremap <silent><leader>f :NERDTreeToggle<Cr>
 let NERDTreeShowBookmarks=1
 let NERDTreeIgnore=['\.pyc', '\~$', '\.swo$', '\.swp$', '\.git', '\.hg', '\.svn', '\.bzr']
@@ -191,45 +117,29 @@ let NERDTreeQuitOnOpen=1
 let NERDTreeMouseMode=2
 let NERDTreeShowHidden=1
 let NERDTreeKeepTreeInNewTab=1
-
-" Taglist
+Bundle 'tomtom/tcomment_vim'
+Bundle 'vim-scripts/taglist.vim'
 noremap <silent><leader>t :TlistToggle<Cr>
 let Tlist_Use_Right_Window=1
 let Tlist_GainFocus_On_ToggleOpen = 1
-
-" Colorscheme from bundle (needs to come after its Bundle line)
-colorscheme wombat256mod
-
-" Airline
+Bundle 'saltstack/salt-vim'
+Bundle 'bling/vim-airline'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_left_sep = ''
 let g:airline_right_sep = ''
 let g:airline#extensions#tabline#fnamecollapse = 0
 let g:airline_exclude_preview=1
-
-" Seek
+Bundle 'goldfeld/vim-seek'
 let g:seek_subst_disable = 1
 let g:seek_enable_jumps = 1
 let g:seek_enable_jumps_in_diff = 1
-
-" Jedi
+Bundle 'davidhalter/jedi-vim'
 let g:jedi#goto_assignments_command = ""
 let g:jedi#use_tabs_not_buffers = 0
-let g:jedi#popup_on_dot = 0
-
-" GitGutter
+let g:jedi#popup_on_dot = 1
+Bundle 'airblade/vim-gitgutter'
 let g:gitgutter_enabled = 0
 noremap <silent><leader>g :GitGutterToggle<Cr>
-
-" crtl-p
-let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f']
-let g:ctrlp_use_caching = 0
-
-" Gundo
-nnoremap <silent><leader>u :GundoToggle<Cr>
-
-" expand-region
-vmap v <Plug>(expand_region_expand)
-vmap <C-v> <Plug>(expand_region_shrink)
-
-"" }}}
+Bundle 'ivyl/vim-bling'
+Bundle 'mileszs/ack.vim'
+au BufRead,BufNewFile *.sls set filetype=sls

zshrc.local

@@ -1,9 +1,3 @@
-setopt vi
-bindkey '\e.' insert-last-word #alt . working in vim mode
-export TERM="screen-256color"
-
-export WORKON_HOME=~/.envs
-
 if which apt-get 2>&1 >/dev/null; then
     alias ack=ack-grep
     if [ -e "/usr/local/bin/virtualenvwrapper.sh" ]; then
@@ -20,7 +14,13 @@ if which pacman 2>&1 >/dev/null; then
     fi
 fi
 
+if [ -e "/home/asmaps/.rvm/scripts/rvm" ]; then
+    source /home/asmaps/.rvm/scripts/rvm
+fi
+
 # autostart tmux
 if which tmux 2>&1 >/dev/null; then
     test -z "$TMUX" && (tmux attach || tmux new-session)
 fi
+
+xset -b

zshrc.pre

@@ -1 +0,0 @@
-export NOTITLE=1