Compare commits

..

No commits in common. "17255dea086fd95937cb79019736573b257fbe5a" and "7092b12ea35a2eecda215a125b8c00ce4841a902" have entirely different histories.

4 changed files with 11 additions and 29 deletions

View File

@ -17,8 +17,8 @@ if [ -h .tmux ] ; then
elif [ -f .tmux ] ; then
mv .tmux .tmux.backup
fi
su "$_user" -c 'git clone https://git.rayelliott.dev/dots/tmux.git .config/tmux'
su "$_user" -c 'ln -bfs .config/tmux/tmux.conf .tmux.conf'
su "$_user" -c 'ln -bfs .config/tmux/tmux .tmux'
su ray -c 'git clone https://git.rayelliott.dev/dots/tmux.git .config/tmux'
su ray -c 'ln -bfs .config/tmux/tmux.conf .tmux.conf'
su ray -c 'ln -bfs .config/tmux/tmux .tmux'
cd .config/tmux
ln -bfs tmux.colours-base16.conf tmux.colours.conf

View File

@ -13,12 +13,12 @@ fi
mkdir -p /home/"$_user"/.config
cd /home/"$_user"
rm -Rf .config/zsh
su "$_user" -c 'git clone https://git.rayelliott.dev/dots/zsh.git .config/zsh'
su "$_user" -c 'git clone https://github.com/tarjoilija/zgen.git .config/zsh/zgen'
su "$_user" -c 'ln -bfs .config/zsh/zshrc .zshrc'
su ray -c 'git clone https://git.rayelliott.dev/dots/zsh.git .config/zsh'
su ray -c 'git clone https://github.com/tarjoilija/zgen.git .config/zsh/zgen'
su ray -c 'ln -bfs .config/zsh/zshrc .zshrc'
# set interactive shell
_zsh=$(command -v zsh)
if [ -f "$_zsh" ] ; then
chsh "$_user" -s "$_zsh"
chsh ray -s "$_zsh"
fi

View File

@ -8,13 +8,12 @@ if ! command -v yarn ; then
fi
if command -v apt-get ; then
apt-get -y install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip python-pip python3-pip golang
apt-get -y install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip
cd /tmp
git clone https://github.com/neovim/neovim
cd neovim
make CMAKE_BUILD_TYPE=Release
mkdir -p /usr/local/share/nvim
mv /tmp/neovim/runtime /usr/local/share/nvim/runtime
mv /tmp/neovim/runtime /usr/local/share/nvim
mv /tmp/neovim/build/bin/nvim /usr/local/bin/nvim
else
echo "Error - no package installer found."
@ -24,11 +23,6 @@ fi
mkdir -p /home/"$_user"/.config
cd /home/"$_user"
rm -Rf .config/nvim
su "$_user" -c 'git clone https://git."$_user"elliott.dev/dots/nvim.git .config/nvim'
su ray -c 'git clone https://git.rayelliott.dev/dots/nvim.git .config/nvim'
su "$_user" --login -c 'yarn global add neovim'
su "$_user" --login -c 'python2 -m pip install --user --upgrade pynvim'
su "$_user" --login -c 'python3 -m pip install --user --upgrade pynvim'
su "$_user" --login -c 'nvim --headless +PlugInstall +qall'
su ray --login -c 'yarn global add neovim'

View File

@ -1,12 +0,0 @@
#!/bin/sh
set -e
# locale
if [ -f /etc/locale.gen ] && command -v locale-gen ; then
echo 'en_GB.UTF-8 UTF-8' > /etc/locale.gen
locale-gen
echo 'LANG="en_GB.UTF-8"' > /etc/default/locale
else
echo 'system.sh: Warning can not set locale'
fi