diff --git a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
index 0bf62cd8..b54cab9a 100644
--- a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
+++ b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml
@@ -26,9 +26,21 @@ preference:
   - binary
 
 alternatives:
+  astronvim:
+    _deps:
+      - bottom
+      - gdu
+      - lazygit
+      - neovim
+      - node
+      - python
+      - ripgrep
+      - tree-sitter-cli
   delta:
     brew: git-delta
     scoop: delta
+  bash-completion:
+    brew: bash-completion
   bottom:
     brew: bottom
     pacman: bottom
@@ -148,6 +160,8 @@ alternatives:
     whalebrew: whalebrew/wget
 
 postinstall:
+  astronvim: |
+    nvim --headless -c 'autocmd User PackerComplete quitall'
   bottom:
     snap: |
       sudo snap connect bottom:mount-observe
diff --git a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
index 2f10b829..4d7bfc88 100644
--- a/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
+++ b/dotfiles/.local/share/chezmoi/.chezmoiexternal.toml
@@ -1,3 +1,4 @@
+### VIM
 {{- $refreshPeriod := "140h" }}
 {{- $vimPlugins := .plugins.vim }}
 {{- range $vimPlugin := $vimPlugins }}
@@ -10,6 +11,11 @@
         args = ["--ff-only"]
 {{- end }}
 
+### Shell
+[".config/shell/lscolors.sh"]
+    type = "fil"
+    url = "https://raw.githubusercontent.com/trapd00r/LS_COLORS/master/lscolors.sh"
+    refreshPeriod = "{{ $refreshPeriod }}"
 [".local/antigen.zsh"]
     type = "file"
     url = "https://raw.githubusercontent.com/zsh-users/antigen/develop/bin/antigen.zsh"
@@ -31,6 +37,14 @@
     url = "https://raw.githubusercontent.com/dandavison/delta/master/themes.gitconfig"
     refreshPeriod = "{{ $refreshPeriod }}"
 
+### Neovim
+[".config/nvim"]
+    type = "git-repo"
+    url = "https://github.com/AstroNvim/AstroNvim.git"
+    refreshPeriod = "{{ $refreshPeriod }}"
+    [".config/nvim".pull]
+        args = ["--ff-only"]
+
 {{- if not .host.headless }}
 ### Hack Nerd Font Download
 {{-   $refreshPeriod := "4800h" }}
@@ -83,10 +97,14 @@
 ### Miscellaneous Fonts Download
 ["{{ $fontDir }}/FontAwesome.ttf"]
     type = "file"
-    url = "https://github.com/VermiumSifell/dotfiles/raw/main/dot_local/share/fonts/fontawesome.ttf"
+    # Source URL
+    # url = "https://github.com/VermiumSifell/dotfiles/raw/main/dot_local/share/fonts/fontawesome.ttf"
+    url = "https://gitlab.com/megabyte-labs/misc/dotfiles/-/raw/master/dotfiles/.local/share/chezmoi/dot_local/share/fonts/FontAwesome.ttf"
     refreshPeriod = "{{ $refreshPeriod }}"
 ["{{ $fontDir }}/Weather-Icons.ttf"]
     type = "file"
-    url = "https://github.com/VermiumSifell/dotfiles/raw/main/dot_local/share/fonts/weathericons.ttf"
+    # Source URL
+    # url = "https://github.com/VermiumSifell/dotfiles/raw/main/dot_local/share/fonts/weathericons.ttf"
+    url = "https://gitlab.com/megabyte-labs/misc/dotfiles/-/raw/master/dotfiles/.local/share/chezmoi/dot_local/share/fonts/Weather-Icons.ttf"
     refreshPeriod = "{{ $refreshPeriod }}"
 {{- end }}
diff --git a/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl b/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl
index 6a430ead..c4451f84 100644
--- a/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl
+++ b/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl
@@ -64,6 +64,11 @@ fi
 
 ### Bash Initialization Hooks
 if [ "$BASH_SUPPORT" = 'true' ]; then
+  ### Bash Completion
+  if [ -f "/usr/local/etc/profile.d/bash_completion.sh" ]; then
+    . "/usr/local/etc/profile.d/bash_completion.sh"
+  fi
+
   ### direnv
   if command -v direnv > /dev/null; then
     eval "$(direnv hook bash)"