diff --git a/bash/.profile b/bash/.profile index c85e0e3..1c0d8a7 100644 --- a/bash/.profile +++ b/bash/.profile @@ -1,37 +1,50 @@ -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ]; then - PATH="$HOME/bin:$PATH" +if [ -z "$PROFILE_LOCK" ]; then + export PROFILE_LOCK=1 + + # set PATH so it includes user's private bin if it exists + if [ -d "$HOME/bin" ]; then + PATH="$HOME/bin:$PATH" + fi + + # config + if [ -z "$XDG_DATA_HOME" ]; then + export XDG_DATA_HOME="$HOME/.local/share" + mkdir -p "$XDG_DATA_HOME" + fi + if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" + mkdir -p "$XDG_CONFIG_HOME" + fi + + # workspace + if [ -z "$WORKSPACE" ]; then + export WORKSPACE="$HOME/workspace" + fi + + # .local + export PATH="$HOME/.local/bin:$PATH" + + # pyenv + export PYENV_ROOT="$HOME/.pyenv" + export PATH="$PYENV_ROOT/bin:$PATH" + export PATH="$PYENV_ROOT/shims:$PATH" + [ -x "$(command -v pyenv)" ] && eval "$(pyenv init -)" + + # poetry + export POETRY_ROOT="$HOME/.poetry" + export PATH="$POETRY_ROOT/bin:$PATH" + + # nvm + export NVM_DIR="$XDG_CONFIG_HOME/nvm" + export PATH="$NVM_DIR/bin:$PATH" + # [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" + + # yarn + export YARN_DIR="$HOME/.yarn" + if ! [ -x "$(command -v yarn)" ]; then + export PATH="$YARN_DIR/bin:$PATH" + else + export PATH="$(yarn global bin):$PATH" + fi + fi - -# config -if [ -z "$XDG_DATA_HOME" ]; then - export XDG_DATA_HOME="$HOME/.local/share" - mkdir -p "$XDG_DATA_HOME" -fi -if [ -z "$XDG_CONFIG_HOME" ]; then - export XDG_CONFIG_HOME="$HOME/.config" - mkdir -p "$XDG_CONFIG_HOME" -fi - -# workspace -if [ -z "$WORKSPACE" ]; then - export WORKSPACE="$HOME/workspace" -fi - -# .local -export PATH="$HOME/.local/bin:$PATH" - -# pyenv -export PYENV_ROOT="$HOME/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" -export PATH="$PYENV_ROOT/shims:$PATH" -[ -x "$(command -v pyenv)" ] && eval "$(pyenv init -)" - -# poetry -export POETRY_ROOT="$HOME/.poetry" -export PATH="$POETRY_ROOT/bin:$PATH" - -# nvm -export NVM_DIR="$XDG_CONFIG_HOME/nvm" -export PATH="$NVM_DIR/bin:$PATH" -[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" diff --git a/fish/config.fish b/fish/config.fish index 85f4204..8565fd7 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -22,8 +22,12 @@ set POETRY_ROOT $HOME/.poetry set -x PATH $POETRY_ROOT/bin $PATH # nvm -# set NVM_ROOT $HOME/.nvm -# set -x PATH $NVM_ROOT/bin $PATH +set NVM_ROOT $HOME/.nvm +set -x PATH $NVM_ROOT/bin $PATH + +# yarn +set YARN_DIR $HOME/.yarn +set -x PATH $YARN_DIR/bin $PATH # ---------------------------------------------------------------------------- # # Fish specific diff --git a/install/00-apt-pkglist b/install/00-apt-pkglist index 6f9a05c..2cf1ad2 100644 --- a/install/00-apt-pkglist +++ b/install/00-apt-pkglist @@ -3,5 +3,4 @@ make net-tools openssh-client openssh-server -screenfetch software-properties-common diff --git a/install/03-ssh.sh b/install/03-ssh.sh index fe7bfe0..3a6a0f9 100755 --- a/install/03-ssh.sh +++ b/install/03-ssh.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. ssh key exists +# ssh key exists ssh_target="$HOME/.ssh" ssh_key="$ssh_target/id_rsa" ssh_pub="$ssh_key.pub" @@ -10,7 +10,7 @@ if [ ! -f "$ssh_key" ]; then fi echo "ssh key exists" -# 2. ssh dotfiles are symlinked +# ssh dotfiles are symlinked ssh_source="$dotfiles_dir/ssh" link_folder "$ssh_source" "$ssh_target" echo "ssh dotfiles are symlinked" diff --git a/install/04-git.sh b/install/04-git.sh index 7922b35..9b7c7a7 100755 --- a/install/04-git.sh +++ b/install/04-git.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. git dotfiles are symlinked +# git dotfiles are symlinked git_source="$dotfiles_dir/git" git_target="$HOME" link_folder "$git_source" "$git_target" diff --git a/install/10-pyenv.sh b/install/10-pyenv.sh index 3c1b7a6..2aee2bd 100755 --- a/install/10-pyenv.sh +++ b/install/10-pyenv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. pyenv is installed +# pyenv is installed if not_installed "pyenv"; then echo "Installing pyenv..." diff --git a/install/11-python.sh b/install/11-python.sh index 783c62f..cd77f6b 100755 --- a/install/11-python.sh +++ b/install/11-python.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. python3 and pip3 are installed +# python3 and pip3 are installed if not_installed "pip3"; then echo "Installing python3 and pip3..." diff --git a/install/12-poetry.sh b/install/12-poetry.sh index 6a0e632..d8e11ab 100755 --- a/install/12-poetry.sh +++ b/install/12-poetry.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. poetry is installed +# poetry is installed if not_installed "poetry"; then printf "Installing poetry...\n" diff --git a/install/20-nvm.sh b/install/13-nvm.sh similarity index 94% rename from install/20-nvm.sh rename to install/13-nvm.sh index 459c2e2..2791491 100755 --- a/install/20-nvm.sh +++ b/install/13-nvm.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. nvm is installed +# nvm is installed if not_installed "nvm"; then printf "Installing nvm...\n" diff --git a/install/21-yarn.sh b/install/14-yarn.sh similarity index 100% rename from install/21-yarn.sh rename to install/14-yarn.sh diff --git a/install/15-java.sh b/install/15-java.sh new file mode 100755 index 0000000..38e1b5e --- /dev/null +++ b/install/15-java.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if not_installed "java"; then + echo "Installing java..." + install default-jre +fi + +echo "java is installed" +java --version diff --git a/install/30-docker.sh b/install/30-docker.sh index dbe780a..3d9fcfa 100755 --- a/install/30-docker.sh +++ b/install/30-docker.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1. docker is installed +# docker is installed DOCKER_FOLDER="$HOME/.docker" if not_installed "docker"; then @@ -32,7 +32,7 @@ fi printf "docker is installed\n" docker --version -# 2. docker-compose if installed +# docker-compose if installed if not_installed "docker-compose"; then printf "Installing docker-compose...\n" @@ -45,14 +45,14 @@ printf "docker-compose is installed, upgrading\n" pip3 install --upgrade docker-compose docker-compose --version -# 3. docker group exists +# docker group exists readonly docker_group='docker' if ! grep -q "$docker_group" /etc/group; then sudo groupadd "$docker_group" fi printf "group '$docker_group' is created\n" -# 4. user is in docker group +# user is in docker group if ! groups "$USER" | grep -q "\b$docker_group\b"; then sudo usermod -aG docker "$USER" fi diff --git a/install/31-keybase.sh b/install/31-keybase.sh index c14a88e..effb837 100755 --- a/install/31-keybase.sh +++ b/install/31-keybase.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 1.keybase is installed +# keybase is installed if not_installed "keybase"; then printf "Installing keybase...\n" diff --git a/install/32-firebase.sh b/install/32-firebase.sh new file mode 100755 index 0000000..752a326 --- /dev/null +++ b/install/32-firebase.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if not_installed "firebase"; then + echo "Installing firebase..." + run "https://firebase.tools" "bash" +fi + +echo "firebase is installed, upgrading..." +curl -sL firebase.tools | upgrade=true bash +firebase --version diff --git a/install/99-apt-clean.sh b/install/98-apt-clean.sh similarity index 62% rename from install/99-apt-clean.sh rename to install/98-apt-clean.sh index 2a5db67..07c4dcd 100755 --- a/install/99-apt-clean.sh +++ b/install/98-apt-clean.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# post clean +echo "cleaning" clean diff --git a/install/99-screenfetch.sh b/install/99-screenfetch.sh new file mode 100755 index 0000000..32f9325 --- /dev/null +++ b/install/99-screenfetch.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if not_installed "screenfetch"; then + echo "Installing screenfetch..." + install screenfetch +fi + +echo "screenfetch is installed" +screenfetch --version +screenfetch diff --git a/install/999-screenfetch.sh b/install/999-screenfetch.sh deleted file mode 100755 index 7563217..0000000 --- a/install/999-screenfetch.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -screenfetch