diff --git a/files/.config/fish/config.fish b/files/.config/fish/config.fish
index 5698cff..0038f0b 100644
--- a/files/.config/fish/config.fish
+++ b/files/.config/fish/config.fish
@@ -7,6 +7,9 @@ if status --is-interactive
 
     # Fish specific
     set fish_greeting
+    set --global hydro_symbol_prompt "\$"
+    set --global hydro_symbol_git_dirty "~"
+    set --global hydro_fetch true
     if type -q base16-seti
         base16-seti
     end
diff --git a/files/.config/fish/fish_plugins b/files/.config/fish/fish_plugins
new file mode 100644
index 0000000..1bb230a
--- /dev/null
+++ b/files/.config/fish/fish_plugins
@@ -0,0 +1,4 @@
+tomyun/base16-fish
+jorgebucaran/fish-bax
+jethrokuan/z
+jorgebucaran/hydro
diff --git a/files/.config/nvim/init.vim b/files/.config/nvim/init.vim
index 9bca18b..66514fc 100644
--- a/files/.config/nvim/init.vim
+++ b/files/.config/nvim/init.vim
@@ -1,6 +1,6 @@
-source $XDG_CONFIG_HOME/nvim/base.vim
+runtime base.vim
 
-source $XDG_CONFIG_HOME/nvim/plugins.vim
-source $XDG_CONFIG_HOME/nvim/plugins-config.vim
+runtime plugins.vim
+runtime plugins-config.vim
 
-source $XDG_CONFIG_HOME/nvim/mappings.vim
+runtime mappings.vim
diff --git a/install/02-fish.sh b/install/02-fish.sh
index cbb017c..5affbd6 100755
--- a/install/02-fish.sh
+++ b/install/02-fish.sh
@@ -17,6 +17,6 @@ if ! [ -f "$fisher_location" ]; then
     curl https://git.io/fisher --create-dirs -sLo "$fisher_location"
 fi
 echo "fisher is installed, updating..."
-`fish -c "fisher"`;
+fish -c "fisher update";
 
 fish -c "fisher --version"
diff --git a/install/10-pyenv-pkglist b/install/10-pyenv-pkglist
index 22850e6..df0cd09 100644
--- a/install/10-pyenv-pkglist
+++ b/install/10-pyenv-pkglist
@@ -1,13 +1,15 @@
-build-essential 
-libssl-dev 
+build-essential
+libssl-dev
 libbz2-dev
 libreadline-dev
+libreadline6
+libreadline6-dev
 libsqlite3-dev
 llvm
 libncurses5-dev
 libncursesw5-dev
-xz-utils 
-tk-dev 
-libffi-dev 
-liblzma-dev 
-python-openssl 
+xz-utils
+tk-dev
+libffi-dev
+liblzma-dev
+zlib1g-dev
diff --git a/install/30-docker.sh b/install/30-docker.sh
index b89dacb..e758e21 100755
--- a/install/30-docker.sh
+++ b/install/30-docker.sh
@@ -15,9 +15,10 @@ if not_installed "docker"; then
         software-properties-common
 
     # Add repository
-    add_key "https://download.docker.com/linux/ubuntu/gpg"
+    distro=$(lsb_release -si | tr '[:upper:]' '[:lower:]') # cast to lowercase
+    add_key "https://download.docker.com/linux/$distro/gpg" "docker-apt-key"
     sudo add-apt-repository -y \
-        "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+        "deb [arch=amd64] https://download.docker.com/linux/$distro \
         $(lsb_release -cs) \
         stable"
     update
diff --git a/install/34-terraform.sh b/install/34-terraform.sh
index cd4433b..42f3fc6 100755
--- a/install/34-terraform.sh
+++ b/install/34-terraform.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 source "$(dirname $0)/utils.sh"
 
-tf_version="0.13.5"
+tf_version="0.14.6"
 if not_installed "terraform"; then
     echo "Installing terraform..."
     tf_archive="terraform_${tf_version}_linux_amd64.zip"
@@ -16,7 +16,7 @@ fi
 echo "terraform is installed"
 terraform --version
 
-tf_lsp_version="0.8.0"
+tf_lsp_version="0.13.0"
 if not_installed "terraform-ls"; then
     echo "Installing terraform-ls..."
     tf_lsp_archive="terraform-ls_${tf_lsp_version}_linux_amd64.zip"
diff --git a/install/utils.sh b/install/utils.sh
index 8a15314..9f32904 100755
--- a/install/utils.sh
+++ b/install/utils.sh
@@ -39,10 +39,9 @@ add_ppa() {
 }
 
 # @arg $1 url to add
+# @arg $2 keyring to add to
 add_key() {
-    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true \
-        curl -fsSL $1 \
-        | sudo apt-key add -
+    curl -fsSL $1 | sudo apt-key --keyring "/etc/apt/trusted.gpg.d/$2.gpg" add
 }
 
 # @arg $1 URL to run