Move all config files to config directory and add corresponding changes to bootstrap script

.gitignore

@@ -1,2 +1,2 @@
-nvim/autoload
+config/nvim/autoload
-nvim/plugged
+config/nvim/plugged

bootstrap.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+declare -A configs
+
 usage() {
   echo "usage: (./)bootstrap [-S][-R]"
   echo
@@ -12,21 +14,21 @@ if [ $# -eq 0 ] ; then
   usage
 fi
 
-# Variables for directories
+configs=(
-bashrc="$HOME/.bashrc"
+  ["$PWD/config/.bashrc"]="$HOME/.bashrc"
-nvimDir="$HOME/.config/nvim"
+  ["$PWD/config/.gitconfig"]="$HOME/.gitconfig"
-alacrittyDir="$HOME/.config/alacritty"
+  ["$PWD/config/nvim"]="$HOME/.config/nvim"
-i3Dir="$HOME/.config/i3"
+  ["$PWD/config/alacritty"]="$HOME/.config/alacritty"
-polybarDir="$HOME/.config/polybar"
+  ["$PWD/config/i3"]="$HOME/.config/i3"
-swayDir="$HOME/.config/sway"
+  ["$PWD/config/polybar"]="$HOME/.config/polybar"
-waybarDir="$HOME/.config/waybar"
+  ["$PWD/config/sway"]="$HOME/.config/sway"
-rofiDir="$HOME/.config/rofi"
+  ["$PWD/config/waybar"]="$HOME/.config/waybar"
-dunstDir="$HOME/.config/dunst"
+  ["$PWD/config/rofi"]="$HOME/.config/rofi"
-fontsDir="$HOME/.config/fontconfig"
+  ["$PWD/config/dunst"]="$HOME/.config/dunst"
-wlogoutDir="$HOME/.config/wlogout"
+  ["$PWD/config/fonts"]="$HOME/.config/fontconfig"
-picomFile="$HOME/.config/picom.conf"
+  ["$PWD/config/wlogout"]="$HOME/.config/wlogout"
-gitconfigFile="$HOME/.gitconfig"
+  ["$PWD/config/picom.conf"]="$HOME/.config/picom.conf"
-nvimPluggedDir="$HOME/dotfiles/nvim/plugged"
+)
 
 
 # Install all configs
@@ -34,21 +36,13 @@ if [ "$1" = "-S" ] ; then
 
 
 # Create symlinks
-ln -s $PWD/.bashrc $bashrc
+for config in "${!configs[@]}"
-ln -s $PWD/nvim $nvimDir
+do
-ln -s $PWD/i3 $i3Dir
+  ln -s $config ${configs[$config]}
-ln -s $PWD/alacritty $alacrittyDir
+done
-ln -s $PWD/polybar $polybarDir
-ln -s $PWD/sway $swayDir
-ln -s $PWD/waybar $waybarDir
-ln -s $PWD/rofi $rofiDir
-ln -s $PWD/dunst $dunstDir
-ln -s $PWD/fontconfig $fontsDir
-ln -s $PWD/wlogout $wlogoutDir
-ln -s $PWD/picom.conf $picomFile
-ln -s $PWD/.gitconfig $gitconfigFile
 
 # Install vim-plug
+nvimDir="${configs[$PWD/config/nvim]}"
 mkdir -p $nvimDir/autoload
 wget -O $nvimDir/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
@@ -60,12 +54,11 @@ fi
 # Remove all configs
 if [ "$1" = "-R" ] ; then
 
-cd && rm -rf \
+cd $HOME
-  $bashrc $nvimDir $alacrittyDir $i3Dir \
+for config in "${!configs[@]}"
-  $polybarDir $swayDir $waybarDir $rofiDir \
+do
-  $dunstDir $fontsDir $picomFile $gitconfigFile \
+  rm -rf ${configs[$config]}
-  $nvimPluggedDir \
+done
-  && cd -
 
 fi
 

config/.bashrc

@@ -48,8 +48,9 @@ shopt -s autocd
 
 _GREEN="\[\033[32m\]"
 _BLUE="\[\033[34m\]"
+_BOLD="\[\033[1m\]"
 _RESET="\[\033[0m\]"
-export PS1="${_GREEN}\u@\h${_RESET}:${_BLUE}\W${_RESET} # "
+export PS1="${_GREEN}${_BOLD}\u@\h${_RESET}:${_BLUE}${_BOLD}\W${_RESET} # "
 
 
 #   ____ ___  __  __ ____  _     _____ _____ ___ ___  _   _ 

config/alacritty/alacritty

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/alacritty

config/dunst/dunst

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/dunst

config/fontconfig/fonts

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/fonts

config/i3/i3

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/i3

config/nvim/init.vim

@@ -1,11 +1,11 @@
-source $HOME/dotfiles/nvim/plugins.vim
+source $HOME/.config/nvim/plugins.vim
-source $HOME/dotfiles/nvim/general.vim
+source $HOME/.config/nvim/general.vim
-source $HOME/dotfiles/nvim/remaps.vim
+source $HOME/.config/nvim/remaps.vim
-source $HOME/dotfiles/nvim/theme.vim
+source $HOME/.config/nvim/theme.vim
-source $HOME/dotfiles/nvim/terminal.vim
+source $HOME/.config/nvim/terminal.vim
-source $HOME/dotfiles/nvim/file-tree.vim
+source $HOME/.config/nvim/file-tree.vim
-source $HOME/dotfiles/nvim/coc.vim
+source $HOME/.config/nvim/coc.vim
-source $HOME/dotfiles/nvim/tabs.vim
+source $HOME/.config/nvim/tabs.vim
 
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']

config/nvim/nvim

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/nvim

config/polybar/polybar

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/polybar

config/rofi/rofi

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/rofi

config/sway/sway

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/sway

config/waybar/waybar

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/waybar

config/wlogout/wlogout

@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/wlogout