phg/.files
0
0
Fork 0
mirror of https://github.com/shokinn/.files.git synced 2025-06-28 15:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

reorganize dotrfiles; fix exa aliasses for mac

Browse source
This commit is contained in:
Philip Henning 2023-09-13 11:06:14 +02:00
parent b853f45327
commit 78b3209ea4
4 changed files with 119 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dotfiles/zshenv
View file

@ -20,29 +20,14 @@ export ANSIBLE_NOCOWS=1
# Include $(go env GOPATH) to PATH
[[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}"
# exa
if [[ $(command -v exa) ]]; then
lfunc() {
exal -T -L ${1:-1}
}
lafunc() {
exal -a -T -L ${1:-1}
}
alias exal="exa -l -F -g -h --extended --git --group-directories-first --icons"
alias l='lfunc'
alias la='lafunc'
alias ll="lfunc 2"
alias lla='lafunc 2'
fi
{%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' or profile == 'ymir' @@%}
# Connect to windows ssh pageant
# https://github.com/BlackReloaded/wsl2-ssh-pageant
export SSH_AUTH_SOCK={{@@ env['HOME'] @@}}/.ssh/agent.sock
ss -a | grep -q $SSH_AUTH_SOCK
if [ $? -ne 0 ]; then
rm -f $SSH_AUTH_SOCK
(setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe >/dev/null 2>&1 &)
rm -f $SSH_AUTH_SOCK
(setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe >/dev/null 2>&1 &)
fi
# Connect to windows gpg agent
@ -50,8 +35,8 @@ fi
export GPG_AGENT_SOCK={{@@ env['HOME'] @@}}/.gnupg/S.gpg-agent
ss -a | grep -q $GPG_AGENT_SOCK
if [ $? -ne 0 ]; then
rm -rf $GPG_AGENT_SOCK
(setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" >/dev/null 2>&1 &)
rm -rf $GPG_AGENT_SOCK
(setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" >/dev/null 2>&1 &)
fi
# X410 (Windows X11 Server)
@ -60,4 +45,6 @@ export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}
{%@@ if profile == 'WVDEWOBMC001307' @@%}
export HOMEBREW_CASK_OPTS="--appdir=~/Applications"
{%@@ endif @@%}
{%@@ endif @@%}
source {{@@ env['HOME'] @@}}/.commonfunc