fixed git paths

browser/qutebrowser/bookmarks/urls

@@ -0,0 +1 @@
+https://security.google.com/settings/security/apppasswords?pli=1 App passwords - Account Settings

colors/link.bash

@@ -4,9 +4,9 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
 source "$DIR/variables.bash"
 
 rm -f ~/.Xresources.colors
-rm -f "$DOTFILES_PATH/vim/config/colors/current.vim"
+rm -f "$DOTFILES_PATH/editor/nvim/config/colors/current.vim"
 ln -s "$DOTFILES_PATH/colors/xresources" "$HOME/.Xresources.colors"
-ln -s "$DOTFILES_PATH/colors/vim" "$DOTFILES_PATH/vim/config/colors/current.vim"
+ln -s "$DOTFILES_PATH/colors/vim" "$DOTFILES_PATH/editor/nvim/config/colors/current.vim"
 
-source "$DOTFILES_PATH/x/xloadresources"
+source "$DOTFILES_PATH/env/x/xloadresources"
 

editor/nvim/link.bash

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
+source "$DIR/variables.bash"
+
+rm -rf "$HOME/.config/nvim"
+ln -s "$DOTFILES_PATH/editor/nvim/config" "$HOME/.config/nvim"
+
+nvim +PlugInstal +qall
+

env/sh/link.bash

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
+source $DIR/variables.bash
+
+mkdir -p "$HOME/.tmux/layouts"
+
+MODULE_PATH="$DOTFILES_PATH/env/sh"
+
+rm -f "$HOME/.bashrc"
+rm -f "$HOME/.bash_profile"
+rm -f "$HOME/.tmux.conf"
+rm -f "$HOME/.tmux/layouts/dev.tmux"
+rm -f "$HOME/.inputrc"
+ln -s "$MODULE_PATH/bashrc" "$HOME/.bashrc"
+ln -s "$MODULE_PATH/bash_profile" "$HOME/.bash_profile"
+ln -s "$MODULE_PATH/tmux.conf" "$HOME/.tmux.conf"
+ln -s "$MODULE_PATH/layout_dev.tmux" "$HOME/.tmux/layouts/dev.tmux"
+ln -s "$MODULE_PATH/inputrc" "$HOME/.inputrc"
+
+sed -i "/export DOTFILES_PATH/c export DOTFILES_PATH=\"$DIR\"" "$HOME/.bashrc"
+
+echo "You should re-source ~/.bashrc ;)"

env/wm/link.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
+source "$DIR/variables.bash"
+
+MODULE_PATH="$DOTFILES_PATH/env/wm"
+
+mkdir -p "$HOME/.config/bspwm"
+mkdir -p "$HOME/.config/sxhkd"
+
+rm -f "$HOME/.config/bspwm/bspwmrc"
+rm -f "$HOME/.config/sxhkd/sxhkdrc"
+ln -s "$MODULE_PATH/bspwmrc" "$HOME/.config/bspwm/bspwmrc"
+ln -s "$MODULE_PATH/sxhkdrc" "$HOME/.config/sxhkd/sxhkdrc"
+

env/x/link.bash

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
+source "$DIR/variables.bash"
+
+MODULE_PATH="$DOTFILES_PATH/env/x"
+
+mkdir -p "$HOME/.config/gtk-3.0"
+rm -f "$HOME/.xinitrc"
+rm -f "$HOME/.Xresources"
+rm -f "$HOME/.gtkrc-2.0"
+rm -f "$HOME/.config/gtk-3.0/settings.ini"
+ln -s "$MODULE_PATH/xinitrc" "$HOME/.xinitrc"
+ln -s "$MODULE_PATH/xresources" "$HOME/.Xresources"
+ln -s "$MODULE_PATH/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini"
+ln -s "$MODULE_PATH/gtk2rc" "$HOME/.gtkrc-2.0"
+
+sudo mkdir -p /root/.gtk-3.0/
+sudo mkdir -p /root/.config/gtk-3.0/
+sudo rm -f "/root/.gtkrc-2.0"
+sudo rm -f "/root/.gtk-3.0/settings.ini"
+sudo rm -f "/root/.config/gtk-3.0/settings.ini"
+sudo ln -s "$MODULE_PATH/gtk2rc" "/root/.gtkrc-2.0"
+sudo ln -s "$MODULE_PATH/gtk3settings.ini" "/root/.gtk-3.0/settings.ini"
+sudo ln -s "$MODULE_PATH/gtk3settings.ini" "/root/.config/gtk-3.0/settings.ini"
+
+sudo rm -f "/etc/udev/rules.d/90-usb-device-plugin.rules"
+sudo ln -s "$MODULE_PATH/udev_rules/90-usb-device-plugin.rules" "/etc/udev/rules.d/90-usb-device-plugin.rules"
+
+source "$MODULE_PATH/xloadresources"
+

git/link.bash

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source "$DIR/variables.bash"
-
-rm -f "$HOME/.gitconfig"
-ln -s "$DOTFILES_PATH/git/gitconfig" "$HOME/.gitconfig"
-

link_all.bash

@@ -3,10 +3,12 @@
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/" && pwd)
 source "$DIR/variables.bash"
 
+ALERT_AGREEMENT_FILE="$DIR/scripts/agree_to_bootstrap.lock"
+
 # Let user know that this script will delete their current configuration and
 # that they should read this script before running. We'll use a lock file so
 # the user only needs to agree once.
-if [ -f "$DIR/agree_to_bootstrap.lock" ]; then
+if [ -f "$ALERT_AGREEMENT_FILE" ]; then
     # User agreed already - do nothing
     echo "Linking..."
 else
@@ -16,15 +18,15 @@ else
     read -r -p "Are you sure you want to continue? [y/N] " response
     response=${response,,} # to_lower
     if [[ $response =~ ^(yes|y)$ ]]; then
-        touch "$DIR/agree_to_bootstrap.lock"
+        echo "agreed" > "$ALERT_AGREEMENT_FILE"
     else
         exit 1
     fi
 fi
 
 source "$DOTFILES_PATH/colors/link.bash"
-source "$DOTFILES_PATH/git/link.bash"
-source "$DOTFILES_PATH/vim/link.bash"
-source "$DOTFILES_PATH/sh/link.bash"
-source "$DOTFILES_PATH/x/link.bash"
-source "$DOTFILES_PATH/wm/link.bash"
+source "$DOTFILES_PATH/misc/git/link.bash"
+source "$DOTFILES_PATH/editor/nvim/link.bash"
+source "$DOTFILES_PATH/env/sh/link.bash"
+source "$DOTFILES_PATH/env/x/link.bash"
+source "$DOTFILES_PATH/env/wm/link.bash"

misc/git/link.bash

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
+source "$DIR/variables.bash"
+
+rm -f "$HOME/.gitconfig"
+ln -s "$DOTFILES_PATH/misc/git/gitconfig" "$HOME/.gitconfig"
+

sh/link.bash

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source $DIR/variables.bash
-
-mkdir -p "$HOME/.tmux/layouts"
-
-rm -f "$HOME/.bashrc"
-rm -f "$HOME/.bash_profile"
-rm -f "$HOME/.tmux.conf"
-rm -f "$HOME/.tmux/layouts/dev.tmux"
-rm -f "$HOME/.inputrc"
-ln -s "$DOTFILES_PATH/sh/bashrc" "$HOME/.bashrc"
-ln -s "$DOTFILES_PATH/sh/bash_profile" "$HOME/.bash_profile"
-ln -s "$DOTFILES_PATH/sh/tmux.conf" "$HOME/.tmux.conf"
-ln -s "$DOTFILES_PATH/sh/layout_dev.tmux" "$HOME/.tmux/layouts/dev.tmux"
-ln -s "$DOTFILES_PATH/sh/inputrc" "$HOME/.inputrc"
-
-sed -i "/export DOTFILES_PATH/c export DOTFILES_PATH=\"$DIR\"" "$HOME/.bashrc"
-
-echo "You should re-source ~/.bashrc ;)"
-

variables.bash

@@ -40,3 +40,5 @@ if [ -a "$HOME/.bashrc_env" ]; then
   . "$HOME/.bashrc_env"
 fi
 
+# various paths that are used in the dotfiles
+

vim/config/.gitignore

@@ -1,3 +0,0 @@
-*
-!init.vim
-!./colors/*.vim

vim/config/colors/current.vim

@@ -1 +0,0 @@
-/home/daniel/.dotfiles/colors/vim

vim/link.bash

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source "$DIR/variables.bash"
-
-rm -rf "$HOME/.config/nvim"
-ln -s "$DOTFILES_PATH/vim/config" "$HOME/.config/nvim"
-
-nvim +PlugInstal +qall
-

wm/link.bash

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source "$DIR/variables.bash"
-
-mkdir -p "$HOME/.config/bspwm"
-mkdir -p "$HOME/.config/sxhkd"
-
-rm -f "$HOME/.config/bspwm/bspwmrc"
-rm -f "$HOME/.config/sxhkd/sxhkdrc"
-ln -s "$DOTFILES_PATH/wm/bspwmrc" "$HOME/.config/bspwm/bspwmrc"
-ln -s "$DOTFILES_PATH/wm/sxhkdrc" "$HOME/.config/sxhkd/sxhkdrc"
-

x/link.bash

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source "$DIR/variables.bash"
-
-mkdir -p "$HOME/.config/gtk-3.0"
-rm -f "$HOME/.xinitrc"
-rm -f "$HOME/.Xresources"
-rm -f "$HOME/.gtkrc-2.0"
-rm -f "$HOME/.config/gtk-3.0/settings.ini"
-ln -s "$DOTFILES_PATH/x/xinitrc" "$HOME/.xinitrc"
-ln -s "$DOTFILES_PATH/x/xresources" "$HOME/.Xresources"
-ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini"
-ln -s "$DOTFILES_PATH/x/gtk2rc" "$HOME/.gtkrc-2.0"
-
-sudo mkdir -p /root/.gtk-3.0/
-sudo mkdir -p /root/.config/gtk-3.0/
-sudo rm -f "/root/.gtkrc-2.0"
-sudo rm -f "/root/.gtk-3.0/settings.ini"
-sudo rm -f "/root/.config/gtk-3.0/settings.ini"
-sudo ln -s "$DOTFILES_PATH/x/gtk2rc" "/root/.gtkrc-2.0"
-sudo ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "/root/.gtk-3.0/settings.ini"
-sudo ln -s "$DOTFILES_PATH/x/gtk3settings.ini" "/root/.config/gtk-3.0/settings.ini"
-
-sudo rm -f "/etc/udev/rules.d/90-usb-device-plugin.rules"
-sudo ln -s "$DOTFILES_PATH/x/udev_rules/90-usb-device-plugin.rules" "/etc/udev/rules.d/90-usb-device-plugin.rules"
-
-source "$DOTFILES_PATH/x/xloadresources"
-