From 76b72f0083abfc42b1e3131e48c5d0a233c1a8e9 Mon Sep 17 00:00:00 2001
From: araison <adrien.raison@xlim.fr>
Date: Sun, 21 Jan 2024 21:43:37 +0100
Subject: [PATCH] Fixing bug

---
 setup/programs/others/oh-my-zsh.sh            |  1 +
 .../package_manager/apt/others/firefox.sh     |  2 +-
 .../programs/package_manager/apt/others/i3.sh |  8 ++---
 .../package_manager/apt/others/thunderbird.sh |  2 +-
 .../programs/package_manager/apt/packages.sh  | 18 +++++++---
 .../programs/package_manager/brew/packages.sh | 36 +++++++++++++------
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/setup/programs/others/oh-my-zsh.sh b/setup/programs/others/oh-my-zsh.sh
index a4759a8..7fb4852 100644
--- a/setup/programs/others/oh-my-zsh.sh
+++ b/setup/programs/others/oh-my-zsh.sh
@@ -1 +1,2 @@
+chsh -s $(which zsh)
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
diff --git a/setup/programs/package_manager/apt/others/firefox.sh b/setup/programs/package_manager/apt/others/firefox.sh
index a5cafe1..ac088f6 100644
--- a/setup/programs/package_manager/apt/others/firefox.sh
+++ b/setup/programs/package_manager/apt/others/firefox.sh
@@ -1,3 +1,3 @@
 sudo add-apt-repository ppa:mozillateam/ppa
 sudo apt update
-sudo apt install firefox
+sudo apt install -y firefox
diff --git a/setup/programs/package_manager/apt/others/i3.sh b/setup/programs/package_manager/apt/others/i3.sh
index a8da3ed..dc19ee8 100644
--- a/setup/programs/package_manager/apt/others/i3.sh
+++ b/setup/programs/package_manager/apt/others/i3.sh
@@ -1,5 +1,5 @@
 /usr/lib/apt/apt-helper download-file https://debian.sur5r.net/i3/pool/main/s/sur5r-keyring/sur5r-keyring_2023.02.18_all.deb keyring.deb SHA256:a511ac5f10cd811f8a4ca44d665f2fa1add7a9f09bef238cdfad8461f5239cc4
-$ sudo apt install ./keyring.deb
-$ echo "deb http://debian.sur5r.net/i3/ $(grep '^DISTRIB_CODENAME=' /etc/lsb-release | cut -f2 -d=) universe" | sudo tee /etc/apt/sources.list.d/sur5r-i3.list
-$ sudo apt update
-$ sudo apt install i3
+sudo apt install ./keyring.deb
+echo "deb http://debian.sur5r.net/i3/ $(grep '^DISTRIB_CODENAME=' /etc/lsb-release | cut -f2 -d=) universe" | sudo tee /etc/apt/sources.list.d/sur5r-i3.list
+sudo apt update
+sudo apt install -y i3
diff --git a/setup/programs/package_manager/apt/others/thunderbird.sh b/setup/programs/package_manager/apt/others/thunderbird.sh
index 41ef58d..23f09c7 100644
--- a/setup/programs/package_manager/apt/others/thunderbird.sh
+++ b/setup/programs/package_manager/apt/others/thunderbird.sh
@@ -1,3 +1,3 @@
 sudo add-apt-repository ppa:mozillateam/ppa
 sudo apt update
-sudo apt install thunderbird
+sudo apt install -y thunderbird
diff --git a/setup/programs/package_manager/apt/packages.sh b/setup/programs/package_manager/apt/packages.sh
index ff77852..3531ac3 100644
--- a/setup/programs/package_manager/apt/packages.sh
+++ b/setup/programs/package_manager/apt/packages.sh
@@ -11,17 +11,25 @@ function install {
   fi
 }
 
-
-
-apt_packages=( "curl" "git" "htop" "tmux" "gimp" "inkscape" "texlive-full" "stow" "vlc" "blender" "gparted" "docker.io" "docker-compose" "python3-pip" "wget" "tree" "universal-ctags" "zathura")
-apt_packages=( "curl" "git" "htop" "tmux" "gimp" "inkscape" "stow" "vlc" "blender" "gparted" "docker.io" "docker-compose" "python3-pip" "wget" "tree" "universal-ctags" "zathura")
-
 sudo apt update
+install "curl"
 install "git"
 install "htop"
+install "tmux"
+#install "gimp"
+#install "inkscape"
+#install "texlive-full"
 install "stow"
+install "vlc"
+#install "blender"
+install "gparted"
+install "docker.io"
+install "docker-compose"
+install "python3-pip"
 install "wget"
 install "tree"
+install "universal-ctags"
+install "zathura"
 
 
 
diff --git a/setup/programs/package_manager/brew/packages.sh b/setup/programs/package_manager/brew/packages.sh
index 55bb2e2..9fb97ea 100644
--- a/setup/programs/package_manager/brew/packages.sh
+++ b/setup/programs/package_manager/brew/packages.sh
@@ -17,17 +17,31 @@ function install {
 }
   
 
-cask_packages=("gimp" "thunderbird" "firefox" "zotero" "rectangle" "vlc" "iterm2" "inkscape" "obsidian" "blender" "mactex" "bitwarden" "visual-studio-code" "spotify")
-other_packages=("neovim" "tmux" "docker" "docker-compose" "git" "curl" "zsh" "stow" "tree" "node" "universal-ctags")
-
 brew update
 
-for package in "${cask_packages}"
-do
-  install ${package} "cask"
-done
+install "gimp" "cask"
+install "thunderbird" "cask"
+install "firefox" "cask"
+install "zotero" "cask"
+install "rectangle" "cask"
+install "vlc" "cask"
+install "iterm2" "cask"
+install "inkscape" "cask"
+install "obsidian" "cask"
+install "blender" "cask"
+install "mactex" "cask"
+install "bitwarden" "cask"
+install "visual-studio-code" "cask"
+install "spotify" "cask"
 
-for package in "${other_packages}"
-do
-  install ${package} 
-done
+install "neovim"
+install "tmux"
+install "docker"
+install "docker-compose"
+install "git"
+install "curl"
+install "zsh"
+install "stow"
+install "tree"
+install "node"
+install "universal-ctags"