diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv index 0146981..704b17d 100644 --- a/config/zsh/.zshenv +++ b/config/zsh/.zshenv @@ -6,4 +6,3 @@ export XDG_STATE_HOME=$HOME/.local/state export HISTFILE=$XDG_DATA_HOME/zsh/history export HISTSIZE=10000 export SAVEHIST=$HISTSIZE -source $ZDOTDIR/settheme.zsh diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 3715a67..26b4836 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -12,11 +12,7 @@ gd() { alias less='less -R' if [[ $(command -v bat) ]]; then - if [[ "${macos_interface_style}" = "Dark" ]]; then - alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright' - else - alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Light' - fi + alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright' fi if [[ $(command -v eza) ]]; then diff --git a/config/zsh/fzf.zsh b/config/zsh/fzf.zsh index 6194077..8fe7fbd 100644 --- a/config/zsh/fzf.zsh +++ b/config/zsh/fzf.zsh @@ -2,17 +2,7 @@ if [[ $(command -v fzf) ]]; then source <(fzf --zsh) export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' - if [[ $macos_interface_style = "Light" ]]; then - FZF_COLORS=' - --color=fg:#5C6166,fg+:#FCFCFC,bg:#FCFCFC,bg+:#5C6166 - --color=hl:#4196df,hl+:#6daee6,info:#eba54d,marker:#80ab24 - --color=prompt:#e7666a,spinner:#9870c3,pointer:#b294d2,header:#51b891 - --color=border:#5C6166,label:#e7666a,query:#5C6166 - --border="rounded" --border-label="" --preview-window="border-rounded" --prompt="> " - --marker=">" --pointer="◆" --separator="─" --scrollbar="│"' - else - FZF_COLORS="" - fi + FZF_COLORS="" export FZF_DEFAULT_OPTS=$FZF_COLORS" --multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Light {}'" export FZF_CTRL_R_OPTS=$FZF_COLORS" -e --ansi --layout=reverse --preview=''" _fzf_compgen_path() { diff --git a/config/zsh/settheme.zsh b/config/zsh/settheme.zsh deleted file mode 100644 index 0ec0fde..0000000 --- a/config/zsh/settheme.zsh +++ /dev/null @@ -1,7 +0,0 @@ -if [[ $(uname -s) = "Darwin" ]]; then - if defaults read -g AppleInterfaceStyle > /dev/null 2>&1; then - export macos_interface_style=Dark - else - export macos_interface_style=Light - fi -fi