diff --git a/1-install.sh b/1-install.sh index 23946ff..a278279 100755 --- a/1-install.sh +++ b/1-install.sh @@ -15,7 +15,6 @@ # Load Library # ------------------------------------------------------ source $(dirname "$0")/scripts/library.sh - clear echo " _ _ __ _ _ " echo " __| | ___ | |_ / _(_) | ___ ___ " @@ -67,7 +66,7 @@ done echo "" echo "-> Install main packages" -packagesPacman=("alacritty" "chromium" "scrot" "nitrogen" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click"); +packagesPacman=("alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click"); packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme"); # pywal installation below @@ -105,11 +104,9 @@ echo "" echo "-> Install symbolic links" _installSymLink ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config -_installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config _installSymLink ~/.config/rofi ~/dotfiles/rofi/ ~/.config _installSymLink ~/.config/vim ~/dotfiles/vim/ ~/.config _installSymLink ~/.config/nvim ~/dotfiles/nvim/ ~/.config -_installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config _installSymLink ~/.config/dunst ~/dotfiles/dunst/ ~/.config _installSymLink ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml diff --git a/2-qtile.sh b/2-qtile.sh index 0dd61b3..502c893 100755 --- a/2-qtile.sh +++ b/2-qtile.sh @@ -13,6 +13,7 @@ # ------------------------------------------------------ # Confirm Start # ------------------------------------------------------ +source $(dirname "$0")/scripts/library.sh clear echo " ___ _____ ___ _ _____ " echo " / _ \_ _|_ _| | | ____| " @@ -44,91 +45,24 @@ echo "" echo "" echo "-> Install main packages" -packagesPacman=("qtile" "picom" "rofi" "dunst" "polybar" "rofi-calc"); +packagesPacman=("qtile" "picom" "polybar"); # packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme"); # pywal installation below -# ------------------------------------------------------ -# Function: Is package installed -# ------------------------------------------------------ -_isInstalledPacman() { - package="$1"; - check="$(sudo pacman -Qs --color always "${package}" | grep "local" | grep "${package} ")"; - if [ -n "${check}" ] ; then - echo 0; #'0' means 'true' in Bash - return; #true - fi; - echo 1; #'1' means 'false' in Bash - return; #false -} - -_isInstalledYay() { - package="$1"; - check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")"; - if [ -n "${check}" ] ; then - echo 0; #'0' means 'true' in Bash - return; #true - fi; - echo 1; #'1' means 'false' in Bash - return; #false -} - -# ------------------------------------------------------ -# Function Install all package if not installed -# ------------------------------------------------------ -_installPackagesPacman() { - toInstall=(); - - for pkg; do - if [[ $(_isInstalledPacman "${pkg}") == 0 ]]; then - echo "${pkg} is already installed."; - continue; - fi; - - toInstall+=("${pkg}"); - done; - - if [[ "${toInstall[@]}" == "" ]] ; then - # echo "All pacman packages are already installed."; - return; - fi; - - printf "Packages not installed:\n%s\n" "${toInstall[@]}"; - sudo pacman --noconfirm -S "${toInstall[@]}"; -} - -_installPackagesYay() { - toInstall=(); - - for pkg; do - if [[ $(_isInstalledYay "${pkg}") == 0 ]]; then - echo "${pkg} is already installed."; - continue; - fi; - - toInstall+=("${pkg}"); - done; - - if [[ "${toInstall[@]}" == "" ]] ; then - # echo "All packages are already installed."; - return; - fi; - - printf "AUR ackages not installed:\n%s\n" "${toInstall[@]}"; - yay --noconfirm -S "${toInstall[@]}"; -} - # ------------------------------------------------------ # Install required packages # ------------------------------------------------------ _installPackagesPacman "${packagesPacman[@]}"; -# _installPackagesYay "${packagesYay[@]}"; # ------------------------------------------------------ # Create symbolic links # ------------------------------------------------------ + echo "-> Create symbolic link for startx" +_installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config +_installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config + rm ~/.xinitrc ln -s ~/dotfiles/qtile/.xinitrc ~/.xinitrc diff --git a/3-hyprland.conf b/3-hyprland.conf index 40e96fd..224b037 100755 --- a/3-hyprland.conf +++ b/3-hyprland.conf @@ -14,6 +14,7 @@ # ------------------------------------------------------ # Confirm Start # ------------------------------------------------------ +source $(dirname "$0")/scripts/library.sh clear echo " ___ _____ ___ _ _____ " echo " / _ \_ _|_ _| | | ____| " @@ -42,7 +43,8 @@ echo "" # ------------------------------------------------------ # Install required packages # ------------------------------------------------------ -sudo pacman -S --noconfirm qtile + +packagesPacman=("hyprland") # ------------------------------------------------------ # Create symbolic links diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 9ff5938..801702f 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -127,6 +127,7 @@ bind = $mainMod, V, togglefloating, bind = $mainMod CTRL, RETURN, exec, wofi --show drun bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, B, exec, brave # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l