Rename some stuff

3 files changed, 101 insertions, 77 deletions

diff --git a/Common/bashrc.m4 b/Common/bashrc.m4
index c1078f2..6f64138 100644
--- a/Common/bashrc.m4
+++ b/Common/bashrc.m4
@@ -11,13 +11,15 @@ esac
 
 # Check if env setup file exists
 if [ ! -f ~/.dotfiles_env ]; then
-	echo "export ZSH=$HOME/.oh-my-zsh" > ~/.dotfiles_env
     echo "DEFAULT_USER=$USER" >> ~/.zsh_env_setup
     echo "export GIT_EDITOR=\"DEFAULT_EDITOR\"" >> ~/.dotfiles_env
     echo "export GIT_AUTHOR_NAME=\"GIT_USER\"" >> ~/.dotfiles_env
     echo "export GIT_AUTHOR_EMAIL=\"GIT_EMAIL\"" >> ~/.dotfiles_env
 fi
 
+# Source env setup file
+source ~/.dotfiles_env
+
 # Add some commons to PATH
 export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$PATH:$HOME/go/bin
 
diff --git a/Makefile.m4 b/Makefile.m4
index 08d498f..2646ded 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -26,63 +26,35 @@ define create_dotfile_symlink
 endef
 
 all: install_packages m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.tmux.conf') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.zshrc') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/bin') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.vimrc') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.vim') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.bashrc') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.p10k.zsh') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/rofi') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/deadd') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/waybar') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/foot') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/alacritty') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/powerline') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/sxhkd') m4_dnl
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `$(HOME_DIR)/.config/bspwm') m4_dnl
-m4_ifdef(`INSTALL_QTILE', `$(HOME_DIR)/.config/qtile/config.py') m4_dnl
-m4_ifdef(`INSTALL_SWAY', `$(HOME_DIR)/.config/sway/config') m4_dnl
-m4_ifdef(`INSTALL_SWAY', `$(HOME_DIR)/.config/sway/hid') m4_dnl
-m4_ifdef(`INSTALL_SWAY', `$(HOME_DIR)/.config/sway/autostart') m4_dnl
-m4_ifdef(`INSTALL_NEOVIM', `$(HOME_DIR)/.config/nvim') m4_dnl
-
-
-m4_ifdef(`INSTALL_OTHER_SYMLINKS', `m4_dnl
-linux/tmux.conf: linux/tmux.conf.m4                                           \
-                 ${M4_COMMON_DEPS}
-	$(call M4_EXEC)
-	$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
-
-$(HOME_DIR)/.tmux.conf: linux/tmux.conf
-	$(call create_dotfile_symlink,linux/tmux.conf,.tmux.conf)
-
-Common/zshrc: Common/zshrc.m4                                                 \
-              ${M4_COMMON_DEPS}
-	$(call M4_EXEC)
-
-$(HOME_DIR)/.zshrc: Common/zshrc
-	$(call create_dotfile_symlink,Common/zshrc,.zshrc)
-
-Common/bashrc: Common/bashrc.m4                                                 \
-              ${M4_COMMON_DEPS}
-	$(call M4_EXEC)
-
-$(HOME_DIR)/.bashrc: Common/bashrc
-	$(call create_dotfile_symlink,Common/bashrc,.bashrc)
-
-$(HOME_DIR)/bin: bin
-	$(call create_dotfile_symlink,bin,bin)
-
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.vimrc') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.vim') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/rofi') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/deadd') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/waybar') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/foot') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/alacritty') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/powerline') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/sxhkd') m4_dnl
+m4_ifdef(`DT_OTHER_SYMLINKS', `$(HOME_DIR)/.config/bspwm') m4_dnl
+m4_ifdef(`DT_HOMEBIN', `$(HOME_DIR)/bin') m4_dnl
+m4_ifdef(`DT_ZSH', `$(HOME_DIR)/.zshrc') m4_dnl
+m4_ifdef(`DT_ZSH', `$(HOME_DIR)/.p10k.zsh') m4_dnl
+m4_ifdef(`DT_BASH', `$(HOME_DIR)/.bashrc') m4_dnl
+m4_ifdef(`DT_TMUX', `$(HOME_DIR)/.tmux.conf') m4_dnl
+m4_ifdef(`DT_QTILE', `$(HOME_DIR)/.config/qtile/config.py') m4_dnl
+m4_ifdef(`DT_SWAY', `$(HOME_DIR)/.config/sway/config') m4_dnl
+m4_ifdef(`DT_SWAY', `$(HOME_DIR)/.config/sway/hid') m4_dnl
+m4_ifdef(`DT_SWAY', `$(HOME_DIR)/.config/sway/autostart') m4_dnl
+m4_ifdef(`DT_NEOVIM', `$(HOME_DIR)/.config/nvim') m4_dnl
+
+
+m4_ifdef(`DT_OTHER_SYMLINKS', `m4_dnl
 $(HOME_DIR)/.vimrc: Common/vimrc
 	$(call create_dotfile_symlink,Common/vimrc,.vimrc)
 
 $(HOME_DIR)/.vim: Common/vim
 	$(call create_dotfile_symlink,Common/vim,.vim)
 
-$(HOME_DIR)/.p10k.zsh: Common/vim
-	$(call create_dotfile_symlink,Common/p10k.zsh,.p10k.zsh)
-
 $(HOME_DIR)/.config/rofi: linux/rofi
 	$(call create_dotfile_symlink,linux/rofi,.config/rofi)
 
@@ -108,7 +80,45 @@ $(HOME_DIR)/.config/bspwm: linux/bspwm
 	$(call create_dotfile_symlink,linux/bspwm,.config/bspwm)
 ')
 
-m4_ifdef(`INSTALL_SWAY', `m4_dnl
+m4_ifdef(`DT_HOMEBIN', `m4_dnl
+$(HOME_DIR)/bin: bin
+	$(call create_dotfile_symlink,bin,bin)
+')
+
+m4_ifdef(`DT_BASH', `m4_dnl
+Common/bashrc: Common/bashrc.m4                                                 \
+              ${M4_COMMON_DEPS}
+	$(call M4_EXEC)
+
+$(HOME_DIR)/.bashrc: Common/bashrc
+	$(call create_dotfile_symlink,Common/bashrc,.bashrc)
+')
+
+m4_ifdef(`DT_ZSH', `m4_dnl
+Common/zshrc: Common/zshrc.m4                                                 \
+              ${M4_COMMON_DEPS}
+	$(call M4_EXEC)
+
+$(HOME_DIR)/.zshrc: Common/zshrc
+	$(call create_dotfile_symlink,Common/zshrc,.zshrc)
+
+m4_ifdef(`DT_ZSH', `m4_dnl
+$(HOME_DIR)/.p10k.zsh: Common/vim
+	$(call create_dotfile_symlink,Common/p10k.zsh,.p10k.zsh)
+')
+')
+
+m4_ifdef(`DT_TMUX', `m4_dnl
+linux/tmux.conf: linux/tmux.conf.m4                                           \
+                 ${M4_COMMON_DEPS}
+	$(call M4_EXEC)
+	$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
+
+$(HOME_DIR)/.tmux.conf: linux/tmux.conf
+	$(call create_dotfile_symlink,linux/tmux.conf,.tmux.conf)
+')
+
+m4_ifdef(`DT_SWAY', `m4_dnl
 linux/sway/%: linux/sway/%.m4                                                 \
                       ${M4_COMMON_DEPS}
 	$(call M4_EXEC)
@@ -118,7 +128,7 @@ $(HOME_DIR)/.config/sway/%: linux/sway/config linux/sway/hid linux/sway/autostar
 
 ')m4_dnl
 
-m4_ifdef(`INSTALL_QTILE', `m4_dnl
+m4_ifdef(`DT_QTILE', `m4_dnl
 linux/qtile/config/config.py: linux/qtile/config/config.py.m4                 \
                               linux/qtile/config/screen.m4.py                 \
                               linux/qtile/config/group.m4.py                  \
@@ -133,7 +143,7 @@ $(HOME_DIR)/.config/qtile/config.py: linux/qtile/config/config.py
 	sudo cp linux/qtile/qtile-wayland.desktop /usr/share/wayland-sessions/qtile-wayland.desktop
 ')m4_dnl
 
-m4_ifdef(`INSTALL_NEOVIM', `m4_dnl
+m4_ifdef(`DT_NEOVIM', `m4_dnl
 /usr/local/bin/nvim:
 	git clone https://github.com/neovim/neovim /tmp/neovim
 	git -C /tmp/neovim checkout tags/v0.9.5
@@ -146,15 +156,15 @@ $(HOME_DIR)/.config/nvim/: /usr/local/bin/nvim
 # Genereal package manager stuff
 m4_ifelse(DISTRO, `debian', m4_dnl
 DPKG_DEPENDENCIES := m4_dnl
-m4_ifdef(`INSTALL_TOOLS', `highlight atool w3m mediainfo curl zsh vim git python3-pip zsh tmux nodejs catimg ripgrep silversearcher-ag',) m4_dnl
-m4_ifdef(`INSTALL_GREETD_TUIGREET', `greetd',) m4_dnl
-m4_ifdef(`INSTALL_TLP', `tlp',) m4_dnl
+m4_ifdef(`DT_TOOLS', `highlight atool w3m mediainfo curl zsh vim git python3-pip zsh tmux nodejs catimg ripgrep silversearcher-ag',) m4_dnl
+m4_ifdef(`DT_GREETD_TUIGREET', `greetd',) m4_dnl
+m4_ifdef(`DT_TLP', `tlp',) m4_dnl
 m4_dnl
-m4_ifdef(`INSTALL_SWAY', `sway swayidle physlock alacritty blueman network-manager-gnome wob wlogout wofi brightnessctl clipman xwayland seahorse fcitx5',) m4_dnl
+m4_ifdef(`DT_SWAY', `sway swayidle physlock alacritty blueman network-manager-gnome wob wlogout wofi brightnessctl clipman xwayland seahorse fcitx5',) m4_dnl
 m4_dnl
-m4_ifdef(`INSTALL_QTILE', `python3-cffi python3-cairocffi pango pango-devel python3-dbus-next',) m4_dnl qtile core
-m4_ifdef(`INSTALL_QTILE', `python3_xcffib xsecurelock',) m4_dnl qtile x11
-m4_ifdef(`INSTALL_QTILE', `wlroots python3-wlroots python3-pywayland python3-xkbcommon xwayland',) m4_dnl qtile wayland
+m4_ifdef(`DT_QTILE', `python3-cffi python3-cairocffi pango pango-devel python3-dbus-next',) m4_dnl qtile core
+m4_ifdef(`DT_QTILE', `python3_xcffib xsecurelock',) m4_dnl qtile x11
+m4_ifdef(`DT_QTILE', `wlroots python3-wlroots python3-pywayland python3-xkbcommon xwayland',) m4_dnl qtile wayland
 
 
 install_packages:
diff --git a/configure b/configure
index a351dd5..154fc76 100755
--- a/configure
+++ b/configure
@@ -26,7 +26,7 @@ DEFAULT_SHELL=$(dialog \
 	  --backtitle "Dotfile configuration" \
 	  --title "Configure" \
 	  --inputbox "Default shell" \
-      0 0 "/usr/bin/zsh" \
+      0 0 "${SHELL}" \
 3>&1 1>&2 2>&3 3>&-)
 
 DEFAULT_EDITOR=$(dialog \
@@ -66,15 +66,15 @@ GIT_VALUES=$(dialog \
 	  --title "Configure" \
 	  --form "Git settings" \
 0 50 0 \
-	"Username:" 1 1	"$GIT_USER" 	1 10 255 0 \
-	"Email:"    2 1	"$GIT_EMAIL"  	2 10 255 0 \
+	"Username:" 1 1	"$GIT_AUTHOR_NAME" 	1 10 255 0 \
+    "Email:"    2 1	"$GIT_AUTHOR_EMAIL"  	2 10 255 0 \
 3>&1 1>&2 2>&3 3>&-)
 GIT_VALUES=($GIT_VALUES)
 
 FEATURES="$(dialog --stdout \
     --backtitle "Dotfile configuration" \
     --title "Configure" \
-    --checklist "Change dotfile features:" 0 0 10 \
+    --checklist "Change dotfile features:" 0 0 0 \
     1 "General tools (highligt, mediainfo, git, ripgrep...)" on \
     2 "Other dotfile symlinks (Not for specific features below)" on \
     3 "neovim" on \
@@ -84,7 +84,10 @@ FEATURES="$(dialog --stdout \
     7 "greetd and tuigreet" off \
     8 "Powerline and P10K" off \
     9 "Sway" off \
-    10 "QTile" off)"
+    10 "QTile" off \
+    11 "Bash" on \
+    12 "home folder bin dir" off \
+    13 "tmux" on)"
 
 
 # Write all to file
@@ -118,34 +121,43 @@ echo "m4_define(\`GIT_EMAIL', \`${GIT_VALUES[1]}')m4_dnl" >> ${M4_DEF_FILE}
 for choice in ${FEATURES}; do
     case $choice in
       1)
-        echo "m4_define(\`INSTALL_TOOLS', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_TOOLS', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       2)
-        echo "m4_define(\`INSTALL_OTHER_SYMLINKS', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_OTHER_SYMLINKS', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       3)
-        echo "m4_define(\`INSTALL_NEOVIM', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_NEOVIM', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       4)
-        echo "m4_define(\`INSTALL_OH_MY_ZSH', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_ZSH', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       5)
-        echo "m4_define(\`INSTALL_TLP', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_TLP', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       6)
-        echo "m4_define(\`INSTALL_AUTORANDR', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_AUTORANDR', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       7)
-        echo "m4_define(\`INSTALL_GREETD_TUIGREET', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_GREETD_TUIGREET', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       8)
-        echo "m4_define(\`INSTALL_POWERLINE_P10K', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_POWERLINE_P10K', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       9)
-        echo "m4_define(\`INSTALL_SWAY', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_SWAY', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
       10)
-        echo "m4_define(\`INSTALL_QTILE', \`1')m4_dnl" >> ${M4_DEF_FILE}
+        echo "m4_define(\`DT_QTILE', \`1')m4_dnl" >> ${M4_DEF_FILE}
+      ;;
+      11)
+        echo "m4_define(\`DT_BASH', \`1')m4_dnl" >> ${M4_DEF_FILE}
+      ;;
+      12)
+        echo "m4_define(\`DT_HOMEBIN', \`1')m4_dnl" >> ${M4_DEF_FILE}
+      ;;
+      13)
+        echo "m4_define(\`DT_TMUX', \`1')m4_dnl" >> ${M4_DEF_FILE}
       ;;
     esac
 done