Uptade: Added more fonts, added arch-install.sh, modified README.md, cleaning.

README.md

@@ -45,9 +45,9 @@ My personal build of dotfiles using i3. Color palette is based on OneDark color
 ## ⚡ Dependecies
 
 ### Packaged used
-* base: base-devel wget git acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib
+* base: base-devel wget git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib
-* wm and X11: i3-gaps i3blocks i3lock xorg xorg-xinit xorg-server
+* wm and X11: i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server
-* lockscreen: i3lock betterlockscreen feh imagemagick
+* lockscreen: i3lock-color betterlockscreen feh imagemagick
 * programs: kitty rofi dunst (with libnotify) ranger ncmpcpp mpd polybar papirus-icon-theme btop sddm zsh (with oh-my-zsh) picom cava code neovim
 * screenshot script: xclip scrot ffcast slop         
 * emoji fonts: noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk
@@ -59,7 +59,7 @@ My personal build of dotfiles using i3. Color palette is based on OneDark color
 
 ## 🛠️ Installation
 
-I recommend manually installing packages and coping files, but if you are lazy or are a productive person who don't want to waste your time, you can try  to use arch install script and commands bellow:
+I recommend manually installing packages and coping files, but if you are lazy or are a productive person who don't want to waste your time, you can try  to use arch install script.
 
 ### Arch manually
 
@@ -70,15 +70,15 @@ I recommend manually installing packages and coping files, but if you are lazy o
 1. Install AUR helper (for example yay in ~/.srcs)
     ```sh
     mkdir -p ~/.srcs
-    git clone https://aur.archlinux.org/$HELPER.git ~/.srcs/$HELPER
+    git clone https://aur.archlinux.org/yay.git ~/.srcs/yay
-	(cd ~/.srcs/$HELPER/ && makepkg -si )
+	(cd ~/.srcs/yay/ && makepkg -si )
     ```
 1. Install packages (see [Dependecies](https://github.com/keyitdev/dotfiles#Dependecies))
 1. Make light executable
     ```sh
     sudo chmod +s /usr/bin/light
     ```
-1. Copy files (config folder to `$HOME/.config`, fonts to `/usr/share/fonts/`, wallpaper to `$HOME/Pictures/wallpapers` etc.)
+1. Copy files (config folder to `$HOME/.config`, scripts folder to `/usr/local/bin` fonts to `/usr/share/fonts/`, wallpaper to `$HOME/Pictures/wallpapers` etc.)
 1. Install oh my zsh
     ```sh
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
@@ -100,8 +100,9 @@ I recommend manually installing packages and coping files, but if you are lazy o
     ```
 1. Install sddm astronaut theme
     ```sh
-    sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git /usr/share/
+    sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git
-    sddm/themes/
+    sudo cp -fdr sddm-astronaut-theme /usr/share/sddm/themes/
+    sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/
     ```
 1. Edit `/etc/sddm.conf`
     ```
@@ -112,43 +113,44 @@ I recommend manually installing packages and coping files, but if you are lazy o
 
 ### Arch with script
 
-Clone dotfiles
+1.  Clone dotfiles
     ```
-git clone https://www.github.com/keyitdev/dotfiles.git
+    git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git
     cd dotfiles
     chmod +x install-on-arch.sh
     ./install-on-arch.sh
     ```
-Install oh my zsh
+1. Install oh my zsh
     ```sh
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
     ```
-Set zsh as default shell
+1. Set zsh as default shell
     ```sh
     chsh -s /bin/zsh
     sudo chsh -s /bin/zsh
     ```
-Install AstroVim
+1. Install AstroVim
     ```sh
     git clone --depth 10 https://github.com/kabinspace/AstroVim.git ~/.config/nvim
     nvim +PackerSync
     ```
-Install gtk3 theme
+1. Install gtk3 theme
     ```sh
     git clone https://github.com/EliverLara/ant.git
     sudo mv ./Ant /usr/share/themes
     ```
-Install sddm astronaut theme
+1. Install sddm astronaut theme
     ```sh
-sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git /usr/share/
+    sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git
-sddm/themes/
+    sudo cp -fdr sddm-astronaut-theme /usr/share/sddm/themes/
+    sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/
     ```
-Edit `/etc/sddm.conf`
+1. Edit `/etc/sddm.conf`
     ```
     [Theme]
     Current=sddm-astronaut-theme
     ```
-[Install Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM)
+1. [Install Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM)
 
 ## 🛠️ Uninstallation
 
@@ -184,6 +186,12 @@ These are the basic keybinds. Read through the `i3` config for more keybinds.
 | `Win + G`              | Gaps settings                            |
 | `Win + V`              | Set vertical orientation                 |
 | `Win + H`              | Set horizontal orientation               |
+| `Win + I`              | Lock screen                              |
+| `Win + O`              | Show polybar                             |
+| `Win + P`              | Hide polybar                             |
+| `Win + B`              | Move workspace to another monitor        |
+| `Win + N`              | Dual monitor mode                        |
+| `Win + M`              | Single monitor mode                      |
 | `Win + arrows (jkl;)`  | Resizing, moving windows                 |
 | `Win + Shift + E`      | Exit i3                                  |
 | `Win + Shift + R`      | Restart i3                               |

config/.zshrc

@@ -1,6 +1,6 @@
 export ZSH="$HOME/.oh-my-zsh"
 
-ZSH_THEME="bira"
+ZSH_THEME="keyitdev"
 
 plugins=(git)
 

config/i3/config

@@ -90,12 +90,16 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # run lockscreen
-bindsym $mod+o exec betterlockscreen -l
+bindsym $mod+i exec betterlockscreen -l
 
 # monitor settings
 bindsym $mod+n exec xrandr --auto --output eDP-1 --mode 1920x1080 --right-of HDMI-1 && i3-msg restart &
 bindsym $mod+m exec xrandr --auto --output HDMI-1 --off && i3-msg restart &
 
+# toggle polybar
+bindsym $mod+o exec $HOME/.config/polybar/launch.sh
+bindsym $mod+p exec killall -q polybar
+
 # move workspaces between monitors
 bindsym $mod+b move workspace to output right
 

config/keyitdev.zsh-theme

@@ -0,0 +1,16 @@
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local user_symbol='%(!.#.$)'
+local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
+local date="[%D{%H:%M:%S}]"
+local vcs_branch='$(git_prompt_info)$(hg_prompt_info)'
+
+ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
+
+PROMPT="${current_dir}${rvm_ruby}${vcs_branch}${date}${venv_prompt}
+%B${user_symbol}%b "
+RPROMPT="%B${return_code}%b"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} |!|%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"

install-on-arch.sh

@@ -1,246 +1,233 @@
 #!/bin/env bash
-set -e
 
-echo "Welcome!" && sleep 2
+echo "Welcome!"
+DATE=$(date +%s)
 
-#Default vars
+system_update(){
-HELPER="paru"
+    echo -e "[*1*] Doing a system update, cause stuff may break if it's not the latest version..."
-
-# does full system update
-echo "Doing a system update, cause stuff may break if it's not the latest version..."
     sudo pacman --noconfirm -Syu
+    sudo pacman -S --noconfirm --needed base-devel wget git curl gcc make
+}
 
-echo "###########################################################################"
+aur_helper(){
-echo "Will do stuff, get ready"
+    cat <<- EOF
-echo "###########################################################################"
+		[*2*] We need an AUR helper. It is essential.
 		
-# install base-devel if not installed
+		[*] Choose your AUR helper.
-sudo pacman -S --noconfirm --needed base-devel wget git
+		[1] yay
+		[2] paru
 	
-# choose video driver
+	EOF
-echo "1) xf86-video-intel 2) xf86-video-amdgpu 3) nvidia 4) xf86-video-amdgpu and nvidia 5) xf86-video-amdgpu and xf86-video-intel 6) skip"
-read -r -p "Choose you video card driver(default 1)(will not re-install): " vid
 
-case $vid in 
+    read -p "[?] Select option: "
-[1])
+    if [[ $REPLY == "1" ]]; then
-	DRI='xf86-video-intel'
-	;;
-[2])
-	DRI='xf86-video-amdgpu'
-	;;
-
-[3])
-    DRI='nvidia nvidia-settings nvidia-utils'
-    ;;
-
-[4])
-	DRI="xf86-video-amdgpu nvidia nvidia-settings nvidia-utils"
-	;;
-[5])
-	DRI="xf86-video-amdgpu xf86-video-intel"
-	;;
-[6])
-	DRI=""
-	;;
-[*])
-	DRI='xf86-video-intel'
-	;;
-esac
-
-# install basics packages
-sudo pacman -S --noconfirm --needed i3-gaps i3blocks i3lock kitty zsh rofi dunst feh mpd ncmpcpp light xclip scrot picom imagemagick curl neovim ranger papirus-icon-theme pulseaudio pulseaudio-alsa pulsemixer alsa-utils xorg xorg-xinit xorg-server libnotify sddm btop pacman-contrib $DRI
-
-# install optional programs
-echo "Install no required but usefull programs? (Code, iwd, libreoffice, firefox etc."
-read -r -p "1) Yes 2) Nope" INSTALL_PROGRAMS
-
-if [ $INSTALL_PROGRAMS -eq 1 ]
-then
-   sudo pacman -S --noconfirm --needed code iwd dhcpcd ntfs-3g libreoffice firefox nautilus gimp
-fi
-
-# install emoji fonts
-echo "Install emoji fonts?"
-read -r -p "1) Yes 2) Nope" INSTALL_FONTS
-
-if [ $INSTALL_FONTS -eq 1 ]
-then
-   sudo pacman -S --noconfirm --needed noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk
-   
-    if [ -f /etc/fonts/local.conf ]; then
-        echo "Fonts configs detected, backing up..."
-        sudo cp /etc/fonts/local.conf /etc/fonts/local.conf.old
-        sudo cp ./config/local.conf /etc/fonts/;
-    else
-        echo "Installing fonts configs..."
-        sudo cp ./config/local.conf /etc/fonts/;
-    fi
-
-   fc-cache -f
-fi
-
-# make light executable
-sudo chmod +s /usr/bin/light
-
-# install fonts
-mkdir -p ~/.local/share/fonts
-cp -r ./fonts/* ~/.local/share/fonts/
-fc-cache -f
-clear 
-
-# install scripts
-sudo mkdir -p /usr/local/bin
-sudo cp -r ./scripts/* /usr/local/bin
-sudo cp -r ./themes/ /usr/local/bin/
-
-# create default folders
-mkdir -p ~/.srcs
-mkdir -p ~/Pictures/screenshots/rofi
-mkdir -p ~/Videos/rofi
-mkdir -p ~/Music/rofi
-
-# copy wallpapers
-mkdir -p ~/Pictures/wallpapers
-cp -r ./wallpapers/* ~/Pictures/wallpapers
-
-echo "We need an AUR helper. It is essential. 1) paru       2) yay"
-read -r -p "What is the AUR helper of your choice? (Default is paru): " num
-
-if [ $num -eq 2 ]
-then
         HELPER="yay"
-fi
-
         if ! command -v $HELPER &> /dev/null
         then
-    echo "It seems that you don't have $HELPER installed, I'll install that for you before continuing."
+        echo -e "\n[*] It seems that you don't have $HELPER installed, I'll install that for you before continuing."
-	git clone https://aur.archlinux.org/$HELPER.git ~/.srcs/$HELPER
+	    git clone https://aur.archlinux.org/$HELPER.git $HOME/.srcs/$HELPER
-	(cd ~/.srcs/$HELPER/ && makepkg -si )
+	    (cd $HOME/.srcs/$HELPER/ && makepkg -si )
+        else
+        echo -e "\n[*] It seems that you already have $HELPER installed, skipping."
         fi
+    elif [[ $REPLY == "2" ]]; then
+        HELPER="paru"
+        if ! command -v $HELPER &> /dev/null
+        then
+        echo -e "\n[*] It seems that you don't have $HELPER installed, I'll install that for you before continuing."
+	    git clone https://aur.archlinux.org/$HELPER.git $HOME/.srcs/$HELPER
+	    (cd $HOME/.srcs/$HELPER/ && makepkg -si )
+        else
+        echo -e "\n[*] It seems that you already have $HELPER installed, skipping."
+        fi
+    else
+		echo -e "\n[!] Invalid option, exiting...\n"
+		exit 1
+	fi
+}
 
+install_packages(){
+    echo -e "[*3*] Instaling packages with pacman."
+    sudo pacman -S --noconfirm --needed light pulseaudio pulseaudio-alsa pulsemixer alsa-utils pacman-contrib i3-gaps i3blocks xorg xorg-xinit xorg-server feh imagemagick kitty rofi dunst libnotify ranger ncmpcpp mpd papirus-icon-theme btop sddm zsh picom code neovim xclip scrot
+    
+    echo -e "\n[*] Instaling packages with $HELPER."
     $HELPER -S acpi      \
 	   polybar           \
        ffcast            \
+       betterlockscreen  \
+       i3lock-color      \
+       cava              \
        slop
+    echo -e "\n[*] Chmoding light."
+    sudo chmod +s /usr/bin/light
+    echo -e "\n[*] Setting zsh to default shell."
+    chsh -s /bin/zsh
+    sudo chsh -s /bin/zsh
     
-mkdir -p ~/.config/
+    cat <<- EOF
-    if [ -d ~/.config/dunst ]; then
+		[*3*] Still installing packages.
-        echo "Dunst configs detected, backing up..."
+		
-        mkdir -p ~/.config/dunst.old && mv ~/.config/dunst/* ~/.config/dunst.old/
+		[*] Do you want to install no required but usefull programs? (Code, iwd, libreoffice, firefox etc.)
-        cp -r ./config/dunst/* ~/.config/dunst;
+
+		[1] yes
+		[2] nope
+	
+	EOF
+
+	read -p "[?] Select option: "
+
+	if [[ $REPLY == "1" ]]; then
+		sudo pacman -S --noconfirm --needed code iwd dhcpcd ntfs-3g libreoffice firefox nautilus gimp
+	elif [[ $REPLY == "2" ]]; then
+		 echo -e "\n[*] Skipping."
 	else
-        echo "Installing dunst configs..."
+		echo -e "\n[!] Invalid option, exiting...\n"
-        mkdir ~/.config/dunst && cp -r ./config/dunst/* ~/.config/dunst;
+		exit 1
 	fi
-    if [ -d ~/.config/gtk-3.0 ]; then
+
-        echo "Gtk-3.0 configs detected, backing up..."
+    cat <<- EOF
-        mkdir -p ~/.config/gtk-3.0.old && mv ~/.config/gtk-3.0/* ~/.config/gtk-3.0.old/
+		[*3*] Still installing packages.
-        cp -r ./config/gtk-3.0/* ~/.config/gtk-3.0;
+		
+		[*] Do you want to install emoji fonts?
+
+		[1] yes
+		[2] nope
+	
+	EOF
+
+	read -p "[?] Select option: "
+
+	if [[ $REPLY == "1" ]]; then
+		sudo pacman -S --noconfirm --needed noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk
+        DATE=$(date +%s)
+        if [ -f /etc/fonts/local.conf ]; then
+        echo "[*] Fonts configs detected, backing up..."
+        sudo mv /etc/fonts/local.conf /etc/fonts/local.conf$DATE
+        fi
+        sudo cp -f ./config/local.conf /etc/fonts;
+
+	elif [[ $REPLY == "2" ]]; then
+		 echo -e "\n[*] Skipping."
 	else
-        echo "Installing gtk-3.0 configs..."
+		echo -e "\n[!] Invalid option, exiting...\n"
-        mkdir ~/.config/gtk-3.0 && cp -r ./config/gtk-3.0/* ~/.config/gtk-3.0;
+		exit 1
 	fi
-    if [ -d ~/.config/i3 ]; then
+
-        echo "I3 configs detected, backing up..."
+}
-        mkdir -p ~/.config/i3.old && mv ~/.config/i3/* ~/.config/i3.old/
+
-        cp -r ./config/i3/* ~/.config/i3;
+copy_flies(){
-    else
+    DATE=$(date +%s)
-        echo "Installing i3 configs..."
+    echo -e "[*4*] Coping files."
-        mkdir ~/.config/i3 && cp -r ./config/i3/* ~/.config/i3;
+    if [ -d $HOME/.config/btop ]; then
+        echo "[*] btop configs detected, backing up..."
+        mv $HOME/.config/btop $HOME/.config/btop$DATE
     fi
-    if [ -d ~/.config/mpd ]; then
+    mkdir -p $HOME/.config/btop && cp -r ./config/btop/* $HOME/.config/btop;
-        echo "MPD configs detected, backing up..."
+    if [ -d $HOME/.config/cava ]; then
-        mkdir -p ~/.config/mpd.old && mv ~/.config/mpd/* ~/.config/mpd.old/
+        echo "[*] cava configs detected, backing up..."
-        cp -r ./config/mpd/* ~/.config/mpd;
+        mv $HOME/.config/cava $HOME/.config/cava$DATE
-    else
-        echo "Installing mpd configs..."
-        mkdir ~/.config/mpd && cp -r ./config/mpd/* ~/.config/mpd;
     fi
-        if [ -d ~/.config/ncmpcpp ]; then
+    mkdir -p $HOME/.config/cava && cp -r ./config/cava/* $HOME/.config/cava;
-        echo "Ncmpcpp configs detected, backing up..."
+    if [ -d $HOME/.config/dunst ]; then
-        mkdir -p ~/.config/ncmpcpp.old && mv ~/.config/ncmpcpp/* ~/.config/ncmpcpp.old/
+        echo "[*] dunst configs detected, backing up..."
-        cp -r ./config/ncmpcpp/* ~/.config/ncmpcpp;
+        mv $HOME/.config/dunst $HOME/.config/dunst$DATE
-    else
-        echo "Installing ncmpcpp configs..."
-        mkdir ~/.config/ncmpcpp && cp -r ./config/ncmpcpp/* ~/.config/ncmpcpp;
     fi
-        if [ -d ~/.config/picom ]; then
+    mkdir -p $HOME/.config/dunst && cp -r ./config/dunst/* $HOME/.config/dunst;
-        echo "Picom configs detected, backing up..."
+    if [ -d $HOME/.config/gtk-3.0 ]; then
-        mkdir -p ~/.config/picom.old && mv ~/.config/picom/* ~/.config/picom.old/
+        echo "[*] gtk-3.0 configs detected, backing up..."
-        cp -r ./config/picom/* ~/.config/picom;
+        mv $HOME/.config/gtk-3.0 $HOME/.config/gtk-3.0$DATE
-    else
-        echo "Installing picom configs..."
-        mkdir ~/.config/picom && cp -r ./config/picom/* ~/.config/picom;
     fi
-        if [ -d ~/.config/polybar ]; then
+    mkdir -p $HOME/.config/gtk-3.0 && cp -r ./config/gtk-3.0/* $HOME/.config/gtk-3.0;
-        echo "Polybar configs detected, backing up..."
+    if [ -d $HOME/.config/i3 ]; then
-        mkdir -p ~/.config/polybar.old && mv ~/.config/polybar/* ~/.config/polybar.old/
+        echo "[*] i3 configs detected, backing up..."
-        cp -r ./config/polybar/* ~/.config/polybar;
+        mv $HOME/.config/i3 $HOME/.config/i3$DATE
-    else
-        echo "Installing polybar configs..."
-        mkdir ~/.config/polybar && cp -r ./config/polybar/* ~/.config/polybar;
     fi
-        if [ -d ~/.config/ranger ]; then
+    mkdir -p $HOME/.config/i3 && cp -r ./config/i3/* $HOME/.config/i3;
-        echo "Ranger configs detected, backing up..."
+    if [ -d $HOME/.config/kitty ]; then
-        mkdir -p ~/.config/ranger.old && mv ~/.config/ranger/* ~/.config/ranger.old/
+        echo "[*] kitty configs detected, backing up..."
-        cp -r ./config/ranger/* ~/.config/ranger;
+        mv $HOME/.config/kitty $HOME/.config/kitty$DATE
-    else
-        echo "Installing ranger configs..."
-        mkdir ~/.config/ranger && cp -r ./config/ranger/* ~/.config/ranger;
     fi
-    if [ -d ~/.config/btop ]; then
+    mkdir -p $HOME/.config/kitty && cp -r ./config/kitty/* $HOME/.config/kitty;
-        echo "Btop configs detected, backing up..."
+    if [ -d $HOME/.config/mpd ]; then
-        mkdir -p ~/.config/btop.old && mv ~/.config/btop/* ~/.config/btop.old/
+        echo "[*] mpd configs detected, backing up..."
-        cp -r ./config/btop/* ~/.config/btop;
+        mv $HOME/.config/mpd $HOME/.config/mpd$DATE
-    else
-        echo "Installing btop configs..."
-        mkdir ~/.config/btop && cp -r ./config/btop/* ~/.config/btop;
     fi
-    if [ -d ~/.config/neofetch ]; then
+    mkdir -p $HOME/.config/mpd && cp -r ./config/mpd/* $HOME/.config/mpd;
-        echo "Neofetch configs detected, backing up..."
+    if [ -d $HOME/.config/ncmpcpp ]; then
-        mkdir -p ~/.config/neofetch.old && mv ~/.config/neofetch/* ~/.config/neofetch.old/
+        echo "[*] ncmpcpp configs detected, backing up..."
-        cp -r ./config/neofetch/* ~/.config/neofetch;
+        mv $HOME/.config/ncmpcpp $HOME/.config/ncmpcpp$DATE
-    else
-        echo "Installing neofetch configs..."
-        mkdir ~/.config/neofetch && cp -r ./config/neofetch/* ~/.config/neofetch;
     fi
-    if [ -d ~/.config/kitty ]; then
+    mkdir -p $HOME/.config/ncmpcpp && cp -r ./config/ncmpcpp/* $HOME/.config/ncmpcpp;
-        echo "Kitty configs detected, backing up..."
+    if [ -d $HOME/.config/neofetch ]; then
-        mkdir -p ~/.config/kitty.old && mv ~/.config/kitty/* ~/.config/kitty.old/
+        echo "[*] neofetch configs detected, backing up..."
-        cp -r ./config/kitty/* ~/.config/kitty;
+        mv $HOME/.config/neofetch $HOME/.config/neofetch$DATE
-    else
-        echo "Installing kitty configs..."
-        mkdir ~/.config/kitty && cp -r ./config/kitty/* ~/.config/kitty;
     fi
-    if [ -d ~/.config/rofi ]; then
+    mkdir -p $HOME/.config/neofetch && cp -r ./config/neofetch/* $HOME/.config/neofetch;
-        echo "Rofi configs detected, backing up..."
+    if [ -d $HOME/.config/picom ]; then
-        mkdir -p ~/.config/rofi.old && mv ~/.config/rofi/* ~/.config/rofi.old/
+        echo "[*] picom configs detected, backing up..."
-        cp -r ./config/rofi/* ~/.config/rofi;
+        mv $HOME/.config/picom $HOME/.config/picom$DATE
-    else
-        echo "Installing rofi configs..."
-        mkdir ~/.config/rofi && cp -r ./config/rofi/* ~/.config/rofi;
     fi
-    if [ -d ~/.config/Code\ -\ OSS/User ]; then
+    mkdir -p $HOME/.config/picom && cp -r ./config/picom/* $HOME/.config/picom;
-        echo "Visual Studio Code (OSS) configs detected, backing up..."
+    if [ -d $HOME/.config/polybar ]; then
-        mkdir -p ~/.config/Code\ -\ OSS/User.old && mv ~/.config/Code\ -\ OSS/User/* ~/.config/Code\ -\ OSS/User.old/
+        echo "[*] polybar configs detected, backing up..."
-        cp -r ./config/vsc/* ~/.config/Code\ -\ OSS/User;
+        mv $HOME/.config/polybar $HOME/.config/polybar$DATE
-    else
-        echo "Installing Visual Studio Code (OSS) configs..."
-        mkdir ~/.config/Code\ -\ OSS/User && cp -r ./config/vsc/* ~/.config/Code\ -\ OSS/User;
     fi
-    if [ -d ~/.config/Code/User ]; then
+    mkdir -p $HOME/.config/polybar && cp -r ./config/polybar/* $HOME/.config/polybar;
-        echo "Visual Studio Code configs detected, backing up..."
+    if [ -d $HOME/.config/ranger ]; then
-        mkdir -p ~/.config/Code/User.old && mv ~/.config/Code/User/* ~/.config/Code/User.old/
+        echo "[*] ranger configs detected, backing up..."
-        cp -r ./config/vsc/* ~/.config/Code/User;
+        mv $HOME/.config/ranger $HOME/.config/ranger$DATE
-    else
-        echo "Installing Visual Studio Code configs..."
-        mkdir ~/.config/Code/User && cp -r ./config/vsc/* ~/.config/Code/User;
     fi
-    if [ -f ~/.zshrc ]; then
+    mkdir -p $HOME/.config/ranger && cp -r ./config/ranger/* $HOME/.config/ranger;
-        echo "Zsh configs detected, backing up..."
+    if [ -d $HOME/.config/rofi ]; then
-        cp ~/.zshrc ~/zshrc.old
+        echo "[*] rofi configs detected, backing up..."
-        cp ./config/.zshrc ~/;
+        mv $HOME/.config/rofi $HOME/.config/rofi$DATE
-    else
-        echo "Installing zsh configs..."
-        cp ./config/.zshrc ~/;
     fi
+    mkdir -p $HOME/.config/rofi && cp -r ./config/rofi/* $HOME/.config/rofi;
+    # files
+    if [ -f $HOME/.config/Code\ -\ OSS/User/settings.json ]; then
+        echo "[*] Code - OSS configs detected, backing up..."
+        mv $HOME/.config/Code\ -\ OSS/User/settings.json $HOME/.config/Code\ -\ OSS/User/settings.json$DATE
+    fi
+    cp -f ./config/vsc/* $HOME/.config/Code\ -\ OSS/User;
+    if [ -f $HOME/.zshrc ]; then
+        echo "[*] ZSH configs detected, backing up..."
+        mv $HOME/.zshrc $HOME/.zshrc$DATE
+    fi
+    cp -f ./config/.zshrc $HOME/.zshrc;
+    if [ -f $HOME/.oh-my-zsh/custom/themes/keyitdev.zsh-theme ]; then
+        echo "[*] Oh my zsh keyitdev theme detected, backing up..."
+        mv $HOME/.oh-my-zsh/custom/themes/keyitdev.zsh-theme $HOME/.oh-my-zsh/custom/themes/keyitdev.zsh-theme$DATE
+    fi
+    cp -f ./config/keyitdev.zsh-theme $HOME/.oh-my-zsh/custom/themes/;
+    echo -e "\n[*4*] Files copied."
+}
+
+copy_scripts(){
+    echo -e "[*5*] Coping scripts."
+    DATE=$(date +%s)
+    if [ -d /usr/local/bin ]; then
+        echo "[*] /usr/local/bin configs detected, backing up..."
+        sudo mv /usr/local/bin/* /usr/local/bin$DATE
+    fi
+    sudo mkdir -p /usr/local/bin
+    sudo cp -frd ./scripts/* /usr/local/bin
+     echo -e "\n[*5*] Scripts copied."
+}
+
+make_default_directories(){
+    echo -e "[*6*] Making default directories."
+    mkdir -p $HOME/Pictures/wallpapers
+    mkdir -p $HOME/Pictures/screenshots
+    mkdir -p $HOME/Videos
+    mkdir -p $HOME/Music
+    mkdir -p $HOME/Projects
+}
+
+system_update
+aur_helper
+install_packages
+copy_flies
+copy_scripts
+make_default_directories
+
+echo -e "[*7*] Everything is ready, enjoy :D."

screenshots/SCREENSHOTS.md

@@ -1,15 +0,0 @@
-<h1 align="center">Key dotfiles</h1>
-
-## Blue theme
-
-![](./blue/1.png?raw=true)
-![](./blue/2.png?raw=true)
-![](./blue/3.png?raw=true)
-![](./blue/4.png?raw=true)
-
-## Dark theme
-
-![](./dark/1.png?raw=true)
-![](./dark/2.png?raw=true)
-![](./dark/3.png?raw=true)
-![](./dark/4.png?raw=true)