diff --git a/.gitmodules b/.gitmodules
index a9025a1..80dd87a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "scripts/pokemon-colorscripts"]
 	path = scripts/pokemon-colorscripts
 	url = https://gitlab.com/phoneybadger/pokemon-colorscripts.git
+[submodule "zsh/zsh-autosuggestions"]
+	path = zsh/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
diff --git a/README.md b/README.md
index aab718a..dd64415 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 - alacritty
 - zsh
+- zsh-autosuggestions
+- zsh-completions
 - homebrew/linuxbrew
 - stow
 - rust toolchain
diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases
index 798df99..a2daef9 100644
--- a/zsh/.zsh_aliases
+++ b/zsh/.zsh_aliases
@@ -14,19 +14,19 @@ alias d='dirs -v'
 for index ({1..9}) alias "c$index"="cd +${index}"; unset index
 
 _get_aws_config_path() {
-  local config_path="${AWS_CONFIG_FILE:-$HOME/.aws/config}"
-  echo "$config_path"
+    local config_path="${AWS_CONFIG_FILE:-$HOME/.aws/config}"
+    echo "$config_path"
 }
 
 # This label will be set in a comment in the ~/.aws/config file right before
 # the definition of the profile we want to use as the default.
-# The format will be `#[<label>]`
+# The format will be `#[<label value>]`
 # Example, using "admin" as the default profile:
 #
 # > [default]
 # > region = eu-south-2
 # >
-# > #[aws-vault-default]  ---> Marking the profile with the label
+# > #[<label value>]  ---> Marking the profile with the label
 # > [profile admin]
 # > source_profile=default
 # > region = eu-south-2
@@ -56,15 +56,15 @@ _terra_cmd() {
     local cmd_args=()
 
     if [[ -z "$1" ]]; then
-      echo "Error: Missing required first argument"
-      echo "Usage: tf [terraform|terragrunt] [additional args]"
-      return 1
+        echo "Error: Missing required first argument"
+        echo "Usage: _terra_cmd [terraform|terragrunt] [additional args]"
+        return 1
     fi
 
     if [[ "$1" != "terraform" && "$1" != "terragrunt" ]]; then
-      echo "Error: First argument must be either 'terraform' or 'terragrunt'"
-      echo "Usage: my_function [terraform|terragrunt] [additional args]"
-      return 1
+        echo "Error: First argument must be either 'terraform' or 'terragrunt'"
+        echo "Usage: _terra_cmd [terraform|terragrunt] [additional args]"
+        return 1
     fi
 
     # If we get here, the first argument is valid
@@ -73,7 +73,7 @@ _terra_cmd() {
 
     while [[ $# -gt 0 ]]; do
         case $1 in
-            -p|--profile)
+            -p | --profile)
                 if [[ $# -gt 1 ]]; then
                     aws_vault_profile="$2"
                     shift 2
diff --git a/zsh/zsh-autosuggestions b/zsh/zsh-autosuggestions
new file mode 160000
index 0000000..0e810e5
--- /dev/null
+++ b/zsh/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15