From 60c8bd17111269c81c18497e8d177a05733fe660 Mon Sep 17 00:00:00 2001 From: Wryn Wagner Date: Wed, 24 Feb 2021 15:29:07 -0700 Subject: [PATCH] Updated environment variable format --- env/env | 12 ++++++++++++ env/env.bash | 15 --------------- env/env.vim | 5 ++--- env/env.zsh | 17 ----------------- 4 files changed, 14 insertions(+), 35 deletions(-) create mode 100755 env/env delete mode 100755 env/env.bash delete mode 100755 env/env.zsh diff --git a/env/env b/env/env new file mode 100755 index 0000000..f60bbfb --- /dev/null +++ b/env/env @@ -0,0 +1,12 @@ +DOTWRYN="$HOME/.wryn" +SCHOOL_PATH="$HOME/School" +RD_PATH="$HOME/RentDynamics" +SFX_PATH="$HOME/Media/sfx" + +# ordered from least-preferred to most-preferred +PREFERRED_EDITOR=(vi vim) + +# plays audio files located throughout the system +MEDIA_ENGINE="$(which canberra-gtk-play) -f" + +source "$LOCAL_OVERRIDES" diff --git a/env/env.bash b/env/env.bash deleted file mode 100755 index 99ee338..0000000 --- a/env/env.bash +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Default bash environment -RD_PATH="$HOME/RentDynamics" -SCHOOL_DIR="$HOME/School" -DOTWRYN="$HOME/.wryn" - - -LOCAL_OVERRIDES="$HOME/.config/wryn/env.bash" -[ -f "$LOCAL_OVERRIDES" ] \ - && source "$LOCAL_OVERRIDES" \ - || { - touch $LOCAL_OVERRIDES \ - && echo '#!/bin/bash' > $LOCAL_OVERRIDES \ - && echo '# Local overrides of .wryn environment variables' >> $LOCAL_OVERRIDES - } diff --git a/env/env.vim b/env/env.vim index 29bd349..58da98e 100644 --- a/env/env.vim +++ b/env/env.vim @@ -12,15 +12,14 @@ let $ZSHRC=expand("$HOME/.zshrc") " ........... vice, lanox, nightsky, made_of_code, moss, skittles_berry, pf_earth " " customs : snow -let $COLORSCHEME="skittles_autumn" +let $COLORSCHEME="default" " }}} " -- Web Browser Settings --------------------------------------- {{{ " set the webbrowser locally -" let $WEBBROWSER="" +"let $WEBBROWSER="" " }}} - " -- Local Environment Overrides -------------------------------- {{{ source $HOME/.config/wryn/env.vim " }}} diff --git a/env/env.zsh b/env/env.zsh deleted file mode 100755 index 88c95c6..0000000 --- a/env/env.zsh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/zsh -# Default zsh environment -RD_PATH="$HOME/RentDynamics" -SCHOOL_DIR="$HOME/School" -DOTWRYN="$HOME/.wryn" - -# ordered from least-preferred to most-preferred -PREFERRED_EDITOR=(vi vim) - -LOCAL_OVERRIDES="$HOME/.config/wryn/env.zsh" -[ -f "$LOCAL_OVERRIDES" ] \ - && source "$LOCAL_OVERRIDES" \ - || { - touch $LOCAL_OVERRIDES \ - && echo '#!/bin/zsh' > $LOCAL_OVERRIDES \ - && echo '# Local overrides of .wryn environment variables '>> $LOCAL_OVERRIDES - }