Fixed merge conflict

deploy.sh

@@ -26,7 +26,7 @@ for option in "$@"; do
       [ ! -d "$HOME/.config/zsh" ] && mkdir -p "$HOME/.config/zsh"
       link "$PWD/zsh/.zshrc" "$HOME/.config/zsh/.zshrc"
       link "$PWD/zsh/aliases" "$HOME/.config/zsh/aliases"
-      link "$PWD/zsh/variables" "$HOME/.config/zsh/variables"
+      [ -e "/etc/zsh/zshenv" ] && sudo mv /etc/zsh/zshenv /etc/zsh/zshenv.bak && sudo ln -s "$PWD/zsh/zshenv" /etc/zsh/zshenv || sudo ln -s "$PWD/zsh/zshenv" /etc/zsh/zshenv
       curl -fLo $HOME/.config/zsh/zsh-autosuggestions.zsh --create-dirs \
         https://raw.githubusercontent.com/zsh-users/zsh-autosuggestions/master/zsh-autosuggestions.zsh
       git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/zsh-syntax-highlighting

zsh/.zshrc

@@ -20,7 +20,7 @@ _comp_options+=(globdots)  # include hidden files
 
 autoload -U colors && colors
 
-source $HOME/.config/zsh/variables
+source /etc/zsh/zshenv
 source $HOME/.config/zsh/aliases
 source $HOME/.config/zsh/zsh-autosuggestions.zsh
 source $HOME/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

zsh/aliases

@@ -11,6 +11,8 @@ alias live-server='live-server --port=1111 --host=127.0.0.1 --no-css-inject'
 alias pac='doas pacman'
 alias minecraft-launcher='minecraft-launcher --workDir /home/johannes/.local/share/minecraft'
 alias enablebluetooth='doas modprobe btusb'
+alias virt-manager='/bin/sudo -i virt-manager'
+
 # Typos
 alias al="ls -lAh --color=auto"
 alias s=""