From 7b3c1af67ddefbabb46d37245148a5f9c36101c9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 14 Mar 2021 07:47:45 +0300
Subject: [PATCH] bat: use config file instead of multiple env vars

---
 deploy.sh                             | 1 +
 home/.bashrc-bloated                  | 5 +----
 home/.config/bat/config               | 5 +++++
 home/.config/fish/conf.d/aliases.fish | 1 -
 home/.config/fish/conf.d/env.fish     | 4 +---
 home/.config/zsh/.zshenv              | 4 +---
 home/.config/zsh/aliases.zsh          | 1 -
 7 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 home/.config/bat/config

diff --git a/deploy.sh b/deploy.sh
index d8482fa..9a49e47 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -93,6 +93,7 @@ cp -rfv ./home/.config/alacritty/        ~/.config/alacritty/
 cp -rfv ./home/.config/amfora/           ~/.config/amfora/
 cp -rfv ./home/.config/anime-downloader/ ~/.config/anime-downloader/
 cp -rfv ./home/.config/aria2/            ~/.config/aria2/
+cp -rfv ./home/.config/bat/              ~/.config/bat/
 cp -rfv ./home/.config/bottom/           ~/.config/bottom/
 cp -rfv ./home/.config/cava/             ~/.config/cava/
 cp -rfv ./home/.config/cointop/          ~/.config/cointop/
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 4836d1b..f497bd9 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -41,14 +41,12 @@ export XINITRC=$XDG_CONFIG_HOME/X11/xinitrc
 export XSERVERRC=$XDG_CONFIG_HOME/X11/xserverrc
 
 # env
-export PAGER=less
+export PAGER="less -R"
 export VISUAL=nvim
 export EDITOR=nvim
 export SVDIR=$HOME/.local/share/service
 export _JAVA_AWT_WM_NONREPARENTING=1
 export GPG_TTY="$(tty)"
-# bat
-export BAT_THEME="base16"
 # pfetch
 export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
 # fzf
@@ -387,7 +385,6 @@ alias no="grep -viP"
 # alias latest_pkg="expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30"
 alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
 alias tmux="TERM=screen-256color tmux"
-alias catc="bat --style plain --color=always"
 alias startx="startx $HOME/.config/X11/xinitrc"
 alias fehwpp="feh --no-fehbg --bg-fill --randomize ~/Pictures/Wallpapers/*"
 # colorizing
diff --git a/home/.config/bat/config b/home/.config/bat/config
new file mode 100644
index 0000000..c9aa824
--- /dev/null
+++ b/home/.config/bat/config
@@ -0,0 +1,5 @@
+--theme="base16"
+--color=always
+--italic-text=always
+--pager="less -R"
+--style="plain"
diff --git a/home/.config/fish/conf.d/aliases.fish b/home/.config/fish/conf.d/aliases.fish
index c4b4678..ce18e32 100644
--- a/home/.config/fish/conf.d/aliases.fish
+++ b/home/.config/fish/conf.d/aliases.fish
@@ -20,7 +20,6 @@ abbr no 'grep -viP'
 # abbr latest_pkg "expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30"
 alias yarn='yarn --use-yarnrc $HOME/.config/yarn/config'
 abbr tmux 'TERM=screen-256color command tmux'
-alias catc='bat --style plain --color=always'
 # colorizing
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish
index 1be9036..05618be 100644
--- a/home/.config/fish/conf.d/env.fish
+++ b/home/.config/fish/conf.d/env.fish
@@ -49,12 +49,10 @@ set -gx XSERVERRC $XDG_CONFIG_HOME/X11/xserverrc
 # env
 set -gx EDITOR nvim
 set -gx VISUAL nvim
-set -gx PAGER less
+set -gx PAGER "less -R"
 set -gx SVDIR $HOME/.local/share/service
 set -gx _JAVA_AWT_WM_NONREPARENTING 1
 set -gx GPG_TTY (tty)
-# bat
-set -gx BAT_THEME "base16"
 # pfetch
 set -gx PF_INFO "ascii title kernel wm shell uptime pkgs memory"
 # fzf
diff --git a/home/.config/zsh/.zshenv b/home/.config/zsh/.zshenv
index 8a8e3af..7673a72 100644
--- a/home/.config/zsh/.zshenv
+++ b/home/.config/zsh/.zshenv
@@ -37,14 +37,12 @@ export XINITRC=$XDG_CONFIG_HOME/X11/xinitrc
 export XSERVERRC=$XDG_CONFIG_HOME/X11/xserverrc
 
 # env
-export PAGER=less
+export PAGER="less -R"
 export VISUAL=nvim
 export EDITOR=nvim
 export SVDIR=$XDG_DATA_HOME/service
 export _JAVA_AWT_WM_NONREPARENTING=1
 export GPG_TTY="$(tty)"
-# bat
-export BAT_THEME="base16"
 # pfetch
 export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
 # fzf
diff --git a/home/.config/zsh/aliases.zsh b/home/.config/zsh/aliases.zsh
index e7dac42..8212434 100644
--- a/home/.config/zsh/aliases.zsh
+++ b/home/.config/zsh/aliases.zsh
@@ -14,7 +14,6 @@ alias no="grep -viP"
 # alias latest_pkg="expac --timefmt='%Y-%m-%d %T' '%l\t%n' | sort | tail -n 30"
 alias yarn="yarn --use-yarnrc $HOME/.config/yarn/config"
 alias tmux="TERM=screen-256color tmux"
-alias catc="bat --style plain --color=always"
 # colorizing
 alias grep="grep --color=auto"
 alias fgrep="fgrep --color=auto"