reorganize directory structure again

2021-01-12 18:33:49 -06:00 · 2021-01-12 18:33:49 -06:00 · 158ccfcea0
commit 158ccfcea0
parent 74ba4615d1
63 changed files with 32 additions and 30 deletions
--- a/shell/.Xresources
+++ b/shell/.Xresources
--- a/shell/.aliases
+++ b/shell/.aliases
--- a/shell/.bashrc
+++ b/shell/.bashrc
--- a/home/.config/.rofi/config.rasi
+++ b/home/.config/.rofi/config.rasi
--- a/home/.config/.rofi/themes/iceberg-dark.rasi
+++ b/home/.config/.rofi/themes/iceberg-dark.rasi
--- a/home/.config/compton/compton.conf
+++ b/home/.config/compton/compton.conf
--- a/home/.config/dunst/dunstrc
+++ b/home/.config/dunst/dunstrc
--- a/home/.config/gtk-2.0/gtkfilechooser.ini
+++ b/home/.config/gtk-2.0/gtkfilechooser.ini
--- a/home/.config/gtk-3.0/bookmarks
+++ b/home/.config/gtk-3.0/bookmarks
--- a/home/.config/gtk-3.0/gtk.css
+++ b/home/.config/gtk-3.0/gtk.css
--- a/home/.config/gtk-3.0/settings.ini
+++ b/home/.config/gtk-3.0/settings.ini
--- a/home/.config/htop/htoprc
+++ b/home/.config/htop/htoprc
--- a/home/.config/i3/conf.d/autostart.conf
+++ b/home/.config/i3/conf.d/autostart.conf
--- a/home/.config/i3/conf.d/base.conf
+++ b/home/.config/i3/conf.d/base.conf
--- a/home/.config/i3/conf.d/gaps.conf
+++ b/home/.config/i3/conf.d/gaps.conf
--- a/home/.config/i3/conf.d/i3bar.conf
+++ b/home/.config/i3/conf.d/i3bar.conf
--- a/home/.config/i3/conf.d/keybinds.conf
+++ b/home/.config/i3/conf.d/keybinds.conf
--- a/home/.config/i3/conf.d/layout-keybinds.conf
+++ b/home/.config/i3/conf.d/layout-keybinds.conf
--- a/home/.config/i3/conf.d/window-classes.conf
+++ b/home/.config/i3/conf.d/window-classes.conf
--- a/home/.config/i3/conf.d/workspace.conf
+++ b/home/.config/i3/conf.d/workspace.conf
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
--- a/home/.config/i3/i3-dstatus.conf
+++ b/home/.config/i3/i3-dstatus.conf
--- a/home/.config/i3/i3blocks.conf
+++ b/home/.config/i3/i3blocks.conf
--- a/home/.config/mimeapps.list
+++ b/home/.config/mimeapps.list
--- a/home/.config/morc_menu/morc_menu_v1.conf
+++ b/home/.config/morc_menu/morc_menu_v1.conf
--- a/home/.config/nitrogen/bg-saved.cfg
+++ b/home/.config/nitrogen/bg-saved.cfg
--- a/home/.config/nitrogen/nitrogen.cfg
+++ b/home/.config/nitrogen/nitrogen.cfg
--- a/home/.config/ranger/commands.py
+++ b/home/.config/ranger/commands.py
--- a/home/.config/ranger/devicons.py
+++ b/home/.config/ranger/devicons.py
--- a/home/.config/ranger/plugins/devicons_linemode.py
+++ b/home/.config/ranger/plugins/devicons_linemode.py
--- a/home/.config/ranger/rc.conf
+++ b/home/.config/ranger/rc.conf
--- a/home/.config/ranger/scope.sh
+++ b/home/.config/ranger/scope.sh
--- a/home/.config/terminator/config
+++ b/home/.config/terminator/config
--- a/home/.config/viewnior/viewnior.conf
+++ b/home/.config/viewnior/viewnior.conf
--- a/home/.config/volumeicon/volumeicon
+++ b/home/.config/volumeicon/volumeicon
--- a/shell/.dmenurc
+++ b/shell/.dmenurc
--- a/shell/.dmrc
+++ b/shell/.dmrc
--- a/shell/.environment
+++ b/shell/.environment
--- a/shell/.functions
+++ b/shell/.functions
--- a/shell/.gitconfig
+++ b/shell/.gitconfig
--- a/shell/.stalonetrayrc
+++ b/shell/.stalonetrayrc
--- a/shell/.tmux.conf
+++ b/shell/.tmux.conf
--- a/shell/.vimrc
+++ b/shell/.vimrc
--- a/shell/.zshrc
+++ b/shell/.zshrc
--- a/home/bin/build-i3-config
+++ b/home/bin/build-i3-config
--- a/home/bin/cert_expiry
+++ b/home/bin/cert_expiry
--- a/home/bin/git-freeze
+++ b/home/bin/git-freeze
--- a/home/bin/i3blocks/bandwidth
+++ b/home/bin/i3blocks/bandwidth
--- a/home/bin/i3blocks/clock
+++ b/home/bin/i3blocks/clock
--- a/home/bin/i3blocks/cpu
+++ b/home/bin/i3blocks/cpu
--- a/home/bin/i3blocks/cpu_usage
+++ b/home/bin/i3blocks/cpu_usage
--- a/home/bin/i3blocks/disk
+++ b/home/bin/i3blocks/disk
--- a/home/bin/i3blocks/gpu-load
+++ b/home/bin/i3blocks/gpu-load
--- a/home/bin/i3blocks/internet
+++ b/home/bin/i3blocks/internet
--- a/home/bin/i3blocks/load_average
+++ b/home/bin/i3blocks/load_average
--- a/home/bin/i3blocks/memory
+++ b/home/bin/i3blocks/memory
--- a/home/bin/i3blocks/scratchpad
+++ b/home/bin/i3blocks/scratchpad
--- a/home/bin/i3blocks/spotify
+++ b/home/bin/i3blocks/spotify
--- a/home/bin/i3blocks/window
+++ b/home/bin/i3blocks/window
--- a/home/bin/music_player
+++ b/home/bin/music_player
--- a/home/bin/screenshotter.sh
+++ b/home/bin/screenshotter.sh
--- a/home/bin/wallpaper.sh
+++ b/home/bin/wallpaper.sh
--- a/install.sh
+++ b/install.sh
@ -15,6 +15,8 @@ fi
 GIT_REPO="git://github.com/alopexc0de/dotfiles.git"

 DOTFILES=${HOME}/dotfiles
+DF_HOME=${DOTFILES}/home
+DF_CONFIG=${DF_HOME}/.config
 POSTINSTALL_SCRIPT=${HOME}/.dotfiles.postinst

 if [ ! -e "${POSTINSTALL_SCRIPT}" ]; then
@ -50,8 +52,8 @@ read -p "Press enter to install dotfiles " WAIT_FOR_INPUT

 # If the update script exists, try to do a normal update
 if [ -x "${DOTFILES}/check_for_upgrade.sh" ]; then
-    source "${DOTFILES}/shell/.environment"
-    env DOTFILES="${DOTFILES}" DISABLE_UPDATE_PROMPT=false zsh -f "${DOTFILES}/check_for_upgrade.sh"
+    source "${DF_HOME}/.environment"
+    env _DOTFILES="${DOTFILES}" DISABLE_UPDATE_PROMPT=false zsh -f "${DOTFILES}/check_for_upgrade.sh"
 else
    echo "Cloning to ${DOTFILES}"
    rm -rf "${DOTFILES}"
@ -59,42 +61,42 @@ else
 fi

 echo "Installing user binary directory to ~/bin"
-symlink "${DOTFILES}/bin" "${HOME}/bin"
+symlink "${DF_HOME}/bin" "${HOME}/bin"

 echo "Linking Configuration files..."

 # All the dotfiles that live in the home dir directly
-symlink "${DOTFILES}/shell/.aliases"          "${HOME}/.aliases"
-symlink "${DOTFILES}/shell/.bashrc"           "${HOME}/.bashrc"
-symlink "${DOTFILES}/shell/.dmenurc"          "${HOME}/.dmenurc"
-symlink "${DOTFILES}/shell/.dmrc"             "${HOME}/.dmrc"
-symlink "${DOTFILES}/shell/.editorconfig"     "${HOME}/.editorconfig"
-symlink "${DOTFILES}/shell/.environment"      "${HOME}/.environment"
-symlink "${DOTFILES}/shell/.functions"        "${HOME}/.functions"
-symlink "${DOTFILES}/shell/.gitconfig"        "${HOME}/.gitconfig"
-symlink "${DOTFILES}/shell/.stalonetrayrc"    "${HOME}/.stalonetrayrc"
-symlink "${DOTFILES}/shell/.tmux.conf"        "${HOME}/.tmux.conf"
-symlink "${DOTFILES}/shell/.vimrc"            "${HOME}/.vimrc"
-symlink "${DOTFILES}/shell/.zshrc"            "${HOME}/.zshrc"
+symlink "${DOTFILES}/.editorconfig"     "${HOME}/.editorconfig"
+symlink "${DF_HOME}/.aliases"           "${HOME}/.aliases"
+symlink "${DF_HOME}/.bashrc"            "${HOME}/.bashrc"
+symlink "${DF_HOME}/.dmenurc"           "${HOME}/.dmenurc"
+symlink "${DF_HOME}/.dmrc"              "${HOME}/.dmrc"
+symlink "${DF_HOME}/.environment"       "${HOME}/.environment"
+symlink "${DF_HOME}/.functions"         "${HOME}/.functions"
+symlink "${DF_HOME}/.gitconfig"         "${HOME}/.gitconfig"
+symlink "${DF_HOME}/.stalonetrayrc"     "${HOME}/.stalonetrayrc"
+symlink "${DF_HOME}/.tmux.conf"         "${HOME}/.tmux.conf"
+symlink "${DF_HOME}/.vimrc"             "${HOME}/.vimrc"
+symlink "${DF_HOME}/.zshrc"             "${HOME}/.zshrc"

 # Install ~/.config stuff
-symlink "${DOTFILES}/.config/.rofi"           "${HOME}/.config/.rofi"
-symlink "${DOTFILES}/.config/compton"         "${HOME}/.config/compton"
-symlink "${DOTFILES}/.config/dunst"           "${HOME}/.config/dunst"
-symlink "${DOTFILES}/.config/gtk-2.0"         "${HOME}/.config/gtk-2.0"
-symlink "${DOTFILES}/.config/gtk-3.0"         "${HOME}/.config/gtk-3.0"
-symlink "${DOTFILES}/.config/htop"            "${HOME}/.config/htop"
-symlink "${DOTFILES}/.config/i3"              "${HOME}/.config/i3"
-symlink "${DOTFILES}/.config/morc_menu"       "${HOME}/.config/morc_menu"
-symlink "${DOTFILES}/.config/nitrogen"        "${HOME}/.config/nitrogen"
-symlink "${DOTFILES}/.config/terminator"      "${HOME}/.config/terminator"
-symlink "${DOTFILES}/.config/ranger"          "${HOME}/.config/ranger"
-symlink "${DOTFILES}/.config/viewnior"        "${HOME}/.config/viewnior"
-symlink "${DOTFILES}/.config/volumeicon"      "${HOME}/.config/volumeicon"
-symlink "${DOTFILES}/.config/mimeapps.list"   "${HOME}/.config/mimeapps.list"
+symlink "${DF_CONFIG}/.rofi"            "${HOME}/.config/.rofi"
+symlink "${DF_CONFIG}/compton"          "${HOME}/.config/compton"
+symlink "${DF_CONFIG}/dunst"            "${HOME}/.config/dunst"
+symlink "${DF_CONFIG}/gtk-2.0"          "${HOME}/.config/gtk-2.0"
+symlink "${DF_CONFIG}/gtk-3.0"          "${HOME}/.config/gtk-3.0"
+symlink "${DF_CONFIG}/htop"             "${HOME}/.config/htop"
+symlink "${DF_CONFIG}/i3"               "${HOME}/.config/i3"
+symlink "${DF_CONFIG}/morc_menu"        "${HOME}/.config/morc_menu"
+symlink "${DF_CONFIG}/nitrogen"         "${HOME}/.config/nitrogen"
+symlink "${DF_CONFIG}/terminator"       "${HOME}/.config/terminator"
+symlink "${DF_CONFIG}/ranger"           "${HOME}/.config/ranger"
+symlink "${DF_CONFIG}/viewnior"         "${HOME}/.config/viewnior"
+symlink "${DF_CONFIG}/volumeicon"       "${HOME}/.config/volumeicon"
+symlink "${DF_CONFIG}/mimeapps.list"    "${HOME}/.config/mimeapps.list"

 echo "Building i3 configuration..."
-"${DOTFILES}/bin/build-i3-config"
+"${DF_HOME}/bin/build-i3-config"

 echo "Changing default shell to ZSH..."
 chsh -s /usr/bin/zsh