Commit a960c568 authored by hadret's avatar hadret

fix: hide macOS specific settings behind an if.

parent a8c1b71c
# Darkmode
set -l val (defaults read -g AppleInterfaceStyle 2>/dev/null)
if test ! -n "$val"
echo -ne "\033]50;SetProfile=Default\a"
set -x ITERM_PROFILE "Default"
set -x BAT_THEME "OneHalfLight"
set -x HIGHLIGHT_STYLE "base16/tomorrow"
set -u FZF_DEFAULT_OPTS
set -U fish_color_autosuggestion 8e908c
set -U fish_color_command 8959a8
set -U fish_color_comment eab700
set -U fish_color_end 8959a8
set -U fish_color_error c82829
set -U fish_color_param 4271ae
set -U fish_color_quote 718c00
set -U fish_color_redirection 3e999f
else
echo -ne "\033]50;SetProfile=Dark\a"
set -x ITERM_PROFILE "Dark"
set -x BAT_THEME "OneHalfDark"
set -x HIGHLIGHT_STYLE "base16/tomorrow-night"
set -x FZF_DEFAULT_OPTS '--color=bg+:#635196,fg:#b4b4b9,pointer:#ffb07b,marker:#ff761a,prompt:#34bfa4,info:#ffd392'
set -U fish_color_autosuggestion 969896
set -U fish_color_command c397d8
set -U fish_color_comment e7c547
set -U fish_color_end c397d8
set -U fish_color_error d54e53
set -U fish_color_param 7aa6da
set -U fish_color_quote b9ca4a
set -U fish_color_redirection 70c0b1
end
# falcon colors for exa
# set -x EXA_COLORS "uu=38;5;249:un=38;5;241:gu=38;5;245:gn=38;5;241:da=38;5;245:sn=38;5;7:sb=38;5;7:ur=38;5;3;1:uw=38;5;5;1:ux=38;5;1;1:ue=38;5;1;1:gr=38;5;249:gw=38;5;249:gx=38;5;249:tr=38;5;249:tw=38;5;249:tx=38;5;249:fi=38;5;248:di=38;5;253:ex=38;5;1:xa=38;5;12:*.png=38;5;4:*.jpg=38;5;4:*.gif=38;5;4"
# GPG setup
set -x GPG_TTY "(tty)"
set -x SSH_AUTH_SOCK "$HOME/.gnupg/S.gpg-agent.ssh"
gpgconf --launch gpg-agent
# setup locale
set -x LANG "en_US.UTF-8"
set -x LC_COLLATE "en_US.UTF-8"
......@@ -62,17 +22,59 @@ set -x FZF_CD_WITH_HIDDEN_COMMAND "fd --hidden -t d -E Library -E .git"
# setup default EDITOR
set -x EDITOR vim
# setup asdf
source ~/.asdf/asdf.fish
# macOS specific settings
set os (uname)
if test "$os" = "Darwin"
# GPG setup
set -x GPG_TTY "(tty)"
set -x SSH_AUTH_SOCK "$HOME/.gnupg/S.gpg-agent.ssh"
gpgconf --launch gpg-agent
# load iTerm2 integration scripts
source ~/.iterm2_shell_integration.fish
# setup asdf
source ~/.asdf/asdf.fish
# load virtualfish integration
# eval (python -m virtualfish auto_activation update_python)
set -g VIRTUALFISH_VERSION 1.0.6
set -g VIRTUALFISH_PYTHON_EXEC /Users/hadret/.asdf/installs/python/3.7.4/bin/python
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/virtual.fish
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/auto_activation.fish
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/update_python.fish
emit virtualfish_did_setup_plugins
# load iTerm2 integration scripts
source ~/.iterm2_shell_integration.fish
# load virtualfish integration
# eval (python -m virtualfish auto_activation update_python)
set -g VIRTUALFISH_VERSION 1.0.6
set -g VIRTUALFISH_PYTHON_EXEC /Users/hadret/.asdf/installs/python/3.7.4/bin/python
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/virtual.fish
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/auto_activation.fish
source /Users/hadret/.asdf/installs/python/3.7.4/lib/python3.7/site-packages/virtualfish/update_python.fish
emit virtualfish_did_setup_plugins
# Darkmode
set -l val (defaults read -g AppleInterfaceStyle 2>/dev/null)
if test ! -n "$val"
echo -ne "\033]50;SetProfile=Default\a"
set -x ITERM_PROFILE "Default"
set -x BAT_THEME "OneHalfLight"
set -x HIGHLIGHT_STYLE "base16/tomorrow"
set -u FZF_DEFAULT_OPTS
set -U fish_color_autosuggestion 8e908c
set -U fish_color_command 8959a8
set -U fish_color_comment eab700
set -U fish_color_end 8959a8
set -U fish_color_error c82829
set -U fish_color_param 4271ae
set -U fish_color_quote 718c00
set -U fish_color_redirection 3e999f
else
echo -ne "\033]50;SetProfile=Dark\a"
set -x ITERM_PROFILE "Dark"
set -x BAT_THEME "OneHalfDark"
set -x HIGHLIGHT_STYLE "base16/tomorrow-night"
set -x FZF_DEFAULT_OPTS '--color=bg+:#635196,fg:#b4b4b9,pointer:#ffb07b,marker:#ff761a,prompt:#34bfa4,info:#ffd392'
set -U fish_color_autosuggestion 969896
set -U fish_color_command c397d8
set -U fish_color_comment e7c547
set -U fish_color_end c397d8
set -U fish_color_error d54e53
set -U fish_color_param 7aa6da
set -U fish_color_quote b9ca4a
set -U fish_color_redirection 70c0b1
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment