Hugo completion in main script, remove default dotfiles

scripts/brew-packages

@@ -23,6 +23,7 @@ git-extras
 git-lfs
 helix
 htop
+hugo
 jq
 keychain
 mpv

scripts/generate_completions

@@ -9,8 +9,11 @@ source "${HOME}/dotfiles/stowed-files/bash/.profile"
 
 generate_completions() {
   declare -r completion_dir="$HOME/.local/completion.d"
-  echo -n "… Generating completions & man pages"
+  declare -r man_dir_path="$HOME/.local/share/man/man1"
   mkdir -p "${completion_dir}"
+  mkdir -p "${man_dir_path}"
+
+  echo -n "… Generating completions & man pages"
 
   if command_exists npm; then
     npm completion > "${completion_dir}/npm_completion"
@@ -24,6 +27,11 @@ generate_completions() {
     gh completion -s bash > "${completion_dir}/gh_completion"
   fi
 
+  if command_exists hugo; then
+    hugo completion bash > "${completion_dir}/hugo_completion"
+    hugo gen man --dir "${man_dir_path}" > /dev/null
+  fi
+
   if command_exists pipx; then
     register-python-argcomplete --shell bash pipx > "${completion_dir}/pipx_completion"
   fi

scripts/install_github_packages

@@ -215,17 +215,6 @@ install_helix() {
 
 install_hugo() {
   install_deb 'gohugoio/hugo' 'hugo_extended_.*_linux-amd64.deb'
-
-  echo "Generating hugo bash completion & man pages"
-  mkdir -p "$HOME/.local/completion.d"
-  hugo completion bash > "$HOME/.local/completion.d/hugo_completion"
-  pushd "$(mktemp -d)" > /dev/null
-  hugo gen man
-  local man_dir_path="$HOME/.local/share/man/man1"
-  mkdir -p "${man_dir_path}"
-  mv man/* "${man_dir_path}"
-  popd > /dev/null
-  rm -rf "${man_dir_path}"
 }
 
 install_lazydocker() {

scripts/setup_mac

@@ -83,6 +83,8 @@ main() {
   install_homebrew
   install_homebrew_packages
 
+  # Remove default files before stowing, otherwise stow fails
+  "${dotfiles_root}/scripts/remove_default_dotfiles"
   "${dotfiles_root}/scripts/stow"
 
   setup_shell
@@ -95,6 +97,8 @@ main() {
 
   "${dotfiles_root}/scripts/generate_completions"
 
+  # TODO: Neovim plugin install?
+
   echo "Setup complete!"
 }
 

scripts/setup_machine

@@ -84,14 +84,6 @@ is_package_installed() {
   fi
 }
 
-remove_default_dotfile() {
-  declare -r filename=$1
-  if [[ -f "$HOME/$filename" && ! -L "$HOME/$filename" ]]; then
-    echo "Moving default $filename"
-    mv "$HOME/$filename" "$HOME/original$filename"
-  fi
-}
-
 set_default_applications() {
   if command_exists nvim && ! update-alternatives --query editor | grep ^Value | grep -q nvim; then
     echo "Setting Neovim as default text editor (requires sudo)"
@@ -285,10 +277,8 @@ main() {
   [[ -z "${IS_HEADLESS:-}" ]] && "${dotfiles_root}/scripts/install_firefox"
   "${dotfiles_root}/scripts/install_github_packages"
 
-  # Debian ships with these two by default
-  remove_default_dotfile .bashrc
-  remove_default_dotfile .profile
-
+  # Remove default files before stowing, otherwise stow fails
+  "${dotfiles_root}/scripts/remove_default_dotfiles"
   "${dotfiles_root}/scripts/stow"
 
   # Misc system configs