diff --git a/config/dotwryn.env.zsh b/config/dotwryn.env.zsh index 93076ef..2860c97 100644 --- a/config/dotwryn.env.zsh +++ b/config/dotwryn.env.zsh @@ -42,7 +42,7 @@ EXTERNAL_PLUGINS+=( '/usr/share/fzf/completion.zsh' ) -export FZF_DEFAULT_OPTS='--reverse --ansi --height 50%' +export FZF_DEFAULT_OPTS='--reverse --ansi --height 50% --bind=ctrl-c:cancel' export FZF_DEFAULT_COMMAND='rg --files' @@ -61,7 +61,7 @@ for e in \ "local.$(hostnamectl --static).secret" \ "local.$(hostnamectl --static)" \ "local" -do export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/env/$e" ] && break; done +do export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/environments/$e" ] && break; done # z diff --git a/config/scwrypts/config.zsh b/config/scwrypts/config.zsh index 7dc08bd..df2433c 100644 --- a/config/scwrypts/config.zsh +++ b/config/scwrypts/config.zsh @@ -2,8 +2,8 @@ # configuration for scwrypts # -SCWRYPTS_CONFIG_PATH="$HOME/.config/scwrypts" -SCWRYPTS_DATA_PATH="$HOME/.local/share/scwrypts" - SCWRYPTS_SHORTCUT='' # CTRL + W SCWRYPTS_ENV_SHORTCUT='' # CTRL + / + +[ -f "$HOME/.config/scwrypts/config.local.zsh" ] \ + && source "$HOME/.config/scwrypts/config.local.zsh" diff --git a/config/scwrypts/env/local b/config/scwrypts/env/local index 106f862..aed179d 100644 --- a/config/scwrypts/env/local +++ b/config/scwrypts/env/local @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 export AWS_PROFILE=yage @@ -11,17 +16,18 @@ export AWS_REGION=us-east-2 # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage -# s3 bucket name and filesystem targets for media backups -export MEDIA_SYNC__S3_BUCKET=yage -export MEDIA_SYNC__TARGETS= - # details for a directus instance export DIRECTUS__API_TOKEN= export DIRECTUS__BASE_URL=https://heretic.directus.app # details for discord bot export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME= +export DISCORD__DEFAULT_WEBHOOK= # custom i3 configuration settings export I3__BORDER_PIXEL_SIZE= @@ -32,6 +38,10 @@ export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # linear.app project management configuration export LINEAR__API_TOKEN= +# s3 bucket name and filesystem targets for media backups +export MEDIA_SYNC__S3_BUCKET=yage +export MEDIA_SYNC__TARGETS= + # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/local.altaria b/config/scwrypts/env/local.altaria index cb7c160..a84f60b 100644 --- a/config/scwrypts/env/local.altaria +++ b/config/scwrypts/env/local.altaria @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 # from local export AWS_PROFILE=yage # from local @@ -11,6 +16,28 @@ export AWS_REGION=us-east-2 # from local # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local +# details for a directus instance +export DIRECTUS__API_TOKEN= +export DIRECTUS__BASE_URL=https://heretic.directus.app # from local + +# details for discord bot +export DISCORD__BOT_TOKEN= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' # from local +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME= +export DISCORD__DEFAULT_WEBHOOK= + +# custom i3 configuration settings +export I3__BORDER_PIXEL_SIZE= +export I3__DMENU_FONT_SIZE= +export I3__GLOBAL_FONT_SIZE= +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local + +# linear.app project management configuration +export LINEAR__API_TOKEN= + # s3 bucket name and filesystem targets for media backups export MEDIA_SYNC__S3_BUCKET=yage # from local export MEDIA_SYNC__TARGETS=( @@ -24,24 +51,6 @@ export MEDIA_SYNC__TARGETS=( Archives/recordings ) - -# details for a directus instance -export DIRECTUS__API_TOKEN= -export DIRECTUS__BASE_URL=https://heretic.directus.app # from local - -# details for discord bot -export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= - -# custom i3 configuration settings -export I3__BORDER_PIXEL_SIZE= -export I3__DMENU_FONT_SIZE= -export I3__GLOBAL_FONT_SIZE= -export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local - -# linear.app project management configuration -export LINEAR__API_TOKEN= - # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/local.blaziken b/config/scwrypts/env/local.blaziken index ad6b925..00ca499 100644 --- a/config/scwrypts/env/local.blaziken +++ b/config/scwrypts/env/local.blaziken @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 # from local export AWS_PROFILE=yage # from local @@ -11,24 +16,18 @@ export AWS_REGION=us-east-2 # from local # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local -# s3 bucket name and filesystem targets for media backups -export MEDIA_SYNC__S3_BUCKET=yage # from local -export MEDIA_SYNC__TARGETS=( - .local/share/dolphin-emu - Games/roms/gameboy-advance - Games/roms/gameboy-color - Media - Pictures -) - - # details for a directus instance export DIRECTUS__API_TOKEN= export DIRECTUS__BASE_URL=https://heretic.directus.app # from local # details for discord bot export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' # from local +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME= +export DISCORD__DEFAULT_WEBHOOK= # custom i3 configuration settings export I3__BORDER_PIXEL_SIZE= @@ -39,6 +38,16 @@ export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= +# s3 bucket name and filesystem targets for media backups +export MEDIA_SYNC__S3_BUCKET=yage # from local +export MEDIA_SYNC__TARGETS=( + .local/share/dolphin-emu + Games/roms/gameboy-advance + Games/roms/gameboy-color + Media + Pictures +) + # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/local.butterfree b/config/scwrypts/env/local.butterfree index a50931f..5c5ad14 100644 --- a/config/scwrypts/env/local.butterfree +++ b/config/scwrypts/env/local.butterfree @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 # from local export AWS_PROFILE=yage # from local @@ -11,6 +16,28 @@ export AWS_REGION=us-east-2 # from local # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local +# details for a directus instance +export DIRECTUS__API_TOKEN= +export DIRECTUS__BASE_URL=https://heretic.directus.app # from local + +# details for discord bot +export DISCORD__BOT_TOKEN= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' # from local +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME= +export DISCORD__DEFAULT_WEBHOOK= + +# custom i3 configuration settings +export I3__BORDER_PIXEL_SIZE=1 +export I3__DMENU_FONT_SIZE=20 +export I3__GLOBAL_FONT_SIZE=7 +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local + +# linear.app project management configuration +export LINEAR__API_TOKEN= + # s3 bucket name and filesystem targets for media backups export MEDIA_SYNC__S3_BUCKET=yage # from local export MEDIA_SYNC__TARGETS=( @@ -22,24 +49,6 @@ export MEDIA_SYNC__TARGETS=( Pictures ) - -# details for a directus instance -export DIRECTUS__API_TOKEN= -export DIRECTUS__BASE_URL=https://heretic.directus.app # from local - -# details for discord bot -export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= - -# custom i3 configuration settings -export I3__BORDER_PIXEL_SIZE=1 -export I3__DMENU_FONT_SIZE=20 -export I3__GLOBAL_FONT_SIZE=7 -export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local - -# linear.app project management configuration -export LINEAR__API_TOKEN= - # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/local.gardevoir b/config/scwrypts/env/local.gardevoir index 80a2d29..bdbed7f 100644 --- a/config/scwrypts/env/local.gardevoir +++ b/config/scwrypts/env/local.gardevoir @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 # from local export AWS_PROFILE=yage # from local @@ -11,22 +16,18 @@ export AWS_REGION=us-east-2 # from local # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local -# s3 bucket name and filesystem targets for media backups -export MEDIA_SYNC__S3_BUCKET=yage # from local -export MEDIA_SYNC__TARGETS=( - Documents - Media - Pictures -) - - # details for a directus instance export DIRECTUS__API_TOKEN= export DIRECTUS__BASE_URL=https://heretic.directus.app # from local # details for discord bot export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' # from local +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME= +export DISCORD__DEFAULT_WEBHOOK= # custom i3 configuration settings export I3__BORDER_PIXEL_SIZE= @@ -37,6 +38,14 @@ export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= +# s3 bucket name and filesystem targets for media backups +export MEDIA_SYNC__S3_BUCKET=yage # from local +export MEDIA_SYNC__TARGETS=( + Documents + Media + Pictures +) + # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/local.umbreon b/config/scwrypts/env/local.umbreon index b6f5936..2771bad 100644 --- a/config/scwrypts/env/local.umbreon +++ b/config/scwrypts/env/local.umbreon @@ -3,6 +3,11 @@ ### scwrypts runtime configuration ################################## ##################################################################### +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 # from local export AWS_PROFILE=yage # from local @@ -11,23 +16,18 @@ export AWS_REGION=us-east-2 # from local # fully-qualified path to mount the EFS drive export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local -# s3 bucket name and filesystem targets for media backups -export MEDIA_SYNC__S3_BUCKET=yage # from local -export MEDIA_SYNC__TARGETS=( - .porn - Documents - Media - Pictures -) - - # details for a directus instance export DIRECTUS__API_TOKEN= export DIRECTUS__BASE_URL=https://heretic.directus.app # from local # details for discord bot export DISCORD__BOT_TOKEN= -export DISCORD__DEFAULT_CHANNEL= +export DISCORD__CONTENT_FOOTER= +export DISCORD__CONTENT_HEADER='<@380809228450922507> ' # from local +export DISCORD__DEFAULT_AVATAR_URL=https://heretic.directus.app/assets/9c975a20-d6f3-47f5-8f77-74014f5d0024 +export DISCORD__DEFAULT_CHANNEL_ID= +export DISCORD__DEFAULT_USERNAME=umbreon +export DISCORD__DEFAULT_WEBHOOK= # custom i3 configuration settings export I3__BORDER_PIXEL_SIZE=3 @@ -38,6 +38,15 @@ export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= +# s3 bucket name and filesystem targets for media backups +export MEDIA_SYNC__S3_BUCKET=yage # from local +export MEDIA_SYNC__TARGETS=( + .porn + Documents + Media + Pictures +) + # redis connection credentials export REDIS_AUTH= export REDIS_HOST= diff --git a/config/scwrypts/env/test b/config/scwrypts/env/test new file mode 100644 index 0000000..8a2067b --- /dev/null +++ b/config/scwrypts/env/test @@ -0,0 +1,53 @@ +#!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### + +# whether or not to deploy to production (0 = dev (default), 1 = prod) +export IN_PRODUCTION= + +##################################################################### + +# standard AWS environment variables used by awscli and other tools +export AWS_ACCOUNT= +export AWS_PROFILE= +export AWS_REGION= + +# fully-qualified path to mount the EFS drive +export AWS__EFS__LOCAL_MOUNT_POINT= + +# details for a directus instance +export DIRECTUS__API_TOKEN= +export DIRECTUS__BASE_URL= + +# details for discord bot +export DISCORD__BOT_TOKEN= +export DISCORD__DEFAULT_AVATAR_URL= +export DISCORD__DEFAULT_CHANNEL_ID= + +# custom i3 configuration settings +export I3__BORDER_PIXEL_SIZE=3 +export I3__DMENU_FONT_SIZE=18 +export I3__GLOBAL_FONT_SIZE=16 +export I3__MODEL_CONFIG= + +# linear.app project management configuration +export LINEAR__API_TOKEN= + +# s3 bucket name and filesystem targets for media backups +export MEDIA_SYNC__S3_BUCKET= +export MEDIA_SYNC__TARGETS=(_____ .porn_____ Documents_____ Media_____ Pictures_____)_____ + +# redis connection credentials +export REDIS_AUTH= +export REDIS_HOST= +export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID= +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/tmux.conf b/config/tmux.conf index e6d2871..2c1b1ed 100644 --- a/config/tmux.conf +++ b/config/tmux.conf @@ -23,7 +23,7 @@ set -g mouse off set -g status-style fg=brightmagenta,bg=black set -g window-status-current-style fg=black,bg=brightmagenta -set -g status-right "#(cat /sys/class/power_supply/BAT0/capacity)% | #[fg=magneta]%d %b %R" +set -g status-right "#(cat /sys/class/power_supply/BAT0/capacity)% | #[fg=magneta]%d %b %R | #(ip address 2>&1 | grep wlp0 | sed -n 's/^.*\\(192.[^/]*\\)\\/.*$/\\1/p') " ##################################################################### diff --git a/zsh/plugins/scwrypts b/zsh/plugins/scwrypts index 7617c93..6c546eb 160000 --- a/zsh/plugins/scwrypts +++ b/zsh/plugins/scwrypts @@ -1 +1 @@ -Subproject commit 7617c938b13508e10260ca8325ecbc394c5ac0d1 +Subproject commit 6c546ebb6fac66b28e1c1d5588a88ca5f78798aa