Merge pull request 'Merge dev into main' (#3) from dev into main

Reviewed-on: #3

.chezmoidata/hosts.yaml

@@ -51,7 +51,6 @@ hosts:
         tools:
           - sops
           - age
-          - cargo:rage
         configs: {}
   # Termux (application de terminal pour android)
   termux-debian:

private_dot_config/ghostty/config

@@ -46,6 +46,19 @@ shell-integration-features = sudo
 gtk-titlebar-hide-when-maximized = true
 maximize
 
+# Ouvre les nouvelles fenêtres avec un répertoire de travail dans $HOME
+window-inherit-working-directory = false
+# Ouvre les nouveaux onglets avec un répertoire de travail dans $HOME
+tab-inherit-working-directory = false
+# mais les nouveaux splits dans le répertoire courant
+split-inherit-working-directory = true
+
+# Permet d'ouvrir un nouvel onglet en conservant le répertoire de travail courant
+# keybind = shift+alt+t=new_tab:current
+keybind = ctrl+b>n=new_window
+keybind = ctrl+b>t=new_tab
+keybind = ctrl+b>z=toggle_split_zoom
+keybind = ctrl+b>`=toggle_quick_terminal
 # Systemd and D-Bus Integration
 quit-after-last-window-closed = true
 quit-after-last-window-closed-delay = 5m

private_dot_config/git/config

@@ -1,47 +0,0 @@
-[core]
-	excludesfile = ~/.config/git/ignore
-	attributesfile = ~/.config/git/attributes
-	pager = delta
-
-[user]
-	name = Xavier Logerais
-	email = xavier@logerais.com
-
-[credential]
-	helper = cache
-
-[credential "https://gitea.logerais.com"]
-	helper = cache
-	helper = !tea login helper
-
-[credential "https://gitea.cloud.logerais.com"]
-	helper = cache
-	helper = !tea login helper
-
-[init]
-	defaultBranch = main
-
-[rerere]
-	enabled = 1
-
-[merge]
-	conflictstyle = diff3
-
-[page]
-	diff = delta
-	show = delta
-	log = delta
-	blame = delta
-	reflog = delta
-
-[delta]
-	navigate = true
-	side-by-side = true
-	dark = true
-	syntax-theme = Coldark-Dark
-
-[interactive]
-	diffFilter = delta --color-only
-
-[alias]
-  tree = !git ls-files | tree --fromfile -C

private_dot_config/git/config.tmpl

@@ -0,0 +1,70 @@
+{{- $hostname := output "hostname" | trim -}}
+{{- $username := .chezmoi.username -}}
+{{- $currentHost := index .hosts $hostname -}}
+{{- $currentUser := "" -}}
+{{- if $currentHost -}}
+  {{- if hasKey $currentHost.users $username -}}
+    {{- $currentUser = index $currentHost.users $username -}}
+  {{- end -}}
+{{- end -}}
+{{- $gitConfig := dict -}}
+{{- if and $currentUser (hasKey $currentUser "configs") -}}
+  {{- if hasKey $currentUser.configs "git" -}}
+    {{- $gitConfig = $currentUser.configs.git -}}
+  {{- end -}}
+{{- end -}}
+{{- $gitName := "Xavier Logerais" -}}
+{{- $gitEmail := "xavier@logerais.com" -}}
+{{- if hasKey $gitConfig "name" -}}
+  {{- $gitName = $gitConfig.name -}}
+{{- end -}}
+{{- if hasKey $gitConfig "email" -}}
+  {{- $gitEmail = $gitConfig.email -}}
+{{- end -}}
+[core]
+	excludesfile = ~/.config/git/ignore
+	attributesfile = ~/.config/git/attributes
+	pager = delta
+
+[user]
+	name = {{ $gitName }}
+	email = {{ $gitEmail }}
+
+[credential]
+	helper = cache
+
+[credential "https://gitea.logerais.com"]
+	helper = cache
+	helper = !tea login helper
+
+[credential "https://gitea.cloud.logerais.com"]
+	helper = cache
+	helper = !tea login helper
+
+[init]
+	defaultBranch = main
+
+[rerere]
+	enabled = 1
+
+[merge]
+	conflictstyle = diff3
+
+[page]
+	diff = delta
+	show = delta
+	log = delta
+	blame = delta
+	reflog = delta
+
+[delta]
+	navigate = true
+	side-by-side = true
+	dark = true
+	syntax-theme = Coldark-Dark
+
+[interactive]
+	diffFilter = delta --color-only
+
+[alias]
+  tree = !git ls-files | tree --fromfile -C

private_dot_config/starship-zsh.toml

@@ -1,14 +1,15 @@
 "$schema" = 'https://starship.rs/config-schema.json'
 
 format = """
+[ ](fg:#769ff0)\
 $directory\
-[](fg:#769ff0 bg:#394260)\
+[](bg:#394260 fg:#769ff0)\
 $git_branch\
 $git_commit\
 $git_status\
 $git_state\
-$direnv\
 $mise\
+$direnv\
 [](fg:#394260 bg:#212736)\
 $rust\
 $golang\
@@ -22,18 +23,7 @@ $terraform\
 """
 
 right_format = """
-[](fg:#a3aed2)\
+[](fg:#a3aed2)$time[](fg:#a3aed2)\
-$shell\
-$username\
-[](fg:#394260 bg:#a3aed2)\
-$os\
-[](bg:#394260 fg:#a3aed2)\
-$container\
-$hostname\
-[ ](fg:#394260)\
-[](fg:#a3aed2)\
-$time\
-[](fg:#a3aed2)\
 """
 
 [hostname]
@@ -52,7 +42,7 @@ format = '[ $symbol $name ]($style)'
 [os]
 disabled = false
 style = "bg:#394260 fg:#a3aed2"
-format = "[ $symbol ]($style)"
+format = "[ $symbol $name ]($style)"
 
 [username]
 show_always = true
@@ -62,65 +52,67 @@ format = '[  $user ]($style)'
 
 [shell]
 disabled = false
-bash_indicator = ' '
+bash_indicator = ' bash'
-zsh_indicator = ' '
+zsh_indicator = ' zsh'
-fish_indicator = '󰈺 '
+fish_indicator = '󰈺 fish'
-powershell_indicator = '_'
+powershell_indicator = '_ Powershell'
 unknown_indicator = 'unknown shell'
+format = '[ $indicator ]($style)'
 style = "bg:#a3aed2 fg:#212736"
-format = '[ $indicator[](fg:#394260 bg:#a3aed2)]($style)'
 
 [sudo]
 disabled = false
 
 [directory]
 disabled = false
-style = "fg:#e3e5e5 bg:#769ff0"
-format = "[   $path ]($style)"
 truncation_length = 5
 truncation_symbol = "…/"
 truncate_to_repo = false
+style = "fg:#e3e5e5 bg:#769ff0"
+format = "[   $path ]($style)"
 
 [git_branch]
 disabled = false
 symbol = ""
-style = "fg:#769ff0 bg:#394260"
+style = "fg:#769ff0 bg:#394260 bold"
 format = '[ $symbol $branch ]($style)'
 
 [git_commit]
 disabled = false
-style = "fg:#769ff0 bg:#394260"
+only_detached = true
 tag_disabled = false
 tag_symbol = '  '
-only_detached = true
+style = "fg:#769ff0 bg:#394260"
 format = '[ $hash $tag ]($style)'
 
 [git_status]
 disabled = false
-style = "fg:#769ff0 bg:#394260"
 ahead = '⇡${count}'
 behind = '⇣${count}'
 diverged = '[⇕⇡${ahead_count}⇣${behind_count}](fg:#FFA500 bg:#394260)'
 up_to_date = ''
-modified = '[$count 󰷉 ](fg:#FFFF00 bg:#394260)'
+modified = '[$count󰷉 ](fg:#FFFF00 bg:#394260)'
-staged = '[$count  ](fg:#00D000 bg:#394260)'
+staged = '[$count ](fg:#00D000 bg:#394260)'
-deleted = '[$count  ](fg:#FF0000 bg:#394260)'
+deleted = '[$count ](fg:#FF0000 bg:#394260)'
-renamed = '[$count 󱀱 ](fg:#87CEEB bg:#394260)'
+renamed = '[$count󱀱 ](fg:#87CEEB bg:#394260)'
-untracked = '[$count 󱀶 ](fg:#CCCCCC bg:#394260)'
+untracked = '[$count󱀶 ](fg:#CCCCCC bg:#394260)'
-conflicted = '[$count 󱪘 ](fg:#FF0000 bg:#394260)'
+conflicted = '[$count󱪘 ](fg:#FF0000 bg:#394260)'
-stashed = '[$count ](fg:#FFA500 bg:#394260)'                          # 󱁺 
+stashed = '[$count ](fg:#FFA500 bg:#394260)'                          # 󱁺 
+style = "fg:#769ff0 bg:#394260"
 format = '[$all_status$ahead_behind ]($style)'
 
 [git_state]
 disabled = false
 style = "fg:#769ff0 bg:#394260"
-format = ' [$state( $progress_current/$progress_total)]($style) '
+format = '[ $state ($progress_current/$progress_total)]($style)'
 
 [direnv]
 disabled = false
 
 [mise]
 disabled = true
+style = "bg:#212736 fg:white"
+format = '[$symbol$health]($style)'
 
 [nodejs]
 symbol = ""
@@ -161,7 +153,7 @@ format = '[[](fg:#212736 bg:#ffffff) $symbol $context [](fg:#ffffff bg:#21
 
 [kubernetes]
 disabled = false
-symbol = " "
+symbol = ""
 style = "bg:#316ce6 fg:#a3aed2"
 format = '[[](fg:#212736 bg:#316ce6) $symbol $context (\($namespace\))[](fg:#316ce6 bg:#212736)]($style)'
 
@@ -173,16 +165,14 @@ format = '[[](fg:#212736 bg:#1b1028) [$symbol](fg:#7b42bc bg:#1b1028) $worksp
 
 [time]
 disabled = false
+time_format = '%T  󰃶 %A %e %B %Y'
 style = "fg:#212736 bg:#a3aed2"
 format = '[  $time ]($style)'
-time_format = '%T  󰃶 %A %e %B %Y'
-# format = '[[   $time ](fg:#a0a9cb bg:#1d2230)]($style)'
 
 [character]
-# success_symbol = '[[](fg:#ddffdd)  [](fg:#ddffdd)](bg:#ddffdd fg:#00af5f) '
+success_symbol = '[[](fg:#ddffdd)  [](fg:#ddffdd)](bg:#ddffdd fg:#00af5f) '
-# error_symbol = '[[](fg:#ffddff) 󰚽 [](fg:#ffddff)](bg:#ffddff fg:#f44336) '
+error_symbol = '[[](fg:#ffddff) 󰚽 [](fg:#ffddff)](bg:#ffddff fg:#f44336) '
-success_symbol = '[  [](fg:#ddffdd)](bg:#ddffdd fg:#00af5f) '
+vimcmd_symbol = '[[](fg:#007f00)  ViM mode [](fg:#007f00)](bg:#007f00) '
-error_symbol = '[ 󰚽 [](fg:#ffddff)](bg:#ffddff fg:#f44336) '
 
 [os.symbols]
 Windows = "󰍲"

private_dot_config/starship.toml

@@ -25,12 +25,10 @@ $docker_context\
 $kubernetes\
 $terraform\
 [](fg:#212736)\
-\n$time\
+\n$character"""
-$character"""
 
 right_format = """
-[](fg:#212736 bg:#1d2230)\
+[](fg:#a3aed2)$time[](fg:#a3aed2)\
-\n$time\
 """
 
 [hostname]
@@ -165,13 +163,12 @@ format = '[[](fg:#212736 bg:#1b1028) [$symbol](fg:#7b42bc bg:#1b1028) $worksp
 [time]
 disabled = false
 time_format = "%R" # Hour:Minute Format
-style = "fg:#a3aed2"
+style = "fg:#212736 bg:#a3aed2"
 format = '[   $time ]($style)'
-# format = '[[   $time ](fg:#a0a9cb bg:#1d2230)]($style)'
 
 [character]
-success_symbol = '[ ❯](bold green) '
+success_symbol = '[[](fg:#ddffdd)  [](fg:#ddffdd)](bg:#ddffdd fg:#00af5f) '
-error_symbol = '[󰚽 ❯](bold red) '
+error_symbol = '[[](fg:#ffddff) 󰚽 [](fg:#ffddff)](bg:#ffddff fg:#f44336) '
 
 [os.symbols]
 Windows = "󰍲"

private_dot_local/bin/executable_update

@@ -0,0 +1,215 @@
+#!/usr/bin/env bash
+
+set -u
+
+FAILED=0
+
+STATUS_APT="not_detected"
+STATUS_BREW="not_detected"
+STATUS_CHEZMOI="not_detected"
+STATUS_MISE="not_detected"
+STATUS_NEOVIM="not_detected"
+
+# Couleurs
+BLUE='\e[00;34;49m'
+GRAY='\e[02;37;49m'
+RESET='\e[39;49;00m'
+
+# Affiche un message stylisé sur la sortie standard
+echo_bold() {
+  printf '\e[1m%s\e[0m\n' "$*"
+}
+
+# Affiche un message informatif stylisé sur la sortie d'erreur
+echo_info() {
+  printf >&2 "\n${BLUE}󰋼 %s${RESET}\n\n" "$*"
+}
+
+echo_success() {
+  printf >&2 "\e[00;01;32;49m %s${RESET}\n" "$*"
+}
+
+echo_failed() {
+  printf >&2 "\e[00;01;31;49m✖ %s${RESET}\n" "$*"
+}
+
+echo_skipped() {
+  printf >&2 "${GRAY}󰜺 %s${RESET}\n" "$*"
+}
+
+run() {
+  local section="$1"
+  local name="$2"
+  shift 2
+
+  local start=$SECONDS
+
+  printf '⏳ [%s] %s...' "$section" "$name"
+
+  if "$@"; then
+    printf '\r\033[K'
+    echo_success "[$section] $name ($((SECONDS - start))s)"
+  else
+    printf '\r\033[K'
+    echo_failed "[$section] $name ($((SECONDS - start))s)"
+
+    # Marque la section comme échouée
+    eval "STATUS_${section^^}=failed"
+
+    FAILED=1
+    return 1
+  fi
+}
+
+echo
+echo_bold "🚀 Mise à jour quotidienne"
+echo
+
+# ----------------------------------------------------------------------
+# Debian / Ubuntu
+# ----------------------------------------------------------------------
+
+if [[ -f /etc/os-release ]]; then
+  . /etc/os-release
+
+  if [[ "$ID" == "debian" || "$ID" == "ubuntu" ]]; then
+    STATUS_APT="success"
+
+    if ((EUID == 0)); then
+      APT=(apt)
+    else
+      APT=(sudo apt)
+    fi
+
+    echo_info "APT"
+
+    run APT "Mise à jour des paquets" \
+      "${APT[@]}" update || true
+
+    run APT "Mise à niveau des paquets" \
+      "${APT[@]}" upgrade -y || true
+
+    run APT "Suppression des paquets inutiles" \
+      "${APT[@]}" autoremove -y || true
+
+    run APT "Nettoyage du cache" \
+      "${APT[@]}" autoclean || true
+  fi
+fi
+
+# ----------------------------------------------------------------------
+# Homebrew
+# ----------------------------------------------------------------------
+
+if command -v brew >/dev/null 2>&1; then
+  STATUS_BREW="success"
+
+  echo_info "Brew"
+
+  run BREW "Mise à jour" \
+    brew update || true
+
+  run BREW "Mise à niveau des paquets" \
+    brew upgrade || true
+fi
+
+# ----------------------------------------------------------------------
+# chezmoi
+# ----------------------------------------------------------------------
+
+if command -v chezmoi >/dev/null 2>&1; then
+  STATUS_CHEZMOI="success"
+
+  echo_info "chezmoi"
+
+  run CHEZMOI "Récupération de la configuration" \
+    chezmoi git pull || true
+
+  run CHEZMOI "Application de la configuration" \
+    chezmoi apply -v || true
+fi
+
+# ----------------------------------------------------------------------
+# mise
+# ----------------------------------------------------------------------
+
+if command -v mise >/dev/null 2>&1; then
+  STATUS_MISE="success"
+
+  echo_info "mise"
+
+  run MISE "Mise à jour de mise" \
+    mise self-update -y || true
+
+  run MISE "Mise à jour des outils" \
+    mise up || true
+fi
+
+# ----------------------------------------------------------------------
+# Neovim / AstroNvim
+# ----------------------------------------------------------------------
+
+if command -v nvim >/dev/null 2>&1; then
+  STATUS_NEOVIM="success"
+
+  echo_info "Neovim / AstroNvim"
+
+  run NEOVIM "Mise à jour d'AstroNvim" \
+    nvim --headless \
+    -c 'autocmd User AstroUpdateCompleted quitall' \
+    -c 'AstroUpdate' \
+    2>&1 || true
+fi
+
+# ----------------------------------------------------------------------
+# Récapitulatif
+# ----------------------------------------------------------------------
+
+echo
+echo_info "Récapitulatif"
+echo
+
+echo -n "  ► "
+case "$STATUS_APT" in
+success) echo_success "APT : réussi" ;;
+failed) echo_failed "APT : échoué" ;;
+not_detected) echo_skipped "APT : non détecté" ;;
+esac
+
+echo -n "  ► "
+case "$STATUS_BREW" in
+success) echo_success "Brew : réussi" ;;
+failed) echo_failed "Brew : échoué" ;;
+not_detected) echo_skipped "Brew : non détecté" ;;
+esac
+
+echo -n "  ► "
+case "$STATUS_CHEZMOI" in
+success) echo_success "chezmoi : réussi" ;;
+failed) echo_failed "chezmoi : échoué" ;;
+not_detected) echo_skipped "chezmoi : non détecté" ;;
+esac
+
+echo -n "  ► "
+case "$STATUS_MISE" in
+success) echo_success "mise : réussi" ;;
+failed) echo_failed "mise : échoué" ;;
+not_detected) echo_skipped "mise : non détecté" ;;
+esac
+
+echo -n "  ► "
+case "$STATUS_NEOVIM" in
+success) echo_success "Neovim : réussi" ;;
+failed) echo_failed "Neovim : échoué" ;;
+not_detected) echo_skipped "Neovim : non détecté" ;;
+esac
+
+echo
+
+if ((FAILED)); then
+  echo_failed "Mise à jour terminée avec des erreurs"
+  exit 1
+else
+  echo_success "Toutes les mises à jour sont terminées"
+  exit 0
+fi