From a74b058d7c557d13aacae2e9b039b22fe8d76e9f Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 1 Mar 2020 19:38:51 -0500 Subject: [PATCH] Updated emborg configs, and zshrc --- .../{macos => home##os.Darwin,h.ragnarok} | 1 + .../{home => home##os.Linux,h.midgaard} | 1 + .config/emborg/passport##os.Darwin,h.ragnarok | 32 +++++++++++++++++++ .config/emborg/passport##os.Linux,h.loki | 26 +++++++++++++++ .config/emborg/passport##os.Linux,h.midgaard | 31 ++++++++++++++++++ ...o.Darwin => settings##o.Darwin,h.ragnarok} | 4 +-- .zshrc | 26 +++++++++++++-- 7 files changed, 117 insertions(+), 4 deletions(-) rename .config/emborg/{macos => home##os.Darwin,h.ragnarok} (98%) rename .config/emborg/{home => home##os.Linux,h.midgaard} (94%) create mode 100644 .config/emborg/passport##os.Darwin,h.ragnarok create mode 100644 .config/emborg/passport##os.Linux,h.loki create mode 100644 .config/emborg/passport##os.Linux,h.midgaard rename .config/emborg/{settings##o.Darwin => settings##o.Darwin,h.ragnarok} (97%) diff --git a/.config/emborg/macos b/.config/emborg/home##os.Darwin,h.ragnarok similarity index 98% rename from .config/emborg/macos rename to .config/emborg/home##os.Darwin,h.ragnarok index 4d32bc0..dadd3e2 100644 --- a/.config/emborg/macos +++ b/.config/emborg/home##os.Darwin,h.ragnarok @@ -5,6 +5,7 @@ src_dirs = ''' excludes = ''' ~/tmp + ~/Music ~/Library/Application Support/Steam ~/Library/Application Support/Google ~/Library/Application Support/LogMeInInc diff --git a/.config/emborg/home b/.config/emborg/home##os.Linux,h.midgaard similarity index 94% rename from .config/emborg/home rename to .config/emborg/home##os.Linux,h.midgaard index 271c620..73e4dd5 100644 --- a/.config/emborg/home +++ b/.config/emborg/home##os.Linux,h.midgaard @@ -14,6 +14,7 @@ excludes = ''' ~/.firestorm_x64.new ~/.local/share/fonts ~/.local/share/Steam + ~/.steam/steam/steamapps ~/**/__pycache__ ~/**/*.pyc ~/**/.*.swp diff --git a/.config/emborg/passport##os.Darwin,h.ragnarok b/.config/emborg/passport##os.Darwin,h.ragnarok new file mode 100644 index 0000000..e3add55 --- /dev/null +++ b/.config/emborg/passport##os.Darwin,h.ragnarok @@ -0,0 +1,32 @@ +#src_dirs = '~'.split() # absolute path to directory to be backed up +passphrase = 'aiwei0pu4Iev0Ies4aeheim9ahmeQuec' +encryption = 'repokey' +repository = '/Volumes/Passport/macOS/borg' + +src_dirs = ''' + ~ +'''.split() + +excludes = ''' + ~/tmp + ~/Music + ~/Library/Application Support/Steam + ~/Library/Application Support/Google + ~/Library/Application Support/LogMeInInc + ~/Library/Application Support/Code + ~/Library/Application Support/Firefox + ~/Library/Containers + ~/Library/Group Containers + ~/Library/Logs + ~/Library/Python + ~/Library/Caches + ~/.cache + ~/.mozilla + ~/.config/google-chrome + ~/.config/BraveSoftware + ~/**/__pycache__ + ~/**/*.pyc + ~/**/.*.swp + ~/**/.*.swo +'''.split() + diff --git a/.config/emborg/passport##os.Linux,h.loki b/.config/emborg/passport##os.Linux,h.loki new file mode 100644 index 0000000..1937c90 --- /dev/null +++ b/.config/emborg/passport##os.Linux,h.loki @@ -0,0 +1,26 @@ +#src_dirs = '~'.split() # absolute path to directory to be backed up +passphrase = 'aiwei0pu4Iev0Ies4aeheim9ahmeQuec' +encryption = 'repokey' +repository = '/run/media/psi-jack/Passport/psi-jack/borg' + +src_dirs = ''' + ~ +'''.split() + +excludes = ''' + ~/tmp + ~/Music + ~/bin/sl + ~/.cache + ~/.mozilla + ~/.config/google-chrome + ~/.config/BraveSoftware + ~/.firestorm_x64 + ~/.local/share/fonts + ~/.local/share/Steam + ~/**/__pycache__ + ~/**/*.pyc + ~/**/.*.swp + ~/**/.*.swo +'''.split() + diff --git a/.config/emborg/passport##os.Linux,h.midgaard b/.config/emborg/passport##os.Linux,h.midgaard new file mode 100644 index 0000000..9efaf6b --- /dev/null +++ b/.config/emborg/passport##os.Linux,h.midgaard @@ -0,0 +1,31 @@ +#src_dirs = '~'.split() # absolute path to directory to be backed up +passphrase = 'aiwei0pu4Iev0Ies4aeheim9ahmeQuec' +encryption = 'repokey' +repository = '/run/media/psi-jack/Passport/psi-jack/borg' + +src_dirs = ''' + ~ + /mnt/storage/psi-jack +'''.split() + +excludes = ''' + ~/tmp + ~/Music + ~/bin/sl + ~/.cache + ~/.mozilla + ~/.config/google-chrome + ~/.config/BraveSoftware + ~/.firestorm_x64 + ~/.local/share/fonts + ~/.local/share/Steam + ~/**/__pycache__ + ~/**/*.pyc + ~/**/.*.swp + ~/**/.*.swo + /mnt/storage/psi-jack/Backups + /mnt/storage/psi-jack/Music + /mnt/storage/psi-jack/Downloads + /mnt/storage/psi-jack/ISOs +'''.split() + diff --git a/.config/emborg/settings##o.Darwin b/.config/emborg/settings##o.Darwin,h.ragnarok similarity index 97% rename from .config/emborg/settings##o.Darwin rename to .config/emborg/settings##o.Darwin,h.ragnarok index d530c77..1070b7a 100644 --- a/.config/emborg/settings##o.Darwin +++ b/.config/emborg/settings##o.Darwin,h.ragnarok @@ -1,8 +1,8 @@ # These settings are common to all configurations # configurations -configurations = 'macos' -default_configuration = 'macos' +configurations = 'home passport' +default_configuration = 'home' # passcode # specify either passphrase or avendesora_account diff --git a/.zshrc b/.zshrc index 9ad8de4..1f098fb 100644 --- a/.zshrc +++ b/.zshrc @@ -128,11 +128,33 @@ typeset -U PATH PATH="$HOME/bin:$HOME/.local/bin:$PATH" export PATH + +# Portable alternative to readlink -f +zpath() { cd -P . || return + _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; } + _cd() { cd -P "$1" ; } >/dev/null 2>&1 + while [ $# -gt 0 ] && _cd . + do if _cd "$1" + then _out + elif ! [ -L "$1" ] && [ -e "$1" ] + then _cd "${1%/*}"; _out "$1" + elif [ -L "$1" ] + then ( while set -- "${1%?/}"; _cd "${1%/*}"; [ -L "${1##*/}" ] + do set " $1" "$(_cd -; ls -nd -- "$1"; echo /)" + set -- "${2#*"$1" -> }" + done; _out "$1" + ); else ( PS4=ERR:\ NO_SUCH_PATH; set -x; : "$1" ) + fi; _cd -; shift; done + unset -f _out _cd; unset -v _zdlm +} + # Include local functions/aliases/environments: while read f do - source "$f" -done < <(find "${HOME}/.local/dotfiles/" -type f -name '*.zsh') + if [[ -f "$(zpath "$f")" ]]; then + source "$f" + fi +done < <(find "${HOME}/.local/dotfiles/" -name '*.zsh') # Disable Ctrl+S Scroll-Locking stty -ixon