Fix Fedora terminal (#100)

This commit is contained in:
Cyryl Płotnicki 2017-02-12 11:47:30 +00:00 committed by GitHub
parent fc838b9119
commit 63ec531017
9 changed files with 25 additions and 17 deletions

View file

@ -1,4 +1,4 @@
set-option -g default-command "reattach-to-user-namespace -l zsh"
if-shell "uname | grep -q Darwin" "source-file .tmux.macosx"
set -g mouse on
set -g terminal-overrides 'xterm*:smcup@:rmcup@'
set -g prefix C-a # prefix from ctrl-b to ctrl-a

2
.tmux.macosx Normal file
View file

@ -0,0 +1,2 @@
set-option -g default-command "reattach-to-user-namespace -l zsh"

@ -1 +1 @@
Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45
Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7

2
.zshrc
View file

@ -35,6 +35,4 @@ if [[ `uname` =~ 'CYGWIN.*' ]]; then
export DISPLAY=:0.0
fi
alias benice="ionice -c3 nice -n20"
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

View file

@ -34,6 +34,7 @@ git submodule update --init --recursive
ln -vfs "$DIR/.vim" ~/.
ln -vfs "$DIR/.vimrc.linux" ~/.vimrc
ln -vfs "$DIR/.tmux.conf" ~/.
ln -vfs "$DIR/.tmux.macosx" ~/.
rm -f "~/.zshrc"
ln -vfs "$DIR/.zprezto" ~/.
ln -vfs "$DIR/.zpreztorc" ~/.zpreztorc
@ -120,7 +121,7 @@ set +e
git pull
git submodule update --init --recursive
fi
rustup override set `cat rustc-version`
rustup override set stable
cargo install
set -e
fi
@ -165,12 +166,12 @@ if [[ -z $NOVIM ]]; then
echo "Installing fzf"
~/.fzf/install --64 --all
echo "Installing Vim plugins"
echo "\n" | vim +PluginInstall +qa
echo "\n" | vim +PluginInstall! +qa
if [[ -z $NOYCM ]]; then
echo "configuring YouCompleteMe"
cd ~/.vim/bundle/YouCompleteMe
git submodule update --init --recursive
if [[ -z $NOPYTHON3 ]]; then
python3 ./install.py --clang-completer --racer-completer --tern-completer
else

View file

@ -2,8 +2,7 @@
set -e
mkdir -p ~/build/
cd ~/build/
cd ~/dev/
echo "checking out sources..."
@ -26,7 +25,7 @@ echo "installing..."
sudo make install
# install component libraries
cd ~/build/kicad
cd ~/dev/
echo "checking out libraries..."
if [[ ! -d kicad-library ]]; then
git clone https://github.com/KiCad/kicad-library.git --recursive

View file

@ -42,8 +42,7 @@ sudo usermod -aG docker $USER
# vscode
mkdir -p ~/Downloads
cd ~/Downloads
rm -fv *code*.rpm
aria2c "https://go.microsoft.com/fwlink/?LinkID=760867"
aria2c -c "https://go.microsoft.com/fwlink/?LinkID=760867"
sudo dnf -y install code*.rpm
if [ "$(id -u)" != "0" ]; then
@ -57,9 +56,16 @@ fi
# vim
if [[ -z $NO_COMPILE_VIM ]]; then
VIM_BUILD_DIR=/tmp
VIM_BUILD_DIR=`realpath "$DIR/../../"`
cd "$VIM_BUILD_DIR"
git clone https://github.com/vim/vim.git
if [[ ! -d vim ]]; then
git clone https://github.com/vim/vim.git --recursive
else
cd vim
git pull
git submodule update --init --recursive
cd ..
fi
cd vim
./configure --with-features=huge \
--enable-multibyte \
@ -68,10 +74,9 @@ if [[ -z $NO_COMPILE_VIM ]]; then
--enable-luainterp \
--enable-gui=no \
--enable-cscope
make -j2
make -j`nproc`
sudo make install
cd
rm -fvr "$VIM_BUILD_DIR/vim"
fi
DIR="$DIR/../"

3
tools/benice Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash
ionice -c3 nice -n20 "$@"

@ -1 +1 @@
Subproject commit 0a27bea010fe3be5589840b9850bb0f883f031c7
Subproject commit eb5a269f27370bddb16317e9eba6f0795705907b