cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup the common script

Browse source
This commit is contained in:
Cyryl Płotnicki 2019-01-20 13:29:16 +00:00
parent 3ec7b33160
commit 8b15d5cd43
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
common/configure_fresh_system.sh
View file

@ -7,13 +7,14 @@ if [[ -z $NOSUDO ]]; then
SUDO="sudo" SUDO="sudo"
fi fi
echo "using '$SUDO' as sudo"
set -e
echo echo
echo "configuring settings common among OSes" echo "configuring settings common among OSes"
echo "using '$SUDO' as sudo"
$SUDO true $SUDO true
echo "sourcing env"
source ~/.setenv
#zsh #zsh
if [[ -z $DONT_CHANGE_SHELL ]]; then if [[ -z $DONT_CHANGE_SHELL ]]; then
echo "changing shell to zsh" echo "changing shell to zsh"
@ -63,16 +64,16 @@ ln -vfs "$DIR/.config/Code/User/settings.json" ~/.config/Code/User/settings.json
ln -vfs "$DIR/.config/Code/User/keybindings.json" ~/.config/Code/User/keybindings.json ln -vfs "$DIR/.config/Code/User/keybindings.json" ~/.config/Code/User/keybindings.json
mkdir -p ~/.local/share/applications mkdir -p ~/.local/share/applications
cp -v "$DIR/keeweb.desktop" ~/.local/share/applications/ cp -v "$DIR/keeweb.desktop" ~/.local/share/applications/
ln -vfs "$DIR/tools" ~/
mkdir -vp ~/.config/terminator
rm -f ~/.config/terminator/config
ln "$DIR/.config/terminator/config" ~/.config/terminator/config
mkdir -p ~/.cargo/ mkdir -p ~/.cargo/
echo "all links done" echo "all links done"
echo "adding NVM" echo "adding NVM"
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash
echo "sourcing env"
source ~/.setenv
echo "using NVM" echo "using NVM"
set +e set +e
\. "$NVM_DIR/nvm.sh" \. "$NVM_DIR/nvm.sh"
@ -80,15 +81,8 @@ set -e
nvm install node nvm install node
nvm use node nvm use node
# tools
ln -vfs "$DIR/tools" ~/
# stuff that does not like symbolic links
mkdir -vp ~/.config/terminator
rm -f ~/.config/terminator/config
ln "$DIR/.config/terminator/config" ~/.config/terminator/config
#install fonts #install fonts
echo "installing fonts"
mkdir -p ~/.fonts mkdir -p ~/.fonts
cp -rv "$DIR/fonts" ~/.fonts cp -rv "$DIR/fonts" ~/.fonts
set +e set +e
@ -96,7 +90,9 @@ fc-cache -rv
$SUDO fc-cache -rv $SUDO fc-cache -rv
set -e set -e
source "$DIR/common/install_vim_from_sources.sh" if [[ -z $NOVIM ]]; then
source "$DIR/common/install_vim_from_sources.sh"
fi
if [[ -z $NORUST ]]; then if [[ -z $NORUST ]]; then
#rust #rust