From 16dde8776abf723c6c1ec88096d8ccfe28346a90 Mon Sep 17 00:00:00 2001
From: eeleater <nikolasweger@googlemail.com>
Date: Mon, 25 Nov 2024 01:49:26 +0100
Subject: [PATCH] revert 9c0a4ea635614457304a7a8014a256038e42ad0c

revert fixed chezmoi on phone
---
 dot_config/topgrade.toml.tmpl           | 2 +-
 dot_config/zsh/dot_zsh_plugins.txt.tmpl | 2 +-
 dot_config/zsh/dot_zshenv.tmpl          | 2 +-
 dot_config/zsh/dot_zshrc.tmpl           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl
index 8d2f714..bc9efb4 100644
--- a/dot_config/topgrade.toml.tmpl
+++ b/dot_config/topgrade.toml.tmpl
@@ -3,7 +3,7 @@
 #assume_yes = true
 
 # Disable specific steps - same options as the command line flag
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "sheldon", "clam_av_db"]
 {{- else }}
 disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "firmware", "sheldon", "clam_av_db"]
diff --git a/dot_config/zsh/dot_zsh_plugins.txt.tmpl b/dot_config/zsh/dot_zsh_plugins.txt.tmpl
index 7792877..4765d73 100644
--- a/dot_config/zsh/dot_zsh_plugins.txt.tmpl
+++ b/dot_config/zsh/dot_zsh_plugins.txt.tmpl
@@ -20,7 +20,7 @@ Aloxaf/fzf-tab
 
 # other plugins
 urbainvaes/fzf-marks
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 sobolevn/wakatime-zsh-plugin
 {{- end }}
 laggardkernel/zsh-thefuck
diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl
index 5073114..70c27ec 100644
--- a/dot_config/zsh/dot_zshenv.tmpl
+++ b/dot_config/zsh/dot_zshenv.tmpl
@@ -65,7 +65,7 @@ export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
 export HISTFILE="$ZSH_CACHE_DIR"/history
 export GPG_TTY="$TTY"
 unset FZF_MARKS_JUMP
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 export DIFFPROG='meld'
 {{- end }}
 export AUTO_NTFY_DONE_IGNORE="ntfy emacs htop info less mail man meld most mutt nano screen ssh tail tmux top vi vim watch bat cat kate topgrade"
diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl
index 20f9585..2324a24 100644
--- a/dot_config/zsh/dot_zshrc.tmpl
+++ b/dot_config/zsh/dot_zshrc.tmpl
@@ -9,7 +9,7 @@ unsetopt FLOW_CONTROL
 
 # deduplicate path
 typeset -U path PATH
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox
 path+=("$XDG_DATA_HOME/mise/shims") # mise
 {{- end }}
@@ -20,7 +20,7 @@ potentialBanner=('joke bofh' 'joke dad' 'fastfetch')
 eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
 
 # antidote
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 source '/usr/share/zsh-antidote/antidote.zsh'
 {{- else }}
 test -r "$XDG_DATA_HOME"/antidote/antidote.zsh || git clone https://github.com/mattmc3/antidote.git "$XDG_DATA_HOME"/antidote
@@ -33,7 +33,7 @@ antidote load
 smartcache eval zoxide init --cmd cd zsh
 smartcache eval atuin init zsh
 smartcache eval direnv hook zsh
-{{- if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.id "endeavouros")) }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 smartcache eval mise activate zsh
 {{- end }}