diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index e432af8..96d3c21 --- a/README.md +++ b/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 -* wm and X11: i3-gaps i3blocks i3lock xorg xorg-xinit xorg-server -* lockscreen: i3lock betterlockscreen feh imagemagick +* base: base-devel wget git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib +* wm and X11: i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server +* 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,26 +59,26 @@ 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 1. Clone this dotfiles ```sh - git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git + git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git ``` 1. Install AUR helper (for example yay in ~/.srcs) ```sh mkdir -p ~/.srcs - git clone https://aur.archlinux.org/$HELPER.git ~/.srcs/$HELPER - (cd ~/.srcs/$HELPER/ && makepkg -si ) + git clone https://aur.archlinux.org/yay.git ~/.srcs/yay + (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/ - sddm/themes/ + sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git + 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 -``` -git clone https://www.github.com/keyitdev/dotfiles.git -cd dotfiles -chmod +x install-on-arch.sh -./install-on-arch.sh -``` -Install oh my zsh -```sh -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -``` -Set zsh as default shell -```sh -chsh -s /bin/zsh -sudo chsh -s /bin/zsh -``` -Install AstroVim -```sh -git clone --depth 10 https://github.com/kabinspace/AstroVim.git ~/.config/nvim -nvim +PackerSync -``` -Install gtk3 theme -```sh -git clone https://github.com/EliverLara/ant.git -sudo mv ./Ant /usr/share/themes -``` -Install sddm astronaut theme -```sh -sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git /usr/share/ -sddm/themes/ -``` -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. Clone dotfiles + ``` + 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 + ``` +1. Install oh my zsh + ```sh + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + ``` +1. Set zsh as default shell + ```sh + chsh -s /bin/zsh + sudo chsh -s /bin/zsh + ``` +1. Install AstroVim + ```sh + git clone --depth 10 https://github.com/kabinspace/AstroVim.git ~/.config/nvim + nvim +PackerSync + ``` +1. Install gtk3 theme + ```sh + git clone https://github.com/EliverLara/ant.git + sudo mv ./Ant /usr/share/themes + ``` +1. Install sddm astronaut theme + ```sh + sudo git clone https://github.com/keyitdev/sddm-astronaut-theme.git + 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` + ``` + [Theme] + Current=sddm-astronaut-theme + ``` +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 | diff --git a/config/.zshrc b/config/.zshrc old mode 100644 new mode 100755 index 0f687d9..cc2ec94 --- a/config/.zshrc +++ b/config/.zshrc @@ -1,6 +1,6 @@ export ZSH="$HOME/.oh-my-zsh" -ZSH_THEME="bira" +ZSH_THEME="keyitdev" plugins=(git) diff --git a/config/betterlockscreenrc b/config/betterlockscreenrc old mode 100644 new mode 100755 diff --git a/config/btop/btop.conf b/config/btop/btop.conf old mode 100644 new mode 100755 diff --git a/config/cava/config b/config/cava/config old mode 100644 new mode 100755 diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc old mode 100644 new mode 100755 diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini old mode 100644 new mode 100755 diff --git a/config/i3/config b/config/i3/config old mode 100644 new mode 100755 index 04d1557..f658c3d --- a/config/i3/config +++ b/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 diff --git a/config/keyitdev.zsh-theme b/config/keyitdev.zsh-theme new file mode 100644 index 0000000..c829125 --- /dev/null +++ b/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]%}" \ No newline at end of file diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf old mode 100644 new mode 100755 diff --git a/config/local.conf b/config/local.conf old mode 100644 new mode 100755 diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf old mode 100644 new mode 100755 diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config old mode 100644 new mode 100755 diff --git a/config/neofetch/config.conf b/config/neofetch/config.conf old mode 100644 new mode 100755 diff --git a/config/nvim b/config/nvim new file mode 160000 index 0000000..de61f4f --- /dev/null +++ b/config/nvim @@ -0,0 +1 @@ +Subproject commit de61f4fe9fd1656dee1851bd3dc9fb0f879e0580 diff --git a/config/picom/picom.conf b/config/picom/picom.conf old mode 100644 new mode 100755 diff --git a/config/polybar/colors.ini b/config/polybar/colors.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/config.ini b/config/polybar/polybar-rounded/config.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/alsa.ini b/config/polybar/polybar-rounded/modules/alsa.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/backlight.ini b/config/polybar/polybar-rounded/modules/backlight.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/battery.ini b/config/polybar/polybar-rounded/modules/battery.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/cpu.ini b/config/polybar/polybar-rounded/modules/cpu.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/date.ini b/config/polybar/polybar-rounded/modules/date.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/filesystem.ini b/config/polybar/polybar-rounded/modules/filesystem.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/glyphs.ini b/config/polybar/polybar-rounded/modules/glyphs.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/i3.ini b/config/polybar/polybar-rounded/modules/i3.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/keyboard.ini b/config/polybar/polybar-rounded/modules/keyboard.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/memory.ini b/config/polybar/polybar-rounded/modules/memory.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/mpd.ini b/config/polybar/polybar-rounded/modules/mpd.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/network.ini b/config/polybar/polybar-rounded/modules/network.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/network_mini.ini b/config/polybar/polybar-rounded/modules/network_mini.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/sep.ini b/config/polybar/polybar-rounded/modules/sep.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/temperature.ini b/config/polybar/polybar-rounded/modules/temperature.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/title.ini b/config/polybar/polybar-rounded/modules/title.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-rounded/modules/uptime.ini b/config/polybar/polybar-rounded/modules/uptime.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/config.ini b/config/polybar/polybar-square/config.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/alsa.ini b/config/polybar/polybar-square/modules/alsa.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/backlight.ini b/config/polybar/polybar-square/modules/backlight.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/battery.ini b/config/polybar/polybar-square/modules/battery.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/cpu.ini b/config/polybar/polybar-square/modules/cpu.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/date.ini b/config/polybar/polybar-square/modules/date.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/filesystem.ini b/config/polybar/polybar-square/modules/filesystem.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/i3.ini b/config/polybar/polybar-square/modules/i3.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/keyboard.ini b/config/polybar/polybar-square/modules/keyboard.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/memory.ini b/config/polybar/polybar-square/modules/memory.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/mpd.ini b/config/polybar/polybar-square/modules/mpd.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/network.ini b/config/polybar/polybar-square/modules/network.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/network_mini.ini b/config/polybar/polybar-square/modules/network_mini.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/temperature.ini b/config/polybar/polybar-square/modules/temperature.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/title.ini b/config/polybar/polybar-square/modules/title.ini old mode 100644 new mode 100755 diff --git a/config/polybar/polybar-square/modules/uptime.ini b/config/polybar/polybar-square/modules/uptime.ini old mode 100644 new mode 100755 diff --git a/config/ranger/rc.conf b/config/ranger/rc.conf old mode 100644 new mode 100755 diff --git a/config/rofi/center.rasi b/config/rofi/center.rasi old mode 100644 new mode 100755 diff --git a/config/rofi/colors.rasi b/config/rofi/colors.rasi old mode 100644 new mode 100755 diff --git a/config/rofi/compact.rasi b/config/rofi/compact.rasi old mode 100644 new mode 100755 diff --git a/config/rofi/compact_without_icons.rasi b/config/rofi/compact_without_icons.rasi old mode 100644 new mode 100755 diff --git a/config/rofi/sidebar.rasi b/config/rofi/sidebar.rasi old mode 100644 new mode 100755 diff --git a/config/vsc/settings.json b/config/vsc/settings.json old mode 100644 new mode 100755 diff --git a/config/vsc/zhuangtongfa.Material-theme-3.13.7.vsix b/config/vsc/zhuangtongfa.Material-theme-3.13.7.vsix old mode 100644 new mode 100755 diff --git a/fonts/Feather.ttf b/fonts/Feather.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-BoldItalic.ttf b/fonts/OpenSans-BoldItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-ExtraBold.ttf b/fonts/OpenSans-ExtraBold.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-ExtraBoldItalic.ttf b/fonts/OpenSans-ExtraBoldItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-LightItalic.ttf b/fonts/OpenSans-LightItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-Medium.ttf b/fonts/OpenSans-Medium.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-MediumItalic.ttf b/fonts/OpenSans-MediumItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-SemiBold.ttf b/fonts/OpenSans-SemiBold.ttf old mode 100644 new mode 100755 diff --git a/fonts/OpenSans-SemiBoldItalic.ttf b/fonts/OpenSans-SemiBoldItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Bold.ttf b/fonts/RobotoMono-Bold.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-BoldItalic.ttf b/fonts/RobotoMono-BoldItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-ExtraLight.ttf b/fonts/RobotoMono-ExtraLight.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-ExtraLightItalic.ttf b/fonts/RobotoMono-ExtraLightItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Italic.ttf b/fonts/RobotoMono-Italic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Light.ttf b/fonts/RobotoMono-Light.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-LightItalic.ttf b/fonts/RobotoMono-LightItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Medium.ttf b/fonts/RobotoMono-Medium.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-MediumItalic.ttf b/fonts/RobotoMono-MediumItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Regular.ttf b/fonts/RobotoMono-Regular.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-SemiBold.ttf b/fonts/RobotoMono-SemiBold.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-SemiBoldItalic.ttf b/fonts/RobotoMono-SemiBoldItalic.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-Thin.ttf b/fonts/RobotoMono-Thin.ttf old mode 100644 new mode 100755 diff --git a/fonts/RobotoMono-ThinItalic.ttf b/fonts/RobotoMono-ThinItalic.ttf old mode 100644 new mode 100755 diff --git a/install-on-arch.sh b/install-on-arch.sh index 59d7529..ff235d4 100755 --- a/install-on-arch.sh +++ b/install-on-arch.sh @@ -1,246 +1,233 @@ #!/bin/env bash -set -e -echo "Welcome!" && sleep 2 +echo "Welcome!" +DATE=$(date +%s) -#Default vars -HELPER="paru" +system_update(){ + echo -e "[*1*] 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 +} -# does full system update -echo "Doing a system update, cause stuff may break if it's not the latest version..." -sudo pacman --noconfirm -Syu +aur_helper(){ + cat <<- EOF + [*2*] We need an AUR helper. It is essential. + + [*] Choose your AUR helper. + [1] yay + [2] paru + + EOF -echo "###########################################################################" -echo "Will do stuff, get ready" -echo "###########################################################################" - -# install base-devel if not installed -sudo pacman -S --noconfirm --needed base-devel wget git - -# choose video driver -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 -[1]) - 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/; + read -p "[?] Select option: " + if [[ $REPLY == "1" ]]; then + HELPER="yay" + 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 + 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 "Installing fonts configs..." - sudo cp ./config/local.conf /etc/fonts/; - fi + echo -e "\n[!] Invalid option, exiting...\n" + exit 1 + 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." - git clone https://aur.archlinux.org/$HELPER.git ~/.srcs/$HELPER - (cd ~/.srcs/$HELPER/ && makepkg -si ) -fi - -$HELPER -S acpi \ +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 + + cat <<- EOF + [*3*] Still installing packages. + + [*] Do you want to install no required but usefull programs? (Code, iwd, libreoffice, firefox etc.) -mkdir -p ~/.config/ - if [ -d ~/.config/dunst ]; then - echo "Dunst configs detected, backing up..." - mkdir -p ~/.config/dunst.old && mv ~/.config/dunst/* ~/.config/dunst.old/ - cp -r ./config/dunst/* ~/.config/dunst; - else - echo "Installing dunst configs..." - mkdir ~/.config/dunst && 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 -e "\n[!] Invalid option, exiting...\n" + exit 1 + fi + + cat <<- EOF + [*3*] Still installing packages. + + [*] 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 -e "\n[!] Invalid option, exiting...\n" + exit 1 + fi + +} + +copy_flies(){ + DATE=$(date +%s) + echo -e "[*4*] Coping files." + if [ -d $HOME/.config/btop ]; then + echo "[*] btop configs detected, backing up..." + mv $HOME/.config/btop $HOME/.config/btop$DATE fi - if [ -d ~/.config/gtk-3.0 ]; then - echo "Gtk-3.0 configs detected, backing up..." - mkdir -p ~/.config/gtk-3.0.old && mv ~/.config/gtk-3.0/* ~/.config/gtk-3.0.old/ - cp -r ./config/gtk-3.0/* ~/.config/gtk-3.0; - else - echo "Installing gtk-3.0 configs..." - mkdir ~/.config/gtk-3.0 && cp -r ./config/gtk-3.0/* ~/.config/gtk-3.0; + mkdir -p $HOME/.config/btop && cp -r ./config/btop/* $HOME/.config/btop; + if [ -d $HOME/.config/cava ]; then + echo "[*] cava configs detected, backing up..." + mv $HOME/.config/cava $HOME/.config/cava$DATE 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; - else - echo "Installing i3 configs..." - mkdir ~/.config/i3 && cp -r ./config/i3/* ~/.config/i3; + mkdir -p $HOME/.config/cava && cp -r ./config/cava/* $HOME/.config/cava; + if [ -d $HOME/.config/dunst ]; then + echo "[*] dunst configs detected, backing up..." + mv $HOME/.config/dunst $HOME/.config/dunst$DATE fi - if [ -d ~/.config/mpd ]; then - echo "MPD configs detected, backing up..." - mkdir -p ~/.config/mpd.old && mv ~/.config/mpd/* ~/.config/mpd.old/ - cp -r ./config/mpd/* ~/.config/mpd; - else - echo "Installing mpd configs..." - mkdir ~/.config/mpd && cp -r ./config/mpd/* ~/.config/mpd; + mkdir -p $HOME/.config/dunst && cp -r ./config/dunst/* $HOME/.config/dunst; + if [ -d $HOME/.config/gtk-3.0 ]; then + echo "[*] gtk-3.0 configs detected, backing up..." + mv $HOME/.config/gtk-3.0 $HOME/.config/gtk-3.0$DATE fi - if [ -d ~/.config/ncmpcpp ]; then - echo "Ncmpcpp configs detected, backing up..." - mkdir -p ~/.config/ncmpcpp.old && mv ~/.config/ncmpcpp/* ~/.config/ncmpcpp.old/ - cp -r ./config/ncmpcpp/* ~/.config/ncmpcpp; - else - echo "Installing ncmpcpp configs..." - mkdir ~/.config/ncmpcpp && cp -r ./config/ncmpcpp/* ~/.config/ncmpcpp; + mkdir -p $HOME/.config/gtk-3.0 && cp -r ./config/gtk-3.0/* $HOME/.config/gtk-3.0; + if [ -d $HOME/.config/i3 ]; then + echo "[*] i3 configs detected, backing up..." + mv $HOME/.config/i3 $HOME/.config/i3$DATE fi - if [ -d ~/.config/picom ]; then - echo "Picom configs detected, backing up..." - mkdir -p ~/.config/picom.old && mv ~/.config/picom/* ~/.config/picom.old/ - cp -r ./config/picom/* ~/.config/picom; - else - echo "Installing picom configs..." - mkdir ~/.config/picom && cp -r ./config/picom/* ~/.config/picom; + mkdir -p $HOME/.config/i3 && cp -r ./config/i3/* $HOME/.config/i3; + if [ -d $HOME/.config/kitty ]; then + echo "[*] kitty configs detected, backing up..." + mv $HOME/.config/kitty $HOME/.config/kitty$DATE fi - if [ -d ~/.config/polybar ]; then - echo "Polybar configs detected, backing up..." - mkdir -p ~/.config/polybar.old && mv ~/.config/polybar/* ~/.config/polybar.old/ - cp -r ./config/polybar/* ~/.config/polybar; - else - echo "Installing polybar configs..." - mkdir ~/.config/polybar && cp -r ./config/polybar/* ~/.config/polybar; + mkdir -p $HOME/.config/kitty && cp -r ./config/kitty/* $HOME/.config/kitty; + if [ -d $HOME/.config/mpd ]; then + echo "[*] mpd configs detected, backing up..." + mv $HOME/.config/mpd $HOME/.config/mpd$DATE fi - if [ -d ~/.config/ranger ]; then - echo "Ranger configs detected, backing up..." - mkdir -p ~/.config/ranger.old && mv ~/.config/ranger/* ~/.config/ranger.old/ - cp -r ./config/ranger/* ~/.config/ranger; - else - echo "Installing ranger configs..." - mkdir ~/.config/ranger && cp -r ./config/ranger/* ~/.config/ranger; + mkdir -p $HOME/.config/mpd && cp -r ./config/mpd/* $HOME/.config/mpd; + if [ -d $HOME/.config/ncmpcpp ]; then + echo "[*] ncmpcpp configs detected, backing up..." + mv $HOME/.config/ncmpcpp $HOME/.config/ncmpcpp$DATE fi - if [ -d ~/.config/btop ]; then - echo "Btop configs detected, backing up..." - mkdir -p ~/.config/btop.old && mv ~/.config/btop/* ~/.config/btop.old/ - cp -r ./config/btop/* ~/.config/btop; - else - echo "Installing btop configs..." - mkdir ~/.config/btop && cp -r ./config/btop/* ~/.config/btop; + mkdir -p $HOME/.config/ncmpcpp && cp -r ./config/ncmpcpp/* $HOME/.config/ncmpcpp; + if [ -d $HOME/.config/neofetch ]; then + echo "[*] neofetch configs detected, backing up..." + mv $HOME/.config/neofetch $HOME/.config/neofetch$DATE fi - if [ -d ~/.config/neofetch ]; then - echo "Neofetch configs detected, backing up..." - mkdir -p ~/.config/neofetch.old && mv ~/.config/neofetch/* ~/.config/neofetch.old/ - cp -r ./config/neofetch/* ~/.config/neofetch; - else - echo "Installing neofetch configs..." - mkdir ~/.config/neofetch && cp -r ./config/neofetch/* ~/.config/neofetch; + mkdir -p $HOME/.config/neofetch && cp -r ./config/neofetch/* $HOME/.config/neofetch; + if [ -d $HOME/.config/picom ]; then + echo "[*] picom configs detected, backing up..." + mv $HOME/.config/picom $HOME/.config/picom$DATE fi - if [ -d ~/.config/kitty ]; then - echo "Kitty configs detected, backing up..." - mkdir -p ~/.config/kitty.old && mv ~/.config/kitty/* ~/.config/kitty.old/ - cp -r ./config/kitty/* ~/.config/kitty; - else - echo "Installing kitty configs..." - mkdir ~/.config/kitty && cp -r ./config/kitty/* ~/.config/kitty; + mkdir -p $HOME/.config/picom && cp -r ./config/picom/* $HOME/.config/picom; + if [ -d $HOME/.config/polybar ]; then + echo "[*] polybar configs detected, backing up..." + mv $HOME/.config/polybar $HOME/.config/polybar$DATE fi - if [ -d ~/.config/rofi ]; then - echo "Rofi configs detected, backing up..." - mkdir -p ~/.config/rofi.old && mv ~/.config/rofi/* ~/.config/rofi.old/ - cp -r ./config/rofi/* ~/.config/rofi; - else - echo "Installing rofi configs..." - mkdir ~/.config/rofi && cp -r ./config/rofi/* ~/.config/rofi; + mkdir -p $HOME/.config/polybar && cp -r ./config/polybar/* $HOME/.config/polybar; + if [ -d $HOME/.config/ranger ]; then + echo "[*] ranger configs detected, backing up..." + mv $HOME/.config/ranger $HOME/.config/ranger$DATE fi - if [ -d ~/.config/Code\ -\ OSS/User ]; then - echo "Visual Studio Code (OSS) configs detected, backing up..." - mkdir -p ~/.config/Code\ -\ OSS/User.old && mv ~/.config/Code\ -\ OSS/User/* ~/.config/Code\ -\ OSS/User.old/ - cp -r ./config/vsc/* ~/.config/Code\ -\ OSS/User; - else - echo "Installing Visual Studio Code (OSS) configs..." - mkdir ~/.config/Code\ -\ OSS/User && cp -r ./config/vsc/* ~/.config/Code\ -\ OSS/User; + mkdir -p $HOME/.config/ranger && cp -r ./config/ranger/* $HOME/.config/ranger; + if [ -d $HOME/.config/rofi ]; then + echo "[*] rofi configs detected, backing up..." + mv $HOME/.config/rofi $HOME/.config/rofi$DATE fi - if [ -d ~/.config/Code/User ]; then - echo "Visual Studio Code configs detected, backing up..." - mkdir -p ~/.config/Code/User.old && mv ~/.config/Code/User/* ~/.config/Code/User.old/ - cp -r ./config/vsc/* ~/.config/Code/User; - else - echo "Installing Visual Studio Code configs..." - mkdir ~/.config/Code/User && cp -r ./config/vsc/* ~/.config/Code/User; + 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 - if [ -f ~/.zshrc ]; then - echo "Zsh configs detected, backing up..." - cp ~/.zshrc ~/zshrc.old - cp ./config/.zshrc ~/; - else - echo "Installing zsh configs..." - cp ./config/.zshrc ~/; - fi \ No newline at end of file + 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." \ No newline at end of file diff --git a/screenshots/SCREENSHOTS.md b/screenshots/SCREENSHOTS.md deleted file mode 100644 index cb98a42..0000000 --- a/screenshots/SCREENSHOTS.md +++ /dev/null @@ -1,15 +0,0 @@ -

Key dotfiles

- -## 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) \ No newline at end of file diff --git a/scripts/icons/battery.svg b/scripts/icons/battery.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/mic-off.svg b/scripts/icons/mic-off.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/mic.svg b/scripts/icons/mic.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/moon.svg b/scripts/icons/moon.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/sun.svg b/scripts/icons/sun.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/volume-1.svg b/scripts/icons/volume-1.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/volume-2.svg b/scripts/icons/volume-2.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/volume-x.svg b/scripts/icons/volume-x.svg old mode 100644 new mode 100755 diff --git a/scripts/icons/volume.svg b/scripts/icons/volume.svg old mode 100644 new mode 100755 diff --git a/themes/polybar-rounded/launch.sh b/scripts/themes/polybar-rounded/launch.sh similarity index 100% rename from themes/polybar-rounded/launch.sh rename to scripts/themes/polybar-rounded/launch.sh diff --git a/themes/polybar-square/launch.sh b/scripts/themes/polybar-square/launch.sh similarity index 100% rename from themes/polybar-square/launch.sh rename to scripts/themes/polybar-square/launch.sh diff --git a/wallpapers/current_blue.png b/wallpapers/current_blue.png old mode 100644 new mode 100755 diff --git a/wallpapers/current_blue_orginal.png b/wallpapers/current_blue_orginal.png old mode 100644 new mode 100755 diff --git a/wallpapers/lockscreen.png b/wallpapers/lockscreen.png old mode 100644 new mode 100755 index 808fe59..9f670e2 Binary files a/wallpapers/lockscreen.png and b/wallpapers/lockscreen.png differ diff --git a/wallpapers/lockscreen_orginal.png b/wallpapers/lockscreen_orginal.png new file mode 100755 index 0000000..2b4199b Binary files /dev/null and b/wallpapers/lockscreen_orginal.png differ