Merge branch 'master' into vault

This commit is contained in:
Cyryl Płotnicki 2016-10-16 12:26:59 +02:00 committed by GitHub
commit cbb7ff39b1
9 changed files with 55 additions and 10 deletions

View file

@ -12,4 +12,5 @@ export RUST_SRC_PATH=$HOME/dev/rust/src
export EDITOR="vim" export EDITOR="vim"
export KEYTIMEOUT=1 export KEYTIMEOUT=1
export VAGRANT_DEFAULT_PROVIDER=virtualbox export VAGRANT_DEFAULT_PROVIDER=virtualbox
export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'

View file

@ -1,4 +1,4 @@
set -g mode-mouse on set -g mouse on
set -g terminal-overrides 'xterm*:smcup@:rmcup@' set -g terminal-overrides 'xterm*:smcup@:rmcup@'
set -g prefix C-a # prefix from ctrl-b to ctrl-a set -g prefix C-a # prefix from ctrl-b to ctrl-a
unbind C-b # free ctrl-b to be used by programs inside tmux unbind C-b # free ctrl-b to be used by programs inside tmux

View file

@ -25,8 +25,13 @@ endif
if executable('rg') if executable('rg')
let g:ackprg = 'rg --no-heading --vimgrep' let g:ackprg = 'rg --no-heading --vimgrep'
set grepprg=rg\ --vimgrep
endif endif
" fzf
command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --color "always" '.shellescape(<q-args>).'| tr -d "\017"', 1, <bang>0)
nmap <C-n> :Find
" appearance " appearance
set number set number
set relativenumber set relativenumber

View file

@ -9,6 +9,7 @@ Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes' Plugin 'vim-airline/vim-airline-themes'
Plugin 'timonv/vim-cargo' Plugin 'timonv/vim-cargo'
Plugin 'kien/ctrlp.vim' Plugin 'kien/ctrlp.vim'
Plugin 'junegunn/fzf.vim'
Plugin 'will133/vim-dirdiff' Plugin 'will133/vim-dirdiff'
Plugin 'tpope/vim-dispatch.git' Plugin 'tpope/vim-dispatch.git'
Plugin 'tpope/vim-fugitive.git' Plugin 'tpope/vim-fugitive.git'

View file

@ -50,4 +50,6 @@ set expandtab
filetype off filetype off
set rtp+=~/.vim/bundle/Vundle.vim set rtp+=~/.vim/bundle/Vundle.vim
set rtp+=~/.fzf
call vundle#begin() call vundle#begin()

16
.zshrc
View file

@ -47,9 +47,21 @@ fi
alias benice="ionice -c3 nice -n20" alias benice="ionice -c3 nice -n20"
# env vars # stuff that checks if it's added to the .zshrc exipliclty
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# other common env vars
source ~/.setenv source ~/.setenv
# TMUX
if which tmux >/dev/null 2>&1; then
# if no session is started, start a new session
test -z ${TMUX} && tmux
# when quitting tmux, try to attach
while test -z ${TMUX}; do
tmux attach || break
done
fi
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

View file

@ -112,6 +112,14 @@ if [[ -z $NORUBY ]]; then
fi fi
if [[ -z $NOVIM ]]; then if [[ -z $NOVIM ]]; then
if [[ ! -d ~/.fzf ]]; then
git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
else
cd ~/.fzf
git pull
git submodule update --init --recursive
fi
~/.fzf/install --64 --all
echo "\n" | vim +PluginInstall +qa echo "\n" | vim +PluginInstall +qa
if [[ -z $NOYCM ]]; then if [[ -z $NOYCM ]]; then
cd ~/.vim/bundle/YouCompleteMe cd ~/.vim/bundle/YouCompleteMe

View file

@ -5,7 +5,7 @@ set -v
sudo apt-get update sudo apt-get update
sudo apt-get -y upgrade sudo apt-get -y upgrade
install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh" install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks whois zsh"
set +e set +e
for i in `seq 1 3`; do for i in `seq 1 3`; do
@ -15,17 +15,34 @@ done
set -e set -e
eval $install_packages eval $install_packages
if [[ -z $NO_SYSTEMCTL ]]; then
sudo systemctl enable tor
sudo systemctl start tor
fi
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
sudo apt-get update sudo apt-get update
sudo apt-get -y install mono-devel mono-complete sudo apt-get -y install mono-devel mono-complete
pushd `pwd`
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=/tmp
cd "$VIM_BUILD_DIR"
git clone https://github.com/vim/vim.git
cd vim
./configure --with-features=huge \
--enable-multibyte \
--enable-rubyinterp \
--enable-python3interp=yes \
--enable-luainterp \
--enable-gui=no \
--enable-cscope
make -j2
sudo make install
cd
rm -fvr "$VIM_BUILD_DIR/vim"
fi
popd
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../../" DIR="$DIR/../../"
export NO_GO=true export NO_GO=true

View file

@ -4,7 +4,6 @@ set -e
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
export DONT_CHANGE_SHELL=true export DONT_CHANGE_SHELL=true
export NO_SYSTEMCTL=true
echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries