Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -7,6 +7,9 @@ if status --is-interactive
|
|||||||
|
|
||||||
# Fish specific
|
# Fish specific
|
||||||
set fish_greeting
|
set fish_greeting
|
||||||
|
set --global hydro_symbol_prompt "\$"
|
||||||
|
set --global hydro_symbol_git_dirty "~"
|
||||||
|
set --global hydro_fetch true
|
||||||
if type -q base16-seti
|
if type -q base16-seti
|
||||||
base16-seti
|
base16-seti
|
||||||
end
|
end
|
||||||
|
|||||||
4
files/.config/fish/fish_plugins
Normal file
4
files/.config/fish/fish_plugins
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
tomyun/base16-fish
|
||||||
|
jorgebucaran/fish-bax
|
||||||
|
jethrokuan/z
|
||||||
|
jorgebucaran/hydro
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
source $XDG_CONFIG_HOME/nvim/base.vim
|
runtime base.vim
|
||||||
|
|
||||||
source $XDG_CONFIG_HOME/nvim/plugins.vim
|
runtime plugins.vim
|
||||||
source $XDG_CONFIG_HOME/nvim/plugins-config.vim
|
runtime plugins-config.vim
|
||||||
|
|
||||||
source $XDG_CONFIG_HOME/nvim/mappings.vim
|
runtime mappings.vim
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ if ! [ -f "$fisher_location" ]; then
|
|||||||
curl https://git.io/fisher --create-dirs -sLo "$fisher_location"
|
curl https://git.io/fisher --create-dirs -sLo "$fisher_location"
|
||||||
fi
|
fi
|
||||||
echo "fisher is installed, updating..."
|
echo "fisher is installed, updating..."
|
||||||
`fish -c "fisher"`;
|
fish -c "fisher update";
|
||||||
|
|
||||||
fish -c "fisher --version"
|
fish -c "fisher --version"
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
build-essential
|
build-essential
|
||||||
libssl-dev
|
libssl-dev
|
||||||
libbz2-dev
|
libbz2-dev
|
||||||
libreadline-dev
|
libreadline-dev
|
||||||
|
libreadline6
|
||||||
|
libreadline6-dev
|
||||||
libsqlite3-dev
|
libsqlite3-dev
|
||||||
llvm
|
llvm
|
||||||
libncurses5-dev
|
libncurses5-dev
|
||||||
libncursesw5-dev
|
libncursesw5-dev
|
||||||
xz-utils
|
xz-utils
|
||||||
tk-dev
|
tk-dev
|
||||||
libffi-dev
|
libffi-dev
|
||||||
liblzma-dev
|
liblzma-dev
|
||||||
python-openssl
|
zlib1g-dev
|
||||||
|
|||||||
@@ -15,9 +15,10 @@ if not_installed "docker"; then
|
|||||||
software-properties-common
|
software-properties-common
|
||||||
|
|
||||||
# Add repository
|
# 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 \
|
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) \
|
$(lsb_release -cs) \
|
||||||
stable"
|
stable"
|
||||||
update
|
update
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$(dirname $0)/utils.sh"
|
source "$(dirname $0)/utils.sh"
|
||||||
|
|
||||||
tf_version="0.13.5"
|
tf_version="0.14.6"
|
||||||
if not_installed "terraform"; then
|
if not_installed "terraform"; then
|
||||||
echo "Installing terraform..."
|
echo "Installing terraform..."
|
||||||
tf_archive="terraform_${tf_version}_linux_amd64.zip"
|
tf_archive="terraform_${tf_version}_linux_amd64.zip"
|
||||||
@@ -16,7 +16,7 @@ fi
|
|||||||
echo "terraform is installed"
|
echo "terraform is installed"
|
||||||
terraform --version
|
terraform --version
|
||||||
|
|
||||||
tf_lsp_version="0.8.0"
|
tf_lsp_version="0.13.0"
|
||||||
if not_installed "terraform-ls"; then
|
if not_installed "terraform-ls"; then
|
||||||
echo "Installing terraform-ls..."
|
echo "Installing terraform-ls..."
|
||||||
tf_lsp_archive="terraform-ls_${tf_lsp_version}_linux_amd64.zip"
|
tf_lsp_archive="terraform-ls_${tf_lsp_version}_linux_amd64.zip"
|
||||||
|
|||||||
@@ -39,10 +39,9 @@ add_ppa() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# @arg $1 url to add
|
# @arg $1 url to add
|
||||||
|
# @arg $2 keyring to add to
|
||||||
add_key() {
|
add_key() {
|
||||||
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true \
|
curl -fsSL $1 | sudo apt-key --keyring "/etc/apt/trusted.gpg.d/$2.gpg" add
|
||||||
curl -fsSL $1 \
|
|
||||||
| sudo apt-key add -
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# @arg $1 URL to run
|
# @arg $1 URL to run
|
||||||
|
|||||||
Reference in New Issue
Block a user