feat: Switch config for astronvim to main branch

bootstrap.bash

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-bash system-ubuntu.bash
+BASEDIR=$(cd "$(dirname "$0")" && pwd)
-bash tools.bash
+
-bash fonts.bash
+bash "${BASEDIR}/os.bash"
-bash config.bash
+bash "${BASEDIR}/tools.bash"
+bash "${BASEDIR}/fonts.bash"
+bash "${BASEDIR}/config.bash"

config.bash

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-for file in config.d/*.bash
+BASEDIR=$(cd "$(dirname "$0")" && pwd)
-do
-  bash $file
-done
 
+for file in "${BASEDIR}"/config.d/*.bash; do
+  bash "${file}"
+done

config.d/git.bash

@@ -4,15 +4,26 @@
 
 git config --global user.name "Xavier Logerais"
 git config --global user.email "xavier@logerais.com"
-git config --global rerere.enabled 1
+
+git config --global credential.helper cache
+
 git config --global merge.conflictstyle diff3
+git config --global rerere.enabled 1
 
 cat <<EOF >~/.gitignore
-# asdf
+### asdf ###
 .tool-versions
-# direnv
+### mise ###
-.envrc
+.mise.toml
+### direnv ###
 .direnv
+.envrc
+### python ###
+.venv
+EOF
+
+cat <<EOF >~/.gitattributes
 EOF
 
 git config --global core.excludesfile ~/.gitignore
+git config --global core.attributesfile ~/.gitattributes

config.d/nvim.bash

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-# Configuration NVIM
+# Configuration for neovim
 
-if [[ ! -d ~/.config/nvim ]]
+# git_repo="https://github.com/AstroNvim/template"
-then
+# git_branch="main"
-    git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
+
-    nvim +PackerSync
+git_repo="https://gitea.cloud.logerais.com/xavier/config-astronvim.git"
+git_branch="main"
+config_dir=${XDG_CONFIG_HOME:-$HOME/.config}/nvim
+
+if [[ ! -d "${config_dir}" ]]; then
+    git clone "${git_repo}" --branch "${git_branch}" "${config_dir}"
+    nvim --headless +q
+else
+    cd "${config_dir}" && git pull
 fi
-

config.d/tmux.bash

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-# Configuration TMUX
+# Configuration for tmux
 
-if [[ ! -d ~/.tmux ]]
+git_repo="https://gitea.cloud.logerais.com/xavier/config-tmux.git"
-then
+git_branch="master"
-    git clone --recursive https://gitea.logerais.com/xavier/config-tmux.git ~/.tmux
+config_dir=${XDG_CONFIG_HOME:-$HOME/.config}/tmux
-    bash ~/.tmux/create-links.bash
+
+if [[ ! -d "${config_dir}" ]]; then
+  git clone "${git_repo}" --branch "${git_branch}" "${config_dir}"
+else
+  cd "${config_dir}" && git pull
 fi

fonts.bash

@@ -1,6 +1,6 @@
 # FONTS
 
-fontdir="$HOME/.local/share/fonts"
+fontdir="${HOME}/.local/share/fonts"
 
 declare -a fonts
 fonts+=("Inconsolata")
@@ -12,10 +12,9 @@ fonts+=("DejaVuSansMono")
 test -d "${fontdir}" || mkdir -p "${fontdir}"
 
 # Download fonts
-for font in "${fonts[@]}"
+for font in "${fonts[@]}"; do
-do
+  wget -q -O "/tmp/${font}.zip" "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${font}.zip" && cd "${fontdir}" && unzip -u "/tmp/${font}.zip" && rm "/tmp/${font}.zip"
-  wget -q -O /tmp/${font}.zip "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${font}.zip" && cd ${fontdir} && unzip -u /tmp/${font}.zip && rm /tmp/${font}.zip
 done
 
 # Refresh cache
-fc-cache --force --verbose ${fontdir}
+fc-cache --force --verbose "${fontdir}"

os.bash

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+BASEDIR=$(cd "$(dirname "$0")" && pwd)
+
+for file in "${BASEDIR}"/os.d/*.bash; do
+  bash "${file}"
+done

os.d/ubuntu.bash

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-if ( grep -q Ubuntu <(lsb_release -i) )
+if (grep -q Ubuntu <(lsb_release -i)); then
-then
     sudo apt update
     sudo apt upgrade -y
 

tools.bash

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-for file in tools.d/*.bash
+BASEDIR=$(cd "$(dirname "$0")" && pwd)
-do
+
-  bash $file
+for file in "${BASEDIR}"/tools.d/*.bash; do
+  bash "${file}"
 done

tools.d/asdf.bash

@@ -19,8 +19,7 @@ tools+=(vault)
 tools+=(terraform terragrunt)
 tools+=(ripgrep exa bat dust delta)
 
-for tool in "${tools[@]}"
+for tool in "${tools[@]}"; do
-do
 	echo
 	echo "-- Installing ${tool}"
 	asdf plugin add ${tool}
@@ -28,6 +27,9 @@ do
 	asdf global ${tool} latest
 done
 
+# Configure asdf/direnv integration
+asdf direnv setup --shell bash --version latest
+
 # Install extra plugins and tools
 
 # lsd

tools.d/nix.bash

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Install nix (with the nix-installer tool from DeterminateSystems)
+# (See https://github.com/DeterminateSystems/nix-installer)
+
+if ( ! command -v nix &> /dev/null ); then
+  curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+fi
+
+# Install home-manager
+if (command -v nix-channel && command -v nix-shell &> /dev/null ); then
+  nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
+  nix-channel --update
+  nix-shell '<home-manager>' -A install
+fi