reorganize and enhance

Author: itsthatguy

.gitignore

@@ -4,5 +4,6 @@ vim/.netrwhist
 vim/view/*
 vim/bundle/
 oh-my-zsh/
-go_secrets.sh
+# go_secrets.sh
 .DS_Store
+secret*

.gitmodules

@@ -1,20 +1,23 @@
 [submodule "vim/bundle/Vundle.vim"]
-  path = vim/bundle/Vundle.vim
+	path = modules/Vundle.vim
   url = git@github.com:gmarik/Vundle.vim.git
   ignore = dirty
 [submodule "prezto"]
-	path = prezto
+	path = modules/prezto
 	url = https://github.com/sorin-ionescu/prezto.git
   ignore = dirty
-[submodule "dotbot"]
-	path = dotbot
-	url = https://github.com/anishathalye/dotbot
 [submodule "zgen"]
-	path = zgen
+	path = modules/zgen
 	url = https://github.com/tarjoilija/zgen.git
 [submodule "dotbot-brew"]
-	path = dotbot-brew
+	path = modules/dotbot-brew
 	url = https://github.com/d12frosted/dotbot-brew.git
 [submodule "dotbot-asdf"]
-	path = dotbot-asdf
+	path = modules/dotbot-asdf
 	url = https://github.com/sobolevn/dotbot-asdf.git
+[submodule "dotbot-rust"]
+	path = modules/dotbot-rust
+	url = https://github.com/alexcormier/dotbot-rust
+[submodule "dotbot"]
+	path = modules/dotbot
+	url = https://github.com/anishathalye/dotbot

config/completion

@@ -3,16 +3,31 @@
 set -e
 
 CONFIG="install.conf.yaml"
-DOTBOT_DIR="dotbot"
+DOTBOT_DIR="modules/dotbot"
 
 DOTBOT_BIN="bin/dotbot"
-BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+MODULES_DIR=$BASE_DIR/modules
 
-cd "${BASEDIR}"
-git submodule update --init --recursive "${DOTBOT_DIR}"
+echo "BASE_DIR => $BASE_DIR"
+echo "MODULES_DIR => $MODULES_DIR"
 
-"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
-  -d "${BASEDIR}" \
-  --plugin-dir dotbot-asdf \
-  --plugin-dir dotbot-brew \
+cd "${BASE_DIR}"
+# git submodule update --init --recursive
+git submodule update --init --remote $MODULES_DIR/dotbot
+git submodule update --init --remote $MODULES_DIR/dotbot-asdf
+git submodule update --init --remote $MODULES_DIR/dotbot-brew
+git submodule update --init --remote $MODULES_DIR/dotbot-rust
+
+"${BASE_DIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
+  -p $MODULES_DIR/dotbot-rust/rust.py \
+  -d "${BASE_DIR}" \
+  --plugin-dir $MODULES_DIR/dotbot-asdf \
+  --plugin-dir $MODULES_DIR/dotbot-brew \
+  --plugin-dir $MODULES_DIR/dotbot-rust \
   -c "${CONFIG}" "${@}"
+
+# "${BASE_DIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
+#   -d "${BASE_DIR}" \
+#   --plugin-dir dotbot-brew \
+#   -c "${CONFIG}" "${@}"

dotbot

@@ -3,53 +3,69 @@
       create: true
       relink: true
 
-- clean: ['~']
+- clean: ["~"]
 
 - brew:
-  - asdf
-  - mtr
-  - postman
-  - figma
-  - spectacle
-  - spotify
-  - visual-studio-code
+    - alfred
+    - asdf
+    - bartender
+    - bash-completion
+    - brave-browser
+    - curl
+    - docker
+    - figma
+    - iterm2
+    - mtr
+    - obsidian
+    - postman
+    - shift
+    - spectacle
+    - spotify
+    - visual-studio-code
+    - zsh-completions
+    - zsh-vi-mode
 
 - asdf:
-  - plugin: redis
-    url: https://github.com/smashedtoatoms/asdf-redis.git
-  - plugin: mongodb
-    url: https://github.com/sylph01/asdf-mongodb.git
-  - plugin: ruby
-    url: https://github.com/asdf-vm/asdf-ruby.git
-    
-- link:
-    # vim config
-    ~/.vim: vim
-    ~/.vimrc:
-      relink: true
-      path: vimrc
-    ~/.vimrc.local:
-      relink: true
-      path: vimrc.local
+    - plugin: redis
+      url: https://github.com/smashedtoatoms/asdf-redis.git
 
-    # zsh config
-    ~/.zshenv: zshenv
-    ~/.zshrc: zshrc
-    ~/.zgen: zgen
-    ~/.zsh/themes/itg-text.zsh-theme: zsh-themes/itg-text.zsh-theme
-    ~/.zprezto: prezto
-    ~/.zpreztorc: zpreztorc
-    ~/.scripts: scripts
+    - plugin: mongodb
+      url: https://github.com/sylph01/asdf-mongodb.git
 
-    # ruby config
-    ~/.gemrc: gemrc
+    - plugin: nodejs
+      global: 16.13.2
 
-    # git config
-    ~/.gitconfig: gitconfig
-    ~/.gitignore: gitignore
+    - plugin: ruby
+      url: https://github.com/asdf-vm/asdf-ruby.git
+      global: 3.2.1
 
-- shell:
-  - [mkdir ~/.vim/.backup, Create vim backup directory]
-  - [mkdir ~/.vim/.swp, Create vim swap directory]
-  - [vim +PluginInstall +qall, Install vim plugins]
+    - plugin: erlang
+      url: https://github.com/asdf-vm/asdf-erlang.git
+      global: 25.1.2
+
+    - plugin: elixir
+      url: https://github.com/asdf-vm/asdf-elixir.git
+      global: 1.14.2-otp-25
+
+    - plugin: terraform
+      url: https://github.com/Banno/asdf-hashicorp.git
+      global: 1.2.4
 
+# - cargo:
+#     - starship
+
+- link:
+    ~/:
+      glob: true
+      path: src/*
+      prefix: .
+
+    # vim config
+    ~/.vim: vim
+
+- shell:
+    - [mkdir ~/.vim/.backup, Create vim backup directory]
+    - [mkdir ~/.vim/.swp, Create vim swap directory]
+    - [vim +PluginInstall +qall, Install vim plugins]
+    - [compaudit | xargs chmod g-w, Setting zsh-completions permissions]
+    - [cd ~/ && asdf install]