bootstrap.bash

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

config.bash

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

config.d/nvim.bash

@@ -1,17 +1,10 @@
 #!/bin/bash
 
-# Configuration for neovim
+# Configuration NVIM
 
-# git_repo="https://github.com/AstroNvim/template"
+if [[ ! -d ~/.config/nvim ]]
-# git_branch="main"
+then
-
+    git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
-git_repo="https://gitea.cloud.logerais.com/xavier/config-astronvim.git"
+    nvim +PackerSync
-git_branch="astronvim_v4"
-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,13 +1,9 @@
 #!/bin/bash
 
-# Configuration for tmux
+# Configuration TMUX
 
-git_repo="https://gitea.cloud.logerais.com/xavier/config-tmux.git"
+if [[ ! -d ~/.tmux ]]
-git_branch="master"
+then
-config_dir=${XDG_CONFIG_HOME:-$HOME/.config}/tmux
+    git clone --recursive https://gitea.logerais.com/xavier/config-tmux.git ~/.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")

os.bash

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

tools.bash

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

tools.d/nix.bash

@@ -1,15 +0,0 @@
-#!/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