diff --git a/.config/hypr/execs.conf b/.config/hypr/execs.conf old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore index 080a2b5e..69150b66 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ .config/ags/style.css .config/ags/scss/_material.scss .config/hypr/colors.conf -/ags +/cache diff --git a/dependencies.txt b/dependencies.txt index fc1cf021..75468dbe 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -10,5 +10,5 @@ blueberry networkmanager brightnessctl wlsunset-git gnome-bluetooth-3.0 wayland-idle-inhibitor-git swayidle swaylock-effects-git wlogout wl-clipboard hyprpicker-git grim tesseract slurp adw-gtk3-git gradience-git swww -lexend-fonts-git ttf-jetbrains-mono-nerd ttf-material-symbols-variable-git ttf-space-mono-nerd +fontconfig lexend-fonts-git ttf-jetbrains-mono-nerd ttf-material-symbols-variable-git ttf-space-mono-nerd fish foot starship diff --git a/install.sh b/install.sh index 3b80e772..d144e424 100755 --- a/install.sh +++ b/install.sh @@ -14,21 +14,59 @@ function v() { echo " e = Exit now" echo " s = Skip this command; NOT recommended (may break functions needed by the dotfiles!)" echo " yesforall = yes and don't ask again; NOT recommended unless you really sure" - read -p "Enter here [y/e/s/yesforall]:" p + read -p "Enter here [y/e/s/yesforall]: " p case $p in [yY]) echo -e "\e[34mOK, executing...\e[0m" ;break ;; [eE]) echo -e "\e[34mExiting...\e[0m" ;exit ;break ;; - [sS]) echo -e "\e[34mAlright, skipping this one...\e[0m" ;export execute=false ;break ;; - "yesforall") echo -e "\e[34mAlright, won't ask again. Executing...\e[0m"; export ask=false ;break ;; + [sS]) echo -e "\e[34mAlright, skipping this one...\e[0m" ;execute=false ;break ;; + "yesforall") echo -e "\e[34mAlright, won't ask again. Executing...\e[0m"; ask=false ;break ;; *) echo -e "\e[31mPlease enter one of [y/e/s/yesforall].\e[0m";; esac done fi - if $execute;then - "$@" + if $execute;then x "$@";else + echo -e "\e[33m[$0]: Command \"\e[32m$@\e[33m\" has been skipped by user.\e[0m" fi } +# When use v() for a defined function, use x() INSIDE its definition to catch errors. +function x() { + if "$@";then cmdstatus=0;else cmdstatus=1;fi # 0=normal; 1=failed; 2=failed but ignored + while [ $cmdstatus == 1 ] ;do + echo -e "\e[31m[$0]: Command \"\e[32m$@\e[31m\" has failed." + echo -e "You may need to resolve the problem manually BEFORE repeating this command.\e[0m" + echo " r = Repeat this command (DEFAULT)" + echo " e = Exit now" + echo " i = Ignore this error and continue (your setup might not work correctly)" + read -p "Enter here [R/e/i]: " p + case $p in + [iI]) echo -e "\e[34mAlright, ignore and continue...\e[0m";cmdstatus=2;; + [eE]) echo -e "\e[34mAlright, will exit.\e[0m";break;; + *) echo -e "\e[34mOK, repeating...\e[0m" + if "$@";then cmdstatus=0;else cmdstatus=1;fi + ;; + esac + done + case $cmdstatus in + 0) echo -e "\e[34m[$0]: Command \"\e[32m$@\e[34m\" finished.\e[0m";; + 1) echo -e "\e[31m[$0]: Command \"\e[32m$@\e[31m\" has failed. Exiting...\e[0m";exit 1;; + 2) echo -e "\e[31m[$0]: Command \"\e[32m$@\e[31m\" has failed but ignored by user.\e[0m";; + esac +} +function showfun() { + echo -e "\e[34m[$0]: The definition of function \"$1\" is as follows:\e[0m" + printf "\e[32m" + type -a $1 + printf "\e[97m" +} ##################################################################################### +# For debugging +# ask=false +# mkdir -p /tmp/test1 +# v mkdir /tmp/test1 +# +# echo "debug part fin";exit +##################################################################################### +if ! command -v pacman >/dev/null 2>&1;then printf "\e[31m[$0]: pacman not found, it seems that the system is not ArchLinux or Arch-based distros. Aborting...\e[0m\n";exit 1;fi startask (){ printf "\e[34m[$0]: Hi there!\n" printf 'This script 1. only works for ArchLinux and Arch-based distros.\n' @@ -36,35 +74,53 @@ printf ' 2. has not been fully tested, use at your own risk.\n' printf "\e[31m" printf "Please CONFIRM that you HAVE ALREADY BACKED UP \"$HOME/.config/\" and \"$HOME/.local/\" folders!\n" printf "\e[97m" -printf "Enter capital \"YES\" (without quotes) to continue: " +printf "Enter capital \"YES\" (without quotes) to continue:" read -p " " p case $p in "YES")sleep 0;; *)exit;;esac printf '\n' printf 'Do you want to confirm everytime before a command executes?\n' -printf ' y = Yes, ask me before executing each of them. (RECOMMENDED)\n' -printf ' n = No, just execute them automatically.\n' -printf ' a = Abort. (DEFAULT)\n' +printf ' y = Yes, ask me before executing each of them. (RECOMMENDED)\n' +printf ' n = No, just execute them automatically.\n' +printf ' a = Abort. (DEFAULT)\n' read -p "Enter [y/n/A]: " p case $p in - y)export ask=true;; - n)export ask=false;; + y)ask=true;; + n)ask=false;; *)exit;; esac } case $1 in - "-f")export ask=false;; + "-f")ask=false;; *)startask ;; esac set -e ##################################################################################### -printf '\e[36m1. Get packages and add user to video/input groups\n\e[97m' +printf "\e[36m[$0]: 1. Get packages and add user to video/input groups\n\e[97m" # Each line as an element of the array $pkglist readarray -t pkglist < dependencies.txt # NOTE: wayland-idle-inhibitor-git is for providing `wayland-idle-inhibitor.py' used by the `Keep system awake' button in `.config/ags/widgets/sideright/quicktoggles.js'. +# yay will be installed as AUR package and upgrade there, no need to build here in cache/yay . +install-yay() { + x sudo pacman -Sy --needed --noconfirm base-devel + x git clone https://aur.archlinux.org/yay-bin.git /tmp/buildyay + x cd /tmp/buildyay + x makepkg -o + x makepkg -se + x makepkg -i --noconfirm + x cd $base + rm -rf /tmp/buildyay +} + +if ! command -v yay >/dev/null 2>&1;then + echo -e "\e[33m[$0]: \"yay\" not found.\e[0m" + showfun install-yay + v install-yay +fi + if $ask;then # execute per element of the array $pkglist for i in "${pkglist[@]}";do v yay -S --needed $i;done @@ -77,29 +133,72 @@ v sudo usermod -aG video "$(whoami)" v sudo usermod -aG input "$(whoami)" ##################################################################################### -printf '\e[36m2. Installing AGS from git repo\e[97m\n' +printf "\e[36m[$0]: 2. Installing AGS and fonts from git repo\e[97m\n" sleep 1 -installags (){ - v git clone --recursive https://github.com/Aylur/ags.git|| \ - if [ -d ags ];then - printf "\e[36mSeems \"./ags\" already exists.\e[97m\n" - cd ags - v git pull - else exit 1 - fi - v npm install - v meson setup build - v meson install -C build - cd $base +install-ags (){ + x mkdir -p $base/cache/ags + x cd $base/cache/ags + try git init -b main + try git remote add origin https://github.com/Aylur/ags.git + x git pull origin main && git submodule update --init --recursive + x npm install + x meson setup build + x meson install -C build + x cd $base +} +install-Rubik (){ + x mkdir -p $base/cache/Rubik + x cd $base/cache/Rubik + try git init -b main + try git remote add origin https://github.com/googlefonts/rubik.git + x git pull origin main && git submodule update --init --recursive + x sudo mkdir -p /usr/local/share/fonts/TTF/ + x sudo cp fonts/variable/Rubik*.ttf /usr/local/share/fonts/TTF/ + x sudo mkdir -p /usr/local/share/licenses/ttf-rubik/ + x sudo cp OFL.txt /usr/local/share/licenses/ttf-rubik/LICENSE + x fc-cache -fv + x cd $base +} +install-Gabarito (){ + x mkdir -p $base/cache/Gabarito + x cd $base/cache/Gabarito + try git init -b main + try git remote add origin https://github.com/naipefoundry/gabarito.git + x git pull origin main && git submodule update --init --recursive + x sudo mkdir -p /usr/local/share/fonts/TTF/ + x sudo cp fonts/ttf/Gabarito*.ttf /usr/local/share/fonts/TTF/ + x sudo mkdir -p /usr/local/share/licenses/ttf-gabarito/ + x sudo cp OFL.txt /usr/local/share/licenses/ttf-gabarito/LICENSE + x fc-cache -fv + x cd $base } -if command -v ags >/dev/null 2>&1 - then echo -e "\e[34mCommand \"ags\" already exists. Won\'t install ags.\e[0m" - else installags -fi +if command -v ags >/dev/null 2>&1;then + echo -e "\e[33m[$0]: Command \"ags\" already exists, no need to install.\e[0m" + echo -e "\e[34mYou can reinstall it in order to update to the latest version anyway.\e[0m" + ask_ags=$ask +else ask_ags=true +fi +if $ask_ags;then showfun install-ags;v install-ags;fi + +if $(fc-list|grep -q Rubik); then + echo -e "\e[33m[$0]: Font \"Rubik\" already exists, no need to install.\e[0m" + echo -e "\e[34mYou can reinstall it in order to update to the latest version anyway.\e[0m" + ask_Rubik=$ask +else ask_Rubik=true +fi +if $ask_Rubik;then showfun install-Rubik;v install-Rubik;fi + +if $(fc-list|grep -q Gabarito); then + echo -e "\e[33m[$0]: Font \"Gabarito\" already exists, no need to install.\e[0m" + echo -e "\e[34mYou can reinstall it in order to update to the latest version anyway.\e[0m" + ask_Gabarito=$ask +else ask_Gabarito=true +fi +if $ask_Gabarito;then showfun install-Gabarito;v install-Gabarito;fi ##################################################################################### -printf '\e[36m3. Copying\e[97m\n' +printf "\e[36m[$0]: 3. Copying\e[97m\n" # In case ~/.local/bin does not exists v mkdir -p "$HOME/.local/bin" "$HOME/.local/share" @@ -110,12 +209,17 @@ v mkdir -p "$HOME/.local/bin" "$HOME/.local/share" for i in .config/* do - echo "Found target: $i" + echo "[$0]: Found target: $i" if [ -d "$i" ];then v rsync -av --delete "$i/" "$HOME/$i/" elif [ -f "$i" ];then v rsync -av "$i" "$HOME/$i" fi done +target="$HOME/.config/hypr/colors.conf" +test -f $target || { \ + echo -e "\e[34m[$0]: File \"$target\" not found.\e[0m" && \ + v cp "$HOME/.config/hypr/colors_default.conf" $target ; } + # some foldes (eg. .local/bin) should be processed seperately to avoid `--delete' for rsync, # since the files here come from different places, not only about one program. v rsync -av ".local/bin/" "$HOME/.local/bin/"