diff --git a/config/exports-lakka b/config/exports-lakka index 5bd23c0..e49962c 100644 --- a/config/exports-lakka +++ b/config/exports-lakka @@ -5,3 +5,16 @@ have luarocks && $(luarocks path --bin) path_append "$HOME/.local/go/bin" +alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state' +alias nano='nano -wS -$' +alias gpg=gpg2 + +ACME_PATH="$HOME/.acme.sh" +# shellcheck source=$HOME/.acme.sh/acme.sh.env +[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env" + +export RVM_PATH="$HOME/.rvm" +export PATH="$RVM_PATH/bin:$PATH" +# shellcheck source=$HOME/.rvm/scripts/rvm +[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function* + diff --git a/hosts/lakka/base/zshrc b/hosts/lakka/base/zshrc deleted file mode 100644 index 7dfdc65..0000000 --- a/hosts/lakka/base/zshrc +++ /dev/null @@ -1,59 +0,0 @@ -# Lakka zsh configuration. -# -# shellcheck shell=bash -export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/usr/sbin:$PATH" - -# Defaults -export DOTFILES="$HOME/.dotfiles" - -# Run x-load-configs in your terminal to reload the files. -function x-load-configs() -{ - HOST="$(hostname -s)" - # Load the shell dotfiles, and then some: - for file in $DOTFILES/config/{exports,alias,functions}; do - # global (exports|alias|functions) file for all hosts - # shellcheck source=../../../config/exports - [ -r "$file" ] && source "$file" - # shellcheck source=../../../config/exports - [ -r "$file-secret" ] && source "$file-secret" - # shellcheck source=../../../config/exports - [ -r "$file-$HOST" ] && source "$file-$HOST" - # shellcheck source=../../../config/exports - [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret" - done -} -x-load-configs - -export PATH="$XDG_BIN_HOME:$PATH" -export LC_ALL=fi_FI.utf8 - -export RVM_PATH="$HOME/.rvm" -export PATH="$RVM_PATH/bin:$PATH" -# shellcheck source=$HOME/.rvm/scripts/rvm -[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function* - -# Try to load antigen, if present -ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh" -# shellcheck source=$HOME/.local/bin/antigen.zsh -[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH" - -# If antigen was loaded -if command -v antigen &>/dev/null; then - antigen use oh-my-zsh - - # config/functions - x-default-antigen-bundles - - antigen theme oskarkrawczyk/honukai-iterm-zsh honukai - - antigen apply -fi - -alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state' -alias nano='nano -wS -$' -alias gpg=gpg2 - -ACME_PATH="$HOME/.acme.sh" -# shellcheck source=$HOME/.acme.sh/acme.sh.env -[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env"