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

Conflicts:
	bunsen/configure_fresh_system

.gitmodules

@@ -62,3 +62,9 @@
 [submodule ".vim/bundle/ack.vim"]
 	path = .vim/bundle/ack.vim
 	url = https://github.com/mileszs/ack.vim.git
+[submodule ".vim/bundle/vim-cargo"]
+	path = .vim/bundle/vim-cargo
+	url = https://github.com/timonv/vim-cargo.git
+[submodule ".vim/bundle/vim-dispatch"]
+	path = .vim/bundle/vim-dispatch
+	url = https://github.com/tpope/vim-dispatch.git

.vim/bundle/rust.vim

@@ -1 +1 @@
-Subproject commit 6932a6b742d36bdebdb6e17ac190d6b9746852c2
+Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa

.vim/bundle/vim-cargo

@@ -0,0 +1 @@
+Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f

.vim/bundle/vim-dispatch

@@ -0,0 +1 @@
+Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8

.vimrc

@@ -15,6 +15,7 @@ set encoding=utf-8
 let mapleader = ","
 nmap <leader>p :set paste!<CR>
 nmap <leader>h :set hlsearch!<CR>
+nmap <leader>t :wa <bar> :Make test<CR>
 
 " navigate buffers by ctrl-b
 nmap <C-b> :bprevious<CR>
@@ -59,6 +60,8 @@ let g:bufferline_echo = 0
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 
+" plugins: rust
+let g:rustfmt_autosave = 1
 
 " plugins: ag/ack
 if executable('ag')

.zshrc

@@ -54,6 +54,7 @@ export PATH=$HOME/.local/bin:$PATH
 export PATH=/usr/local/heroku/bin:$PATH
 export PATH=$HOME/tools/subuser/logic:$HOME/.subuser/bin:$PATH
 export PATH=$HOME/.multirust/toolchains/stable/cargo/bin:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
 export RUST_SRC_PATH=$HOME/dev/rust/src
 export EDITOR="vim"
 export KEYTIMEOUT=1

bunsen/configure_fresh_system

@@ -1,11 +1,27 @@
 #!/bin/bash
 sudo apt-get update
 sudo apt-get -y upgrade
-sudo apt-get -y install aptitude meld whois zsh tmux vim atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers python-dev golang keepass2 retext
+sudo apt-get -y install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext
 
 sudo systemctl enable tor
 sudo systemctl start tor
 
+# install vim from sources
+git clone https://github.com/vim/vim.git
+cd vim
+./configure --with-features=huge \
+            --enable-multibyte \
+            --enable-rubyinterp \
+            --enable-pythoninterp \
+            --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
+            --enable-perlinterp \
+            --enable-luainterp \
+            --enable-gui=gtk2 --enable-cscope --prefix=/usr
+make -j2
+sudo make install
+cd
+rm -fr /tmp/vim
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system

common/configure_fresh_system

@@ -83,6 +83,8 @@ else
     git pull
 fi
 
+cargo install rustfmt
+
 # racer
 set +e
 cargo install racer