From c08264db2b66dcfc84c548399af4f7465da23af4 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 29 Sep 2022 13:09:00 +0100 Subject: [PATCH] Move local zsh customisations to ~/.zsh.local --- nix-conf/home/zsh.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nix-conf/home/zsh.nix b/nix-conf/home/zsh.nix index ce5b9d5..1d9b9ba 100644 --- a/nix-conf/home/zsh.nix +++ b/nix-conf/home/zsh.nix @@ -108,15 +108,10 @@ set -o noclobber append_history share_history - test -e "~/.iterm2_shell_integration.zsh" && source "~/.iterm2_shell_integration.zsh" || true - - if [ "$(uname 2> /dev/null)" = "Darwin" ]; then - #colima status 2>/dev/null || ( nohup colima start & ) >/dev/null 2>&1 - pgrep -q openvpn || ( pushd ~/otm-vpn ; nohup sudo -C 20 openvpn --config otm.ovpn --auth-user-pass <(gpg -qd ~/otm-vpn/vpn_creds.txt.gpg) & ; popd ) >/dev/null 2>&1 - fi - function generate () { gopass generate -s -p $1 $((RANDOM % 14 + 45)) } + [[ ! -f ~/.zsh.local ]] || source ~/.zsh.local + [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh '';