js/configs
1
1
Fork 0
Code Activity

Bring zsh and fish back in sync

Browse source
This commit is contained in:
Jonathan Schleifer 2022-11-25 22:16:50 +00:00
parent 84a7f938fb
commit fe8461f4b8
9 changed files with 81 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

31
fish/config.fish
View file

@ -26,15 +26,38 @@ set -g fish_color_vcs_braces 29bc7d
set -g fish_normal_user js
test -n "$XDG_CONFIG_HOME"
or set -x XDG_CONFIG_HOME $HOME/.config
or set -x XDG_CONFIG_HOME "$HOME/.config"
test -n "$XDG_CACHE_HOME"
or set -x XDG_CACHE_HOME $HOME/.cache
or set -x XDG_CACHE_HOME "$HOME/.cache"
test -n "$XDG_DATA_HOME"
or set -x XDG_DATA_HOME $HOME/.local/share
or set -x XDG_DATA_HOME "$HOME/.local/share"
set -x EDITOR vim
set -x VIMINIT "source $XDG_CONFIG_HOME/vim/vimrc"
set -x LS_COLORS 'di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
set -x SUDO_PROMPT (printf "\033[0;31m[\033[1;31msudo -> %%U\033[0;31m]\033[0m Password for \033[1m%%p@%%H\033[0m: ")
set -x GNUPGHOME $XDG_DATA_HOME/gnupg
set -x GNUPGHOME "$XDG_DATA_HOME/gnupg"
set -x CVS_RSH ssh
if type -q gpg
# Make sure the GPG agent is running
gpg --card-status &>/dev/null
set -l sock
if test -d "$XDG_RUNTIME_DIR/gnupg"
set sock (find $XDG_RUNTIME_DIR/gnupg -name S.gpg-agent.ssh | head -1)
end
if test -z "$sock"
set sock "$GNUPGHOME/S.gpg-agent.ssh"
end
alias gssh="SSH_AUTH_SOCKET=$sock ssh"
alias gssh-add="SSH_AUTH_SOCKET=$sock ssh-add"
alias gsftp="SSH_AUTH_SOCKET=$sock sftp"
end
if test (uname -s) = Darwin
set -x MAKEFLAGS -j(math (sysctl -n machdep.cpu.thread_count)'*2')
else if type -q nproc
set -x MAKEFLAGS -j(math (nproc)'*2')
end