From b1adc518b9fbd4539e6a505bf7c146f001145716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= <loic.gremaud@arcanite.ch>
Date: Wed, 19 Jun 2024 18:12:48 +0200
Subject: [PATCH] Update install script

---
 create_symlinks.sh |  2 +-
 gitconfig          |  2 ++
 gitignore_global   |  1 +
 install_script.sh  | 36 +++++++++++++++++++++---------------
 zsh/generic.sh     |  8 ++++----
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/create_symlinks.sh b/create_symlinks.sh
index e9439e0..f905d65 100755
--- a/create_symlinks.sh
+++ b/create_symlinks.sh
@@ -10,7 +10,7 @@
 dir=/home/legrems/Documents/dotfiles # dotfiles directory
 olddir=~/dotfiles_old # old dotfiles backup directory
 
-files="vim vimrc zsh zshrc tmux.conf zpreztorc gitconfig gitignore_global Xresources xprofile zprofile xinitrc" # list of files/folders to symlink in homedir
+files="vim zsh zshrc tmux.conf zpreztorc gitconfig gitignore_global Xresources xprofile zprofile xinitrc" # list of files/folders to symlink in homedir
 
 configdirs="i3 keepassxc nvim rofi trizen polybar"
 
diff --git a/gitconfig b/gitconfig
index a808a36..cf8ec80 100644
--- a/gitconfig
+++ b/gitconfig
@@ -37,3 +37,5 @@
     utmostDiscretion = 1
 [branch]
 	sort = -committerdate
+[submodule]
+	recurse = true
diff --git a/gitignore_global b/gitignore_global
index ac1224f..a2647c4 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -29,3 +29,4 @@ arcanite_gestion/lib/
 dependencies.html
 
 shadow_script.py
+flower_db*
diff --git a/install_script.sh b/install_script.sh
index f85b7b7..e459145 100644
--- a/install_script.sh
+++ b/install_script.sh
@@ -1,28 +1,34 @@
+# Trizen
+cd ~
+
+git clone https://aur.archlinux.org/trizen.git
+cd trizen
+makepkg -si
+
 # Generic
-sudo apt install zsh neovim silversearcher-ag fzf nnn vifm thefuck ripgrep
+trizen -S neovim zsh fzf nnn vifm thefuck ripgrep zoxide cargo locate
 
 # SSH Key
 ssh-keygen -t ed25519 -C "flamelegrems@gmail.com"
 
-# DotFiles
-git clone git@github.com:Legrems/dotfiles.git ~/Documents/dotfiles
-mkdir .config/nvim
-~/Documents/dotfiles/create_symlinks.sh
-ln -s /home/legrems/Documents/dotfiles/vim/colors /home/legrems/.config/nvim/colors
-ln -s /home/legrems/.vimrc /home/legrems/.config/nvim/init.vim
-
 # Zprezto
 git clone --recursive git@github.com:Legrems/zpresto.git ~/.zprezto
-
 chsh -s /bin/zsh
 
+# DotFiles
+git clone git@github.com:Legrems/dotfiles.git ~/Documents/dotfiles --recurse-submodules
+mkdir .config/nvim
+~/Documents/dotfiles/create_symlinks.sh
+
+ln -s /home/legrems/Documents/dotfiles/neovim /home/legrems/.config/nvim
+
+# Cdwe
+cargo install cdwe
+cdwe init zsh
+
+source <(fzf --zsh)
+
 # MiniConda
 wget -O miniconda-latest-install.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
 # wget -O miniconda-latest-install.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pyp3-Linux-aarch64.sh
 bash miniconda-latest-install.sh
-
-# MiniForge for Rpi
-wget -O
-
-# AutoEnv
-git clone git://github.com/inishchith/autoenv.git ~/.autoenv
diff --git a/zsh/generic.sh b/zsh/generic.sh
index 894517c..2aa9c7e 100644
--- a/zsh/generic.sh
+++ b/zsh/generic.sh
@@ -36,9 +36,9 @@ export NB_PROXMOXS=2
 export VAGRANT_ABACUS_BOX="ubuntu/focal64"
 export VISUAL=nvim
 export EDITOR=nvim
-export AUTOENV_ENV_FILENAME='.autoenv.zsh'
-export AUTOENV_ENV_LEAVE_FILENAME='.autoenv_leave.zsh'
-export AUTOENV_ENABLE_LEAVE='yes'
+#export AUTOENV_ENV_FILENAME='.autoenv.zsh'
+#export AUTOENV_ENV_LEAVE_FILENAME='.autoenv_leave.zsh'
+#export AUTOENV_ENABLE_LEAVE='yes'
 #export PS1='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%F "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} '
 # export PS1='%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} '
 
@@ -49,4 +49,4 @@ export AUTOENV_ENABLE_LEAVE='yes'
 
 eval $(thefuck --alias)
 
-source ~/.autoenv/activate.sh
+#source ~/.autoenv/activate.sh