From 6af8b6afa089069373fee771258e587670129d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 15 May 2016 18:14:22 +0200 Subject: [PATCH 1/6] install vim from sources on bunsen --- bunsen/configure_fresh_system | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index d4cfa107..362f806f 100755 --- a/bunsen/configure_fresh_system +++ b/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 +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 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 From b1fe2a30f63eace24c3af2332c526b429a46bb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 15 May 2016 21:38:20 +0200 Subject: [PATCH 2/6] Rust cargo bindings, using Dispatch as well --- .gitmodules | 6 ++++++ .vim/bundle/vim-cargo | 1 + .vim/bundle/vim-dispatch | 1 + .vimrc | 9 +++++---- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 160000 .vim/bundle/vim-cargo create mode 160000 .vim/bundle/vim-dispatch diff --git a/.gitmodules b/.gitmodules index fa24240e..7799fb56 100644 --- a/.gitmodules +++ b/.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 diff --git a/.vim/bundle/vim-cargo b/.vim/bundle/vim-cargo new file mode 160000 index 00000000..fbf907c3 --- /dev/null +++ b/.vim/bundle/vim-cargo @@ -0,0 +1 @@ +Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch new file mode 160000 index 00000000..5f5c22c9 --- /dev/null +++ b/.vim/bundle/vim-dispatch @@ -0,0 +1 @@ +Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8 diff --git a/.vimrc b/.vimrc index a115de90..1880a281 100755 --- a/.vimrc +++ b/.vimrc @@ -11,10 +11,15 @@ set hidden " file settings set encoding=utf-8 +" plugins +execute pathogen#infect() +filetype plugin indent on + " key mappings let mapleader = "," nmap p :set paste! nmap h :set hlsearch! +nmap t :w :Make test " navigate buffers by ctrl-b nmap :bprevious @@ -43,10 +48,6 @@ set softtabstop=4 set shiftwidth=4 set expandtab -" plugins -execute pathogen#infect() -filetype plugin indent on - " colours [need pathogen] set t_Co=256 syntax enable From 850cd8671e9c4b1efa2ea25f9a1e8b7e27c5d0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 15 May 2016 22:13:24 +0200 Subject: [PATCH 3/6] new rust.vim --- .vim/bundle/rust.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim index 6932a6b7..115d321d 160000 --- a/.vim/bundle/rust.vim +++ b/.vim/bundle/rust.vim @@ -1 +1 @@ -Subproject commit 6932a6b742d36bdebdb6e17ac190d6b9746852c2 +Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa From 3e9bb6a8df407ca4a62ba8e24be6e129ba9b0ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 15 May 2016 22:16:29 +0200 Subject: [PATCH 4/6] save all files when running tests in vim --- .vimrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.vimrc b/.vimrc index 1880a281..7f9f1139 100755 --- a/.vimrc +++ b/.vimrc @@ -11,15 +11,11 @@ set hidden " file settings set encoding=utf-8 -" plugins -execute pathogen#infect() -filetype plugin indent on - " key mappings let mapleader = "," nmap p :set paste! nmap h :set hlsearch! -nmap t :w :Make test +nmap t :wa :Make test " navigate buffers by ctrl-b nmap :bprevious @@ -48,6 +44,10 @@ set softtabstop=4 set shiftwidth=4 set expandtab +" plugins +execute pathogen#infect() +filetype plugin indent on + " colours [need pathogen] set t_Co=256 syntax enable From 9ce37a933b36d82c875b2247060b898d4ac3aaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 15 May 2016 22:59:29 +0200 Subject: [PATCH 5/6] rustfmt enabled by default --- .vimrc | 2 ++ common/configure_fresh_system | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.vimrc b/.vimrc index 7f9f1139..72856978 100755 --- a/.vimrc +++ b/.vimrc @@ -60,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') diff --git a/common/configure_fresh_system b/common/configure_fresh_system index acf93389..b7e5884c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -83,6 +83,8 @@ else git pull fi +cargo install rustfmt + # racer set +e cargo install racer From 807e17bb5c021de722fdd56f16be6de75cb05ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 16 May 2016 10:53:57 +0200 Subject: [PATCH 6/6] add regular cargo installation to the PATH as well --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index c095d818..610ab2df 100644 --- a/.zshrc +++ b/.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