diff --git a/dot_aliases/music.sh b/dot_aliases/music.sh
new file mode 100644
index 0000000..27f13cd
--- /dev/null
+++ b/dot_aliases/music.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+alias music='baton'
+alias mytracks='music me saved tracks'
+alias saved='mytracks'
+alias liked='saved'
+alias next='music next'
+alias prev='music prev'
+alias previous='prev'
+alias like='music save'
+alias curr='music status'
diff --git a/dot_aliases/terraform.sh b/dot_aliases/terraform.sh
new file mode 100644
index 0000000..84e995b
--- /dev/null
+++ b/dot_aliases/terraform.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+alias terraform_landscape='landscape'
+alias tf='terraform'
+alias tfa='terraform apply'
+alias tfc='terraform console'
+alias tfd='terraform destroy'
+alias tff='terraform fmt'
+alias tfg='terraform graph'
+alias tfim='terraform import'
+alias tfin='terraform init'
+alias tfo='terraform output'
+alias tfp='terraform plan'
+alias tfpr='terraform providers'
+alias tfr='terraform refresh'
+alias tfsh='terraform show'
+alias tft='terraform taint'
+alias tfut='terraform untaint'
+alias tfv='terraform validate'
+alias tfw='terraform workspace'
+alias tfs='terraform state'
+alias tffu='terraform force-unlock'
+alias tfwst='terraform workspace select'
+alias tfwsw='terraform workspace show'
+alias tfssw='terraform state show'
+alias tfwde='terraform workspace delete'
+alias tfwls='terraform workspace list'
+alias tfsls='terraform state list'
+alias tfwnw='terraform workspace new'
+alias tfsmv='terraform state mv'
+alias tfspl='terraform state pull'
+alias tfsph='terraform state push'
+alias tfsrm='terraform state rm'
+alias tfay='terraform apply -auto-approve'
+alias tfdy='terraform destroy -auto-approve'
+alias tfinu='terraform init -upgrade'
+alias tfpde='terraform plan --destroy'
diff --git a/dot_scripts/bootstrap.sh b/dot_scripts/bootstrap.sh
index f53321d..88bf075 100755
--- a/dot_scripts/bootstrap.sh
+++ b/dot_scripts/bootstrap.sh
@@ -47,6 +47,7 @@ ln -snf ~/Code/dotfiles/dot_vimrc ~/.vimrc
 # custom linters
 ln -snf ~/Code/dotfiles/dot_vim/ale_linters ~/.vim/ale_linters
 
+ln -snf ~/Code/dotfiles/dot_aliases ~/.aliases
 ln -snf ~/Code/dotfiles/dot_zsh_aliases ~/.zsh_aliases
 ln -snf ~/Code/dotfiles/dot_zsh_functions ~/.zsh_functions
 ln -snf ~/Code/dotfiles/dot_zshrc ~/.zshrc
diff --git a/dot_zsh_aliases b/dot_zsh_aliases
index c76256f..77a96e7 100644
--- a/dot_zsh_aliases
+++ b/dot_zsh_aliases
@@ -149,6 +149,7 @@ alias za='vim ~/.zsh_aliases' # edit zsh_aliases
 alias dots='cd $HOME/Code/dotfiles'
 alias dotfiles='dots'
 alias code='cd $HOME/Code'
+alias gochezmoi='cd ~/.local/share/chezmoi'
 
 # System Utils
 alias systeminfo='neofetch'
@@ -194,8 +195,7 @@ alias gw='./gradlew'
 alias irc='weechat'
 
 # Terraform
-alias terraform_landscape='landscape'
-alias tf='terraform'
+source $HOME/.aliases/terraform.sh
 
 # Fun
 alias moon='curl "wttr.in/Moon?lang=fr"'
@@ -205,15 +205,7 @@ alias coffee="curl -L http://git.io/coffee"
 alias hotcoffee="curl -sL git.io/hotcoffee | sh"
 
 # Music
-alias music='baton'
-alias mytracks='music me saved tracks'
-alias saved='mytracks'
-alias liked='saved'
-alias next='music next'
-alias prev='music prev'
-alias previous='prev'
-alias like='music save'
-alias curr='music status'
+source $HOME/.aliases/music.sh
 
 # K8S
 alias k9s='COLORTERM=256bit k9s --all-namespaces'