From 44fa9a75d893a76c1ecd98b871e09701821b63f9 Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer.97@outlook.com>
Date: Fri, 13 May 2022 22:19:56 +0200
Subject: [PATCH] Update

---
 .chezmoitemplates/gnome_before |  0
 .chezmoitemplates/i3wm_before  |  2 +-
 run_once_prepare_arch.sh.tmpl  | 14 ++++++--------
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 .chezmoitemplates/gnome_before

diff --git a/.chezmoitemplates/gnome_before b/.chezmoitemplates/gnome_before
new file mode 100644
index 0000000..e69de29
diff --git a/.chezmoitemplates/i3wm_before b/.chezmoitemplates/i3wm_before
index 06ddc52..6cbb50c 100644
--- a/.chezmoitemplates/i3wm_before
+++ b/.chezmoitemplates/i3wm_before
@@ -27,4 +27,4 @@ packages+=(kdeconnect)
 
 # Spotify to listen music :)
 # ## spicetify-cli => Use to customize spotify (Add vim keyboard style)
-aur_packages+=(spotify spicetify-cli)
\ No newline at end of file
+aur_packages+=(spicetify-cli)
\ No newline at end of file
diff --git a/run_once_prepare_arch.sh.tmpl b/run_once_prepare_arch.sh.tmpl
index 0a5e569..65203ce 100644
--- a/run_once_prepare_arch.sh.tmpl
+++ b/run_once_prepare_arch.sh.tmpl
@@ -1,5 +1,3 @@
-{{- $wm := (output "bash" "-c" "echo $DESKTOP_SESSION") -}}
-
 {{- if eq .chezmoi.osRelease.idLike "arch" -}}
 #!/bin/bash
 
@@ -8,7 +6,7 @@
 packages=(curl git yay)
 # ## falchion-shutdown | My custom AUR packages to avoid shutdown my computer when keyboard is sleeping
 # ## nerd-fonts-complete | To install my preferred fonts :)
-aur_packages=(falchion-shutdown nerd-fonts-complete)
+aur_packages=(falchion-shutdown nerd-fonts-complete spotify)
 
 # For terminal
 # ## kitty => Terminal emulator like alacritty but it look more powerfull so it can replace alacritty and tmux in future
@@ -20,11 +18,11 @@ packages+=(kitty viu zsh)
 # ## rust-analyzer => Use in replacement of RLS | Used by (emacs-ng + neovim + vscode if installed)
 packages+=(neovim rust-analyzer)
 
-{{- if eq $wm "i3" -}}
+{{ if eq .wm "i3wm" }}
 {{- template "i3wm_before" -}}
-{{- else if eq $wm "gnome" -}}
-sadsada
-{{- end -}}
+{{ else if eq .wm "gnome" }}
+{{- template "gnome_before" -}}
+{{ end }}
 
 sudo pacman -S ${packages[@]} --noconfirm --needed
 yay -S ${aur_packages[@]} --noconfirm --needed
@@ -33,7 +31,7 @@ if [ ! -d ~/.tmux/plugins/tpm ]; then
 	git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 fi
 
-{{- if eq $wm "i3" -}}
+{{- if eq .wm "i3wm" -}}
 {{- template "i3wm_after" -}}
 {{- end -}}