Small updates

Makefile

@@ -1,8 +1,14 @@
-# Autogenerated at 04.07.2022 23:52 using ./gen-makefile.sh
+# Autogenerated at 05.07.2022 10:52 using ./gen-makefile
 
-##lamp: Apache + php + mariadb
+##flameshot: [TODO] [PACK] qt5 + flameshot from source
+flameshot: qt5 flameshot-build
+
+##lamp: [PACK] Apache + php + mariadb
 lamp: apache php mariadb
 
+##omz: [PACK] zsh + omz + powerline10k + MesloLGS fonts
+omz: zsh omz-clean
+
 ##apache: Install apache2 (latest)
 apache:
 	./install/apache
@@ -31,6 +37,10 @@ droidcam:
 droidcam-obs:
 	./install/droidcam-obs
 
+##flameshot-build: [TODO] Build flameshot from src (latest)
+flameshot-build:
+	./install/flameshot-build
+
 ##git: Install git (latest)
 git:
 	./install/git
@@ -47,6 +57,10 @@ grubc:
 kde-appmenu:
 	./install/kde-appmenu
 
+##libreoffice: Install libreoffice
+libreoffice:
+	./install/libreoffice
+
 ##lite-xl: Install lite-xl v2.0.5 (draft)
 lite-xl:
 	./install/lite-xl
@@ -59,6 +73,14 @@ mariadb:
 nodejs:
 	./install/nodejs
 
+##omz-clean: Install omz (latest) + powerline10k + MesloLGS fonts
+omz-clean:
+	./install/omz-clean
+
+##papirus: Install papirus-icon-theme (latest)
+papirus:
+	./install/papirus
+
 ##pgsql: Install postgresql (latest) and php-pgsql (if php is installed)
 pgsql:
 	./install/pgsql
@@ -71,7 +93,11 @@ php:
 postman:
 	./install/postman
 
-##rustdesk: Install rustdesk v1.1.8 (deb)
+##qt5: Install qt5
+qt5:
+	./install/qt5
+
+##rustdesk: Install rustdesk client v1.1.9 (deb)
 rustdesk:
 	./install/rustdesk
 
@@ -99,7 +125,7 @@ wine:
 zint:
 	./install/zint
 
-##zsh: Install zsh + omz (latest)
+##zsh: Install vanilla zsh
 zsh:
 	./install/zsh
 

README.md

@@ -4,11 +4,14 @@
 
 ## Requirements
 
+* Ubuntu >= 20.04 (not tested with version < 20)
 * `bash`, `zsh` or other `sh`-compatible shell
 * `make` (optional but recommended)
 * `wget` (necessary for some scripts)
 * `git` (necessary for some scripts)
 
+If some dependecies are missed for some of these scripts it is enougth to run `./install/apt` in most cases.
+
 ## Usage
 
 ### Clone this repo (recommended)
@@ -23,36 +26,37 @@ wget -qO - https://git.axenov.dev/anthony/my-env/archive/master.tar.gz | tar -zx
 # switch to repo dir
 cd my-env
 
+# generate fresh ./Makefile and get full list of `make` goals
+./gen-makefile
+
 # get full list of `make` goals
 make help
-
-# generate new ./Makefile and get full list of `make` goals
-./gen-makefile.sh
 ```
 
-> I do not recomend to run `make` without arguments.
+> I do not recommend to run `make` without arguments since then ALL goals will be started in their order.
+> 
 > Use `make help` to look around.
 
 ### Selective straightforward installation
 
 ```shell
 # from remote file
-wget -qO - https://git.axenov.dev/anthony/my-env/raw/branch/master/install/apt.sh | bash
+wget -qO - https://git.axenov.dev/anthony/my-env/raw/branch/master/install/apt | bash
 
 # from locally cloned repo
-./install/apt.sh
+./install/apt
 ```
 
 ## How to add a new software script?
 
-1. Create new `./install/*.sh` script.  
+1. Create new `./install/*` script.  
    At the beggining of a file you must write these two lines:
    ```shell
    #!/bin/bash
    ##makedesc: Your description for Makefile
    ```
 2. Test your script
-3. Run `./gen-makefile.sh` to generate new `./Makefile`
+3. Run `./gen-makefile` to generate new `./Makefile`
 
 ## How to create packs?
 
@@ -97,6 +101,14 @@ docker run -it $(docker build -q .)
 
 Now you can play around with scripts.
 
+## TODO
+
+* build: [flameshot](https://github.com/flameshot-org/flameshot#compilation)
+* build: [rustdesk](https://github.com/rustdesk/rustdesk#build)
+* [JB mono](https://www.jetbrains.com/ru-ru/lp/mono/#how-to-install) ([2](https://fonts.google.com/specimen/JetBrains+Mono))
+* update scripts (when possible)
+* uninstall scripts (when possible)
+
 ## License
 
 [WTFPLv2](LICENSE)

install/apt

@@ -29,7 +29,6 @@ sudo apt install -y \
     libcurl4-gnutls-dev \
     libexpat1-dev \
     libghc-zlib-dev \
-    libreoffice \
     libssl-dev \
     lsb-release \
     lsp-plugins \
@@ -47,16 +46,11 @@ sudo apt install -y \
     terminator \
     ubuntu-restricted-extras \
     unzip \
-    vlc \
+    vlc
-    # at \
-    # compiz \
-    # compizconfig-settings-manager \
-    # deepin-screenshot \
     # earlyoom \
     # etckeeper \
     # geoclue-2.0 \
     # gnome-software \
     # minder \
-    # nodejs \
     # redshift \
     # redshift-gtk

install/flameshot-build

@@ -0,0 +1,8 @@
+#!/bin/bash
+##makedesc: [TODO] Build flameshot from src (latest)
+
+echo
+echo "==============================================="
+echo "Installing flameshot (latest)..."
+echo "==============================================="
+echo

install/libreoffice

@@ -0,0 +1,11 @@
+#!/bin/bash
+##makedesc: Install libreoffice
+
+echo
+echo "==============================================="
+echo "Installing libreoffice..."
+echo "==============================================="
+echo
+
+sudo apt update && \
+    sudo apt install -y --autoremove libreoffice

install/omz-clean

@@ -0,0 +1,49 @@
+#!/bin/bash
+##makedesc: Install omz (latest) + powerline10k + MesloLGS fonts
+
+echo
+echo "==============================================="
+echo "Installing omz (latest) + powerline10k + MesloLGS fonts..."
+echo "==============================================="
+echo
+
+installed() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+if ! installed zsh || ! installed git || ! installed curl; then
+    echo "ERROR: you need git, zsh and curl to be installed!"
+    exit 1
+fi
+
+echo
+echo "1. Installing oh-my-zsh..."
+sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+
+echo
+echo "2. Installing MesloLGS fonts..."
+mkdir -p ~/.local/share/fonts/
+wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Regular.ttf -O "~/.local/share/fonts/MesloLGS NF Regular.ttf"
+wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold.ttf -O "~/.local/share/fonts/MesloLGS NF Bold.ttf"
+wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Italic.ttf -O "~/.local/share/fonts/MesloLGS NF Italic.ttf"
+wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold%20Italic.ttf -O "~/.local/share/fonts/MesloLGS NF Bold Italic.ttf"
+fc-cache -vf ~/.local/share/fonts/
+
+echo
+echo "3. Installing powerlevel10k theme..."
+git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+sed -i 's#^ZSH_THEME=.*$#ZSH_THEME="powerlevel10k/powerlevel10k"#g' ~/.zshrc
+
+echo
+echo "4. Installing plugins..."
+git clone https://github.com/zsh-users/zsh-autosuggestions.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+sed -i 's/^plugins=/#plugins=/g' ~/.zshrc
+echo "plugins=(git laravel docker docker-compose composer zsh-autosuggestions zsh-syntax-highlighting)" >> ~/.zshrc
+p10k configure
+
+echo
+echo "Finish! You need to:"
+echo "- review your plugins in ~/.zshrc"
+echo "- log out of your session and login again"
+echo

install/papirus

@@ -0,0 +1,32 @@
+#!/bin/bash
+##makedesc: Install papirus-icon-theme (latest)
+
+echo
+echo "==============================================="
+echo "Installing papirus-icon-theme (latest)..."
+echo "==============================================="
+echo
+
+installed() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+if installed git; then
+    mkdir ${HOME}/install/
+    git clone https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git --depth=1 ${HOME}/install/papirus-icon-theme
+else
+    ! installed wget && sudo apt install -y wget
+    mkdir ${HOME}/install/papirus-icon-theme
+    wget https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/refs/heads/master.zip -O ${HOME}/install/papirus-icon-theme.zip
+    unzip ${HOME}/install/papirus-icon-theme.zip -d ${HOME}/install/papirus-icon-theme
+fi
+
+ln -s ${HOME}/install/papirus-icon-theme/Papirus ${HOME}/.local/share/icons/Papirus
+ln -s ${HOME}/install/papirus-icon-theme/Papirus-Dark ${HOME}/.local/share/icons/Papirus-Dark
+ln -s ${HOME}/install/papirus-icon-theme/Papirus-Light ${HOME}/.local/share/icons/Papirus-Light
+
+echo
+echo "Finish! Don't forget to change current icon theme."
+echo "You can find them here:"
+echo -e "\t${HOME}/.local/share/icons/"
+echo

install/postman

@@ -7,21 +7,21 @@ echo "Installing postman (latest)..."
 echo "==============================================="
 echo
 
-wget "https://dl.pstmn.io/download/latest/linux64" -O /tmp/postman.tar.gz
+mkdir -p ${HOME}/install/postman
-# sudo tar -xvzf /tmp/postman.tar.gz -C /usr/local/bin
+# mkdir -p ${HOME}/.local/bin
-sudo tar -xzf /tmp/postman.tar.gz -C /usr/local
+# wget "https://dl.pstmn.io/download/latest/linux64" -O ${HOME}/install/postman.tar.gz && \
-rm /tmp/postman.tar.gz
+    tar -xzf ${HOME}/install/postman.tar.gz -C ${HOME}/install/postman && \
-sudo ln -s /usr/local/Postman/Postman /usr/local/bin/postman
+    ln -s ${HOME}/install/postman/Postman/Postman ${HOME}/.local/bin/postman && \
-
+    cat << EOF > ${HOME}/.local/share/applications/Postman.desktop
-echo "#!/usr/bin/env xdg-open
+#!/usr/bin/env xdg-open
 
 [Desktop Entry]
 Name=Postman
-Exec=/usr/local/bin/postman
+Exec=${HOME}/.local/bin/postman
-Icon=/usr/local/Postman/app/icons/icon_128x128.png
+Icon=${HOME}/install/postman/Postman/app/icons/icon_128x128.png
 Categories=Utility,Network
 Terminal=false
 Type=Application
 Encoding=UTF-8
-" > $HOME/.local/share/applications/Postman.desktop
+EOF
 sudo update-desktop-database

install/qt5

@@ -0,0 +1,25 @@
+#!/bin/bash
+##makedesc: Install qt5
+
+echo
+echo "==============================================="
+echo "Installing qt5..."
+echo "==============================================="
+echo
+
+sudo apt install -y --autoremove \
+    build-essential \
+    ca-certificates \
+    cmake \
+    g++ \
+    libqt5core5a \
+    libqt5dbus5 \
+    libqt5gui5 \
+    libqt5network5 \
+    libqt5svg5 \
+    libqt5svg5-dev \
+    libqt5widgets5 \
+    openssl \
+    qtbase5-dev \
+    qttools5-dev \
+    qttools5-dev-tools

install/rustdesk

@@ -1,7 +1,7 @@
 #!/bin/bash
-##makedesc: Install rustdesk v1.1.8 (deb)
+##makedesc: Install rustdesk client v1.1.9 (deb)
 
-[ $1 ] && RDVER="$1" || RDVER="1.1.8"
+[ $1 ] && RDVER="$1" || RDVER="1.1.9"
 echo
 echo "==============================================="
 echo "Installing rustdesk v${RDVER}..."
@@ -10,7 +10,6 @@ echo
 
 # https://github.com/rustdesk/rustdesk
 
-sudo apt install libxdo3
+sudo apt install libxdo3 && \
-wget "http://github.com/rustdesk/rustdesk/releases/download/${RDVER}/rustdesk-${RDVER}.deb" -qO /tmp/rustdesk.deb
+    wget "http://github.com/rustdesk/rustdesk/releases/download/${RDVER}/rustdesk-${RDVER}.deb" -O ${HOME}/install/rustdesk_${RDVER}.deb && \
-sudo dpkg -i /tmp/rustdesk.deb
+    sudo dpkg -i ${HOME}/install/rustdesk_${RDVER}.deb
-rm /tmp/rustdesk.deb

install/zsh

@@ -1,56 +1,11 @@
 #!/bin/bash
-##makedesc: Install zsh + omz (latest)
+##makedesc: Install vanilla zsh
 
 echo
 echo "==============================================="
-echo "Installing zsh + omz (latest)..."
+echo "Installing vanilla zsh..."
 echo "==============================================="
 echo
 
-installed() {
-    command -v "$1" >/dev/null 2>&1
-}
-
-if ! installed git || ! installed curl; then
-    echo "ERROR: you need git and curl to be installed!"
-    exit 1
-fi
-
 sudo apt install -y --autoremove zsh
-# sudo chsh -s $(which zsh)
+echo "source ~/.profile" >> ~/.zshrc
-
-# Based on:
-# https://github.com/Powerlevel9k/powerlevel9k/wiki/Install-Instructions
-# https://github.com/ohmyzsh/ohmyzsh
-# https://powerline.readthedocs.io/en/latest/installation/linux.html#fonts-installation
-# https://gist.github.com/dogrocker/1efb8fd9427779c827058f873b94df95
-# https://linuxhint.com/install_zsh_shell_ubuntu_1804/
-
-echo
-echo "1. Installing oh-my-zsh..."
-sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-
-echo
-echo "2. Installing powerlevel9k theme (legacy)..."
-git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k
-sed -i 's@^ZSH_THEME=.*$@ZSH_THEME="powerlevel9k/powerlevel9k"@g' ~/.zshrc
-
-echo
-echo "3. Installing powerline fonts..."
-wget https://github.com/powerline/powerline/raw/develop/font/PowerlineSymbols.otf
-wget https://github.com/powerline/powerline/raw/develop/font/10-powerline-symbols.conf
-mkdir -p ~/.local/share/fonts/
-mv PowerlineSymbols.otf ~/.local/share/fonts/
-fc-cache -vf ~/.local/share/fonts/
-mkdir -p ~/.config/fontconfig/conf.d/
-mv 10-powerline-symbols.conf ~/.config/fontconfig/conf.d/
-
-echo
-echo "4. Installing autosuggestions and syntax highlighting..."
-git clone https://github.com/zsh-users/zsh-autosuggestions.git .oh-my-zsh/custom/plugins/zsh-autosuggestions
-git clone https://github.com/zsh-users/zsh-syntax-highlighting.git .oh-my-zsh/custom/plugins/zsh-syntax-highlighting
-sed -i 's@plugins=(git)@plugins=(git zsh-autosuggestions zsh-syntax-highlighting)@g' ~/.zshrc
-
-echo
-echo "Finish! Log out of your session and login again."
-echo

packs/flameshot

@@ -0,0 +1,2 @@
+##flameshot: [TODO] [PACK] qt5 + flameshot from source
+flameshot: qt5 flameshot-build

packs/lamp

@@ -0,0 +1,2 @@
+##lamp: [PACK] Apache + php + mariadb
+lamp: apache php mariadb

packs/lamp.makefile

@@ -1,2 +0,0 @@
-##lamp: Apache + php + mariadb
-lamp: apache php mariadb

packs/omz

@@ -0,0 +1,2 @@
+##omz: [PACK] zsh + omz + powerline10k + MesloLGS fonts
+omz: zsh omz-clean