From aa167a09bd30f7f93909908099bfc21be9e2aa3c Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Thu, 3 Sep 2020 14:02:56 +0200
Subject: [PATCH] Fix LESS problem with git branch, move to zshenv

---
 dotfiles/zsh/p10k.zsh |  2 +-
 dotfiles/zsh/zprofile | 10 ----------
 dotfiles/zsh/zshenv   | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dotfiles/zsh/p10k.zsh b/dotfiles/zsh/p10k.zsh
index 617414f..900fa8f 100644
--- a/dotfiles/zsh/p10k.zsh
+++ b/dotfiles/zsh/p10k.zsh
@@ -790,7 +790,7 @@
   ##############[ taskwarrior: taskwarrior task count (https://taskwarrior.org/) ]##############
   # Taskwarrior color.
   typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74
-  
+
   # Taskwarrior segment format. The following parameters are available within the expansion.
   #
   # - P9K_TASKWARRIOR_PENDING_COUNT   The number of pending tasks: `task +PENDING count`.
diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile
index c6d742a..68a9bcb 100644
--- a/dotfiles/zsh/zprofile
+++ b/dotfiles/zsh/zprofile
@@ -3,16 +3,6 @@
 
 [[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
 
-# Colored less output
-export LESS=-R
-export LESS_TERMCAP_mb="$(printf '%b' '')"
-export LESS_TERMCAP_md="$(printf '%b' '')"
-export LESS_TERMCAP_me="$(printf '%b' '')"
-export LESS_TERMCAP_so="$(printf '%b' '')"
-export LESS_TERMCAP_se="$(printf '%b' '')"
-export LESS_TERMCAP_us="$(printf '%b' '')"
-export LESS_TERMCAP_ue="$(printf '%b' '')"
-export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
 
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
     exec startx
diff --git a/dotfiles/zsh/zshenv b/dotfiles/zsh/zshenv
index 3fc2f0a..5ba0d41 100644
--- a/dotfiles/zsh/zshenv
+++ b/dotfiles/zsh/zshenv
@@ -1,6 +1,16 @@
 # ~/.zshenv
 #
 
+# PATH
 typeset -U PATH path
 path=("$HOME/.local/bin" "$path[@]" "$HOME/.cargo/bin")
 export PATH
+
+# Colored less output
+export LESS_TERMCAP_mb="$(printf '%b' '')"
+export LESS_TERMCAP_md="$(printf '%b' '')"
+export LESS_TERMCAP_me="$(printf '%b' '')"
+export LESS_TERMCAP_so="$(printf '%b' '')"
+export LESS_TERMCAP_se="$(printf '%b' '')"
+export LESS_TERMCAP_us="$(printf '%b' '')"
+export LESS_TERMCAP_ue="$(printf '%b' '')"