Merge remote-tracking branch 'origin/master'

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

files/.config/fish/fish_plugins

@@ -0,0 +1,4 @@
+tomyun/base16-fish
+jorgebucaran/fish-bax
+jethrokuan/z
+jorgebucaran/hydro

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

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"

install/10-pyenv-pkglist

@@ -2,6 +2,8 @@ build-essential
 libssl-dev
 libbz2-dev
 libreadline-dev
+libreadline6
+libreadline6-dev
 libsqlite3-dev
 llvm
 libncurses5-dev
@@ -10,4 +12,4 @@ xz-utils
 tk-dev
 libffi-dev
 liblzma-dev
-python-openssl 
+zlib1g-dev

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

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"

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