refactor 🎨(core): configuration multi platform (#815)

luismayta · luismayta · commit 2b06828dba97 · 2025-05-11T17:32:47.000-03:00
Signed-off-by: Luis Mayta &lt;luis@hadenlabs.com&gt;
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 
   -->
 
-[![Latest Release](https://img.shields.io/github/release/luismayta/dotfiles)](https://github.com/luismayta/dotfiles/releases) [![Lint](https://img.shields.io/github/workflow/status/luismayta/dotfiles/lint-code)](https://github.com/luismayta/dotfiles/actions?workflow=lint-code) [![CI](https://img.shields.io/github/workflow/status/luismayta/dotfiles/ci)](https://github.com/luismayta/dotfiles/actions?workflow=ci) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow)](https://conventionalcommits.org) [![KeepAChangelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog%20v1.0.0-orange)](https://keepachangelog.com)
+[![Latest Release](https://img.shields.io/github/release/luismayta/dotfiles)](https://github.com/luismayta/dotfiles/releases) [![Version](https://img.shields.io/badge/version-0.0.0-df5e88)](https://img.shields.io/github/release/luismayta/dotfiles) [![Lint](https://img.shields.io/github/workflow/status/luismayta/dotfiles/lint-code)](https://github.com/luismayta/dotfiles/actions?workflow=lint-code) [![CI](https://img.shields.io/github/workflow/status/luismayta/dotfiles/ci)](https://github.com/luismayta/dotfiles/actions?workflow=ci) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow)](https://conventionalcommits.org) [![KeepAChangelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog%20v1.0.0-orange)](https://keepachangelog.com)
 
 # dotfiles
 
diff --git a/archlinux.sh b/archlinux.sh
@@ -20,7 +20,7 @@ packages=(
     i3blocks-gaps-git
     jack2               # audio
     jq
-    lxappearance        # gtk themeing
+    lxappearance        # gtk theming
     neovim
     pandoc
     pavucontrol         # audio control
@@ -44,11 +44,11 @@ packages=(
     ttf-monaco
     xclip
     zathura             # pdf viewer
-    zathura-pdf-poppler # pdf pluggin
+    zathura-pdf-poppler # pdf plugin
     ksh
     zsh
 )
 
 for package in "${packages[@]}"; do
     yay -S --noconfirm "${package}"
-done
+done
diff --git a/bin/dotfiles::upgrade b/bin/dotfiles::upgrade
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 message_info "Upgrade for dotfiles"
 cd "${DOTFILES_DIR}" && git pull origin main && cd - || return
@@ -17,4 +17,4 @@ cp -rf "${DOTFILES_DIR}/conf/shell/bashrc" "${HOME}/.bashrc"
 
 message_info "Start Sync config"
 rsync -avzh --progress "${DOTFILES_DIR}/config/" "${HOME}/.config/"
-message_success "Finish Sync config"
+message_success "Finish Sync config"
diff --git a/bin/message_error b/bin/message_error
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 CLEAR='\033[0m'
 RED="\033[0;31m"
diff --git a/bin/message_info b/bin/message_info
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 CLEAR='\033[0m'
 LIGHT_GREEN='\033[1;32m'
diff --git a/bin/message_success b/bin/message_success
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 CLEAR='\033[0m'
 GREEN="\033[0;32m"
diff --git a/bin/message_warning b/bin/message_warning
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 CLEAR='\033[0m'
 YELLOW="\033[0;33m"
 
diff --git a/bin/path_append b/bin/path_append
@@ -1,3 +1,3 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 path::append "${1}"
diff --git a/bin/path_prepend b/bin/path_prepend
@@ -1,3 +1,3 @@
-#!/usr/bin/env zsh
+#!/usr/bin/env ksh
 
 path::prepend "${1}"
diff --git a/provision/generators/README.yaml b/provision/generators/README.yaml
@@ -24,6 +24,9 @@ badges:
   - name: Latest Release
     image: https://img.shields.io/github/release/luismayta/dotfiles
     url: https://github.com/luismayta/dotfiles/releases
+  - name: Version
+    image: https://img.shields.io/badge/version-0.0.0-df5e88
+    url: https://img.shields.io/github/release/luismayta/dotfiles
   - name: Lint
     image: https://img.shields.io/github/workflow/status/luismayta/dotfiles/lint-code
     url: https://github.com/luismayta/dotfiles/actions?workflow=lint-code
diff --git a/provision/script/bootstrap.sh b/provision/script/bootstrap.sh
@@ -5,8 +5,6 @@ export HOME=~
 export PROJECT_NAME=dotfiles
 export PYENV_NAME="${PROJECT_NAME}"
 
-export GRIP_PORT=6430
-
 # Vars Dir application
 export ROOT_DIR
 ROOT_DIR=$(pwd)
@@ -16,25 +14,49 @@ export SCRIPT_DIR="${PATH_REPO}/provision/script"
 export CONF_DIR="${PATH_REPO}/conf"
 export ZSH_DIR="${PATH_REPO}/zsh"
 export TOOLS_DIR="${PATH_REPO}/tools"
-
-export GIT_URI='https://github.com/luismayta/dotfiles.git'
-export GIT_BRANCH='main'
-export DEBUG_MODE='0'
 export PATH_BACKUP="${HOME}/backup"
 
 export PATH_FONTS_REPO="${PATH_REPO}/provision/fonts"
 
-export FILE_SETTINGS_OSX="${SCRIPT_DIR}/settings/osx.sh"
-export FILE_SETTINGS_LINUX="${SCRIPT_DIR}/settings/linux.sh"
-
-export URL_WAKATIME_BASH="https://raw.githubusercontent.com/API-PLUGIN-RESSOURCES/bash-wakatime/master/bash-wakatime.sh"
+export FILE_CONFIG_BASE="${SCRIPT_DIR}/config/base.sh"
+export FILE_CONFIG_OSX="${SCRIPT_DIR}/config/osx.sh"
+export FILE_CONFIG_LINUX="${SCRIPT_DIR}/config/linux.sh"
 
 export LOCAL_PATH_BIN="${HOME}/.local/bin"
 
 mkdir -p "${LOCAL_PATH_BIN}"
 
+# shellcheck source=/dev/null
+[ -r "${FILE_CONFIG_BASE}" ] && source "${FILE_CONFIG_BASE}"
+
+function detect::os {
+    uname
+}
+
+function config::factory {
+    local os_name
+    os_name=$(detect::os)
+    case "$os_name" in
+        "Darwin")
+            # shellcheck source=/dev/null
+            [ -r "${FILE_CONFIG_OSX}" ] && source "${FILE_CONFIG_OSX}"
+            ;;
+        "Linux")
+            # shellcheck source=/dev/null
+            [ -r "${FILE_CONFIG_LINUX}" ] && source "${FILE_CONFIG_LINUX}"
+            setup::linux
+            ;;
+        *)
+            echo "Unsupported OS: $os_name"
+            exit 1
+            ;;
+    esac
+}
+
+config::factory
+
 for file in "${SCRIPT_DIR}/"{config,messages,repo,functions}.sh; do
     # shellcheck source=/dev/null
     [ -e "${file}" ] && source "${file}"
 done
-unset file
+unset file
diff --git a/provision/script/config.sh b/provision/script/config.sh
@@ -7,4 +7,4 @@ if [[ $(uname) == 'Darwin' ]]; then
 else
     # shellcheck source=/dev/null
 	[ -r "${FILE_SETTINGS_LINUX}" ] && source "${FILE_SETTINGS_LINUX}"
-fi
+fi
diff --git a/provision/script/config/base.sh b/provision/script/config/base.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# -*- coding: utf-8 -*-
+
+export GIT_URI='https://github.com/luismayta/dotfiles.git'
+export GIT_BRANCH='main'
+
+export FONTS_DIR="${HOME}/.fonts"
+
+export APPS=(
+    "git-extras"
+    "fonts"
+    "antidote"
+)
+
+export URL_WAKATIME_BASH="https://raw.githubusercontent.com/API-PLUGIN-RESSOURCES/bash-wakatime/master/bash-wakatime.sh"
+
+export GRIP_PORT=6430
+
+export DEBUG_MODE='0'
diff --git a/provision/script/config/linux.sh b/provision/script/config/linux.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# -*- coding: utf-8 -*-
+
+export FONTS_DIR="${HOME}/.fonts"
+mkdir -p "${FONTS_DIR}"
diff --git a/provision/script/config/osx.sh b/provision/script/config/osx.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# -*- coding: utf-8 -*-
+
+export FONTS_DIR="${HOME}/Library/Fonts"
diff --git a/provision/script/messages.sh b/provision/script/messages.sh
@@ -6,7 +6,8 @@ function msg() {
 }
 
 function success() {
-    if [[ "$ret" -eq '0' ]]; then
+    # shellcheck disable=SC2154
+    if [[ "${ret}" -eq '0' ]]; then
         msg "\e[32m[✔]\e[0m ${1}${2}"
     fi
 }
@@ -20,4 +21,4 @@ function debug() {
     if [ "$DEBUG_MODE" -eq '1' ] && [ "$ret" -gt '1' ]; then
       msg "An error occurred in function \"${FUNCNAME[$i+1]}\" on line ${BASH_LINENO[$i+1]}, we're sorry for that."
     fi
-}
+}
diff --git a/provision/script/repo.sh b/provision/script/repo.sh
@@ -15,12 +15,13 @@ function upgrade_repo() {
 }
 
 function clone_repo() {
-    if [ ! -e "$PATH_REPO/.git" ]; then
-        git clone --recursive -b "$GIT_BRANCH" "$GIT_URI" "$PATH_REPO"
+    if [ ! -e "${PATH_REPO}/.git" ]; then
+        git clone --recursive -b "${GIT_BRANCH}" "${GIT_URI}" "${PATH_REPO}"
+        # shellcheck disable=SC2034
         ret="$?"
         success "$1"
         debug
     else
         upgrade_repo "$APP_NAME" "Successfully updated ${APP_NAME}"
     fi
-}
+}
diff --git a/provision/script/settings/linux.sh b/provision/script/settings/linux.sh
diff --git a/provision/script/settings/osx.sh b/provision/script/settings/osx.sh
diff --git a/provision/script/wait-for-it.sh b/provision/script/wait-for-it.sh
diff --git a/tools/antidote/install.sh b/tools/antidote/install.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env zsh`
	`1`	`+#!/usr/bin/env ksh`
`2`	`2`
`3`	`3`	`CLEAR='\033[0m'`
`4`	`4`	`RED="\033[0;31m"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-#!/usr/bin/env zsh`
	`1`	`+#!/usr/bin/env ksh`
`2`	`2`
`3`	`3`	`path::append "${1}"`