From 72b8e700ec55769d0227514553a62c81eac3eae1 Mon Sep 17 00:00:00 2001
From: tombdf <thomas@hexasec.io>
Date: Fri, 20 Dec 2024 02:57:31 +0100
Subject: [PATCH] Update .config/chezmoi/chezmoi.toml Update
 .config/fish/config.fish Update scripts/shells.sh Update utils/helpers.sh
 Update utils/packages

---
 private_dot_config/chezmoi/chezmoi.toml.tmpl |  1 +
 private_dot_config/fish/config.fish          |  2 ++
 scripts/shells.sh                            |  4 ++++
 utils/helpers.sh                             | 15 +++++----------
 utils/packages                               |  1 +
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/private_dot_config/chezmoi/chezmoi.toml.tmpl b/private_dot_config/chezmoi/chezmoi.toml.tmpl
index 5d1a5bd..ae4daa5 100644
--- a/private_dot_config/chezmoi/chezmoi.toml.tmpl
+++ b/private_dot_config/chezmoi/chezmoi.toml.tmpl
@@ -32,6 +32,7 @@ encryption = "age"
 [git]
     autoCommit = true
     autoPush = true
+    commitMessageTemplatePath = "~/.gitmessage"
 
 [git.commit]
     gpgsign = true
diff --git a/private_dot_config/fish/config.fish b/private_dot_config/fish/config.fish
index 309ccdb..04fca6c 100644
--- a/private_dot_config/fish/config.fish
+++ b/private_dot_config/fish/config.fish
@@ -28,6 +28,8 @@ if not set -q fish_inclusion
   install_fisher_plugin ~/.config/fish/conf.d/autopair.fish jorgebucaran/autopair.fish
   install_fisher_plugin ~/.config/fish/conf.d/sponge.fish meaningful-ooo/sponge
   install_fisher_plugin ~/.config/fish/conf.d/abbr_tips.fish gazorby/fish-abbreviation-tips
+  install_fisher_plugin ~/.config/fish/conf.d/venv.fish nakulj/auto-venv
+  install_fisher_plugin ~/.config/fish/conf.d/color-manual.fish goranmoomin/fish-color-manual
 
   theme_gruvbox dark soft
 
diff --git a/scripts/shells.sh b/scripts/shells.sh
index aa656cc..4f7cc73 100644
--- a/scripts/shells.sh
+++ b/scripts/shells.sh
@@ -65,6 +65,10 @@ check_installation "sudo pacman -S --noconfirm --needed" "tealdeer"
 echo -e "${BLUE}Installing Delta...${DEFAULT}"
 check_installation "yay -S --noconfirm --needed" "git-delta"
 
+# SSHS - A modern terminal user interface for ssh
+echo -e "${BLUE}Installing SSHS...${DEFAULT}"
+check_installation "yay -S --noconfirm --needed" "sshs"
+
 # Changing the default shell to Fish
 echo -e "${GREEN}Setting Fish as default shell...${DEFAULT}"
 chsh -s $(which fish)
diff --git a/utils/helpers.sh b/utils/helpers.sh
index bbbe9de..40b49ad 100644
--- a/utils/helpers.sh
+++ b/utils/helpers.sh
@@ -50,16 +50,6 @@ function check_installation() {
     return 0
 }
 
-# Configuration backup function
-function backup_config() {
-    local path=$1
-    if [ -e "$path" ]; then  # Vérifie si le fichier ou le répertoire existe
-        local backup_path="${path}.backup.$(date +%Y%m%d_%H%M%S)"
-        echo -e "${BLUE}Backing up $path to $backup_path${DEFAULT}" | tee -a "$LOG"
-        mv "$path" "$backup_path"
-    fi
-}
-
 # Final system configuration
 function setup_final() {
     echo -e "${BLUE}Performing final system configuration...${DEFAULT}" | tee -a "$LOG"
@@ -67,6 +57,11 @@ function setup_final() {
     # Enable systemd services
     systemctl --user enable --now pipewire.service
     systemctl --user enable --now pipewire-pulse.service
+
+    # Import GPG keys
+    gpg --import $HOME/.gpg/public-keys.asc
+    gpg --import $HOME/.gpg/private-keys.asc
+    gpg --update-trustdb
     
     # Setting up Vim plugins
     echo -e "${GREEN}Installing Vim plugins...${DEFAULT}"
diff --git a/utils/packages b/utils/packages
index faaecde..c2c1042 100644
--- a/utils/packages
+++ b/utils/packages
@@ -64,3 +64,4 @@ sd
 topgrade
 tealdeer
 git-delta
+sshs