diff --git a/.config/bash/gil_specific.sh b/.config/bash/gil_specific.sh index 3d72bdb..962ca1c 100644 --- a/.config/bash/gil_specific.sh +++ b/.config/bash/gil_specific.sh @@ -29,6 +29,8 @@ alias kctx="kubectx" alias fluxUp="flux reconcile source git flux-system" alias kprod="export AWS_PROFILE='production' && aws sso login && aws eks update-kubeconfig --region eu-west-1 --name rfidprod-production && kubens prod && kubectl get po" alias kstage="export AWS_PROFILE='staging' && aws sso login && aws eks update-kubeconfig --region eu-west-1 --name rfidprod-staging && kubens preprod && kubectl get po" +alias gupa='git pull --rebase --autostash' + # Open a port forward session to a remote Kubernetes deployment # @param {string} $1 Deployment name diff --git a/installSystem.sh b/installSystem.sh index 2a1f1a2..9c85ea8 100644 --- a/installSystem.sh +++ b/installSystem.sh @@ -7,7 +7,7 @@ groups | grep -q sudo || echo "Please, as root, add $(whoami) to sudo group with groups | grep -q sudo || return sudo apt update -sudo apt install -y yadm vim-gtk3 vim vim-nox fzf cmake \ +sudo apt install -y yadm vim-gtk3 vim vim-nox fzf cmake zsh \ webext-browserpass webext-ublock-origin-firefox curl pass python3 ripgrep fonts-firacode fd-find postgresql rsync \ nextcloud-desktop tig locate htop make screenfetch isync notmuch lynx urlview\ gcc inkscape python3-pip kubectl kubectx imagemagick pdfarranger firefox gpaste-2 hx jq @@ -22,12 +22,12 @@ sudo apt autoremove #sudo sed -i '/"PDF"/s/none/read|write/' /etc/ImageMagick-6/policy.xml sudo chsh -s /bin/bash $USER -[ ! -d "$HOME/.oh-my-bash/" ] && bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)" || echo "oh-my-bash installed" # Installation oh my bash +[ ! -d "$HOME/.oh-my-zsh/" ] && bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" || echo "oh-my-zsh installed" [ ! -d "$HOME/helix.vim" ] && git clone https://github.com/chtenb/helix.vim ~/helix.vim/ # Installation config specif bash + aliases -grep -q "gil_specific" "$HOME/.bashrc" && echo "Bash configured" || sed -i -e '$asource "$HOME/.config/bash/gil_specific.sh"\' $HOME/.bashrc +grep -q "gil_specific" "$HOME/.zshrc" && echo "Bash configured" || sed -i -e '$asource "$HOME/.config/bash/gil_specific.sh"\' $HOME/.zshrc grep -q "Xautolock" "$HOME/.Xresources" && echo "autolock configured" || sed -i -e '$aXautolock.corners: ----' $HOME/.Xresources