missing install items

1 files changed, 37 insertions, 30 deletions

diff --git a/install.sh b/install.sh
index a307585..1a01233 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+SRCDIR="~/.local/src/"
+
 rm ~/.config/mimeapps.list
 rm ~/.local/share/wallpapers/bg
 
@@ -7,27 +9,32 @@ stow $(ls -d */)
 
 # Update Make Install
 umi() { \
-    echo "[UPDATE] $1"
-    cd ~/.local/src/"$1"
+    branch=${2:-master}
+    echo "[UPDATE] $1 $branch"
+    cd "$SRCDIR/$1"
     git pull
-    sudo checkinstall --nodoc -y sudo make install -j
+    git checkout "$branch"
+    make -j
+    sudo checkinstall --nodoc -y sudo make "$3" install
 }
 
 umi_all() { \
+    umi "ly"
+    umi "dwm" "master"
     umi "dwmblocks"
-    umi "nnn"
     umi "st"
+    umi "neovim"
+    umi "nnn" "master" "strip"
     umi "devour"
     umi "dragon"
-    umi "neovim"
 
-    echo "[UPDATE] dwm"
-    cd ~/.local/src/dwm
+    cd "$SRCDIR/digimend-kernel-drivers"
     git pull
-    git checkout patched-config
-    sudo checkinstall --nodoc -y sudo make install -j
+    # TODO is it necessary to uninstall?
+    sudo make dkms_uninstall
+    sudo make dkms_install
 
-    cd ~/soft/xournalpp
+    cd "$SRCDIR/xournalpp"
     mkdir build ; cd build
     rm -rf packages
     cmake ..
@@ -37,36 +44,35 @@ umi_all() { \
     cmake --build . --target package -- -j 6
     cd packages
     sudo dpkg -i xournalpp*
-
-    cd ~/soft/digimend-kernel-drivers
-    git pull
-    # TODO is it necessary to uninstall?
-    sudo make dkms_uninstall
-    sudo make dkms_install
-
-    cd ~/soft/nnn
-    sudo checkinstall --nodoc -y sudo make strip install -j
 }
 
 if [ "$1" = "i" ]; then
-    # stuff I regularly use
-    sudo apt-get -y install git libnotify-bin jmtpfs unrar unzip p7zip-full maim xwallpaper python3-pip sxiv mpv zathura nnn xfce4-power-manager redshift pass firefox chromium ncmpcpp mpd dmenu suckless-tools texlive ffmpeg i3lock pulseeffects thunderbird
-
+    # system
+    sudo apt-get -y install libnotify-bin jmtpfs maim xwallpaper python3-pip xfce4-power-manager redshift i3lock dmenu suckless-tools pass git picom
+    # media
+    sudo apt-get -y install sxiv mpv ncmpcpp mpd ffmpeg pulseeffects
+    # web
+    sudo apt-get -y install firefox chromium thunderbird
+    # office
+    sudo apt-get -y install git unrar unzip p7zip-full zathura texlive
     # theming
     sudo apt-get -y install oxygen-icon-theme sox imagemagick
     pip3 install pywal
 
-    # required for devour
-    sudo apt-get -y install libx11-dev
+    # required for ly
+    sudo apt-get -y install build-essential libpam0g-dev libxcb-xkb-dev
 
-    # required for dragon
-    sudo apt-get -y install libgtk-3-dev
+    # required for st and dwm
+    sudo apt-get -y install libfontconfig-dev libx11-dev libxft-dev
 
     # required for nvim
     sudo apt-get -y install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip curl
 
-    # required for st and dwm
-    sudo apt-get -y install libfontconfig-dev libx11-dev libxft-dev
+    # required for devour
+    sudo apt-get -y install libx11-dev
+
+    # required for dragon
+    sudo apt-get -y install libgtk-3-dev
 
     # required for digimend drives
     sudo apt-get -y install -y "linux-headers-$(uname -r)"
@@ -78,15 +84,16 @@ if [ "$1" = "i" ]; then
     # required for nnn
     sudo apt-get -y install pkg-config libncursesw5-dev libreadline-dev
 
-    mkdir ~/.local/src ; cd ~/.local/src
+    mkdir "$SRCDIR" ; cd "$SRCDIR"
+    git clone https://github.com/nullgemm/ly
     git clone https://github.com/ivan-boikov/dwm
     git clone https://github.com/ivan-boikov/dwmblocks
     git clone https://github.com/lukesmithxyz/st
+    git clone https://github.com/neovim/neovim
     git clone https://github.com/jarun/nnn
     # is it necessary with dwm swallow patch?
     git clone https://github.com/salman-abedin/devour
     git clone https://github.com/mwh/dragon
-    git clone https://github.com/neovim/neovim
     git clone https://github.com/DIGImend/digimend-kernel-drivers
     git clone https://github.com/xournalpp/xournalpp