config.bash

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+
+for file in config.d/*.bash
+do
+  bash $file
+done
+
 # Configuration BASH
 
 if [[ ! -d ~/.bash ]]
@@ -8,8 +14,18 @@ then
     bash ~/.bash/create-links.bash
 fi
 
-for file in config.d/*.bash
+# Configuration VIM
-do
-  bash $file
-done
 
+if [[ ! -d ~/.vim ]]
+then
+    git clone --recursive https://github.com/xlogerais/config-vim.git ~/.vim
+    bash ~/.vim/create-links.bash
+fi
+
+# Configuration NVIM
+
+if [[ ! -d ~/.config/nvim ]]
+then
+    git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
+    nvim +PackerSync
+fi

config.d/nvim.bash

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Configuration NVIM
-
-if [[ ! -d ~/.config/nvim ]]
-then
-    git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
-    nvim +PackerSync
-fi
-

config.d/vim.bash

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Configuration VIM
-
-if [[ ! -d ~/.vim ]]
-then
-    git clone --recursive https://github.com/xlogerais/config-vim.git ~/.vim
-    bash ~/.vim/create-links.bash
-fi
-
-

tools.bash

@@ -1,6 +1,51 @@
 #!/bin/bash
 
-for file in tools.d/*.bash
+# Install asdf
+
+test -d $HOME/.asdf || git clone https://github.com/asdf-vm/asdf.git $HOME/.asdf
+source $HOME/.asdf/asdf.sh
+source $HOME/.asdf/completions/asdf.bash
+
+# Install plugins and tools
+
+declare -a tools
+
+tools+=(shellcheck)
+tools+=(direnv)
+tools+=(lazygit)
+tools+=(jq yq)
+tools+=(kubectl helm k9s)
+tools+=(vault)
+tools+=(terraform terragrunt)
+tools+=(ripgrep exa bat dust delta)
+
+for tool in "${tools[@]}"
 do
-  bash $file
+    echo
+    echo "-- Installing ${tool}"
+    asdf plugin add ${tool}
+    asdf install ${tool} latest
+    asdf global ${tool} latest
 done
+
+# Mcfly
+echo
+echo "-- Installing mcfly"
+asdf plugin add mcfly https://github.com/barolab/asdf-mcfly.git
+asdf install mcfly latest
+asdf global mcfly latest
+
+# lsd
+echo
+echo "-- Installing lsd"
+asdf plugin add lsd https://github.com/argylelabcoat/asdf-lsd.git
+asdf install lsd latest
+asdf global lsd latest
+
+test -d ~/.local/bin || mkdir -p ~/.local/bin
+
+# broot
+test -x ~/.local/bin/broot || wget -O ~/.local/bin/broot "https://dystroy.org/broot/download/x86_64-linux/broot"
+
+# powerline-go
+test -x ~/.local/bin/powerline-go || wget -O ~/.local/bin/powerline-go "https://github.com/justjanne/powerline-go/releases/latest/download/powerline-go-linux-amd64" && chmod +x ~/.local/bin/powerline-go

tools.d/asdf.bash

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Install asdf
-
-test -d $HOME/.asdf || git clone https://github.com/asdf-vm/asdf.git $HOME/.asdf
-source $HOME/.asdf/asdf.sh
-source $HOME/.asdf/completions/asdf.bash
-
-# Install plugins and tools
-
-declare -a tools
-
-tools+=(shellcheck)
-tools+=(direnv)
-tools+=(lazygit)
-tools+=(jq yq)
-tools+=(kubectl helm k9s)
-tools+=(vault)
-tools+=(terraform terragrunt)
-tools+=(ripgrep exa bat dust delta)
-
-for tool in "${tools[@]}"
-do
-    echo
-    echo "-- Installing ${tool}"
-    asdf plugin add ${tool}
-    asdf install ${tool} latest
-    asdf global ${tool} latest
-done
-
-# Install extra plugins and tools
-
-# lsd
-echo
-echo "-- Installing lsd"
-asdf plugin add lsd https://github.com/argylelabcoat/asdf-lsd.git
-asdf install lsd latest
-asdf global lsd latest
-
-# Mcfly
-echo
-echo "-- Installing mcfly"
-asdf plugin add mcfly https://github.com/barolab/asdf-mcfly.git
-asdf install mcfly latest
-asdf global mcfly latest

tools.d/broot.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# broot
-test -d ~/.local/bin || mkdir -p ~/.local/bin
-test -x ~/.local/bin/broot || wget -O ~/.local/bin/broot "https://dystroy.org/broot/download/x86_64-linux/broot"

tools.d/powerline.bash

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# powerline-go
-test -x ~/.local/bin/powerline-go \
-  || wget -O ~/.local/bin/powerline-go "https://github.com/justjanne/powerline-go/releases/latest/download/powerline-go-linux-amd64" \
-  && chmod +x ~/.local/bin/powerline-go