diff --git a/README.md b/README.md
index 61089e2..5137f45 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,22 @@ dotfiles
 ├── install.conf.yaml # setup dir structure, symlinks, ...
 ```
 
-### Setup (Regular)
+### Setup (Desktop)
 
-Get pre-requisites:
+<details>
+  <summary>Post (distro-) installation steps</summary>
+  
+  ```bash
+sudo apt update && sudo apt full-upgrade
+sudo apt autoremove && sudo apt clean
+  ```
+</details>
+
+Pre-requisites:
 
 ```bash
-sudo apt-get update && sudo apt-get install -y git
+sudo apt-get update && sudo apt-get install -y git gh
+gh auth login
 ```
 
 ```bash
diff --git a/install.conf.yaml b/install.conf.yaml
index 10f90f3..b2434a9 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -33,7 +33,7 @@
     - ~/.ssh
     - ~/applications
     - ~/bin
-    - ~/repos
+    - ~/repos/tools
     - ~/tmp
 
 
diff --git a/setup b/setup
index d6e05d3..3181850 100755
--- a/setup
+++ b/setup
@@ -38,7 +38,7 @@ cli() {
     sudo apt-get install -y \
       curl \
       git \
-      jq
+      jq \
       libfuse2 \
       make \
       neofetch \
@@ -48,6 +48,7 @@ cli() {
       ripgrep \
       ssh \
       tree \
+      vim \
       xclip \
       zsh
     curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash && git lfs install
@@ -55,9 +56,7 @@ cli() {
     zsh zsh/plugin-files/zap_zsh_install # minimal zsh plugin manager
     sudo chsh -s "$(which zsh)" "$USER" # set zsh as default shell
 
-    # vim 9
-    yes | sudo add-apt-repository ppa:jonathonf/vim -y
-    sudo apt install --reinstall vim -y
+    # vim plugin manager
     curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
     # fuzzy finder
@@ -99,16 +98,15 @@ desktop() {
         sudo mv /usr/share/sounds/freedesktop/stereo/camera-shutter.oga /usr/share/sounds/freedesktop/stereo/camera-shutter-disabled.oga
     fi
 
-    # webp support for eye of gnome image viewer
-    yes | sudo add-apt-repository ppa:helkaluin/webp-pixbuf-loader
-    sudo apt-get update
+    # webp support for eye of gnome image viewer 
+    # yes | sudo add-apt-repository ppa:helkaluin/webp-pixbuf-loader (ships with >=22.04)
     sudo apt install webp-pixbuf-loader
     xdg-mime default org.gnome.eog.desktop image/webp
 
     # encrypted volumes
     yes | sudo add-apt-repository ppa:unit193/encryption
     sudo apt-get update
-    sudo apt-get install veracrypt
+    sudo apt-get install -y veracrypt
 }
 
 docker() {