diff --git a/config/dotwryn.env.zsh b/config/dotwryn.env.zsh index 483b89a..93076ef 100644 --- a/config/dotwryn.env.zsh +++ b/config/dotwryn.env.zsh @@ -9,7 +9,7 @@ export WALLPAPER_PATH="$HOME/Pictures/bg" export SOURCE_PACKAGES="$HOME/.local/share/source-packages" -export DOTWRYN_UTILS="$DOTWRYN/zsh/plugins/scwrypts/zsh/utils/utils.module.zsh" +export DOTWRYN_UTILS="$DOTWRYN/zsh/plugins/scwrypts/zsh/lib/utils/utils.module.zsh" RELOAD_ZSH_UTILS() { source $DOTWRYN_UTILS; } [ ! $DOTWRYN_UTILS_LOADED ] && RELOAD_ZSH_UTILS && export DOTWRYN_UTILS_LOADED=1 diff --git a/config/scwrypts/config b/config/scwrypts/config.zsh similarity index 100% rename from config/scwrypts/config rename to config/scwrypts/config.zsh diff --git a/config/scwrypts/dotfiles.zsh b/config/scwrypts/dotfiles.zsh index f0698f4..c52f64c 100644 --- a/config/scwrypts/dotfiles.zsh +++ b/config/scwrypts/dotfiles.zsh @@ -24,14 +24,14 @@ $DOTWRYN/config/mssqlcli.conf mssqlci/config $DOTWRYN/config/pgcli.conf pgcli/config $DOTWRYN/config/pylint.conf pylintrc $DOTWRYN/config/ripgrep.conf ripgrep/config -$DOTWRYN/config/scwrypts/config scwrypts/config +$DOTWRYN/config/scwrypts/config.zsh scwrypts/config.zsh $DOTWRYN/config/scwrypts/dotfiles.zsh scwrypts/dotfiles.zsh -$DOTWRYN/config/scwrypts/env/local scwrypts/env/local -$DOTWRYN/config/scwrypts/env/local.altaria scwrypts/env/local.altaria -$DOTWRYN/config/scwrypts/env/local.blaziken scwrypts/env/local.blaziken -$DOTWRYN/config/scwrypts/env/local.butterfree scwrypts/env/local.butterfree -$DOTWRYN/config/scwrypts/env/local.gardevoir scwrypts/env/local.gardevoir -$DOTWRYN/config/scwrypts/env/local.umbreon scwrypts/env/local.umbreon +$DOTWRYN/config/scwrypts/env/local scwrypts/environments/local +$DOTWRYN/config/scwrypts/env/local.altaria scwrypts/environments/local.altaria +$DOTWRYN/config/scwrypts/env/local.blaziken scwrypts/environments/local.blaziken +$DOTWRYN/config/scwrypts/env/local.butterfree scwrypts/environments/local.butterfree +$DOTWRYN/config/scwrypts/env/local.gardevoir scwrypts/environments/local.gardevoir +$DOTWRYN/config/scwrypts/env/local.umbreon scwrypts/environments/local.umbreon $DOTWRYN/config/scwrypts/vundle.zsh scwrypts/vundle.zsh $DOTWRYN/config/tmux.conf tmux/tmux.conf $DOTWRYN/config/xcompose.conf X11/xcompose diff --git a/config/scwrypts/env/local b/config/scwrypts/env/local index 3eede64..5923b36 100644 --- a/config/scwrypts/env/local +++ b/config/scwrypts/env/local @@ -1,4 +1,7 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools export AWS_ACCOUNT=088935110352 @@ -12,6 +15,14 @@ export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage export AWS__S3__MEDIA_BUCKET=yage export AWS__S3__MEDIA_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= + # custom i3 configuration settings export I3__BORDER_PIXEL_SIZE= export I3__DMENU_FONT_SIZE= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/env/local.altaria b/config/scwrypts/env/local.altaria index 198861f..e7418cc 100644 --- a/config/scwrypts/env/local.altaria +++ b/config/scwrypts/env/local.altaria @@ -1,22 +1,33 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools -export AWS_ACCOUNT=088935110352 # inherited from local -export AWS_PROFILE=yage # inherited from local -export AWS_REGION=us-east-2 # inherited from local +export AWS_ACCOUNT=088935110352 # from local +export AWS_PROFILE=yage # from local +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 # inherited from local +export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local # s3 bucket name and filesystem targets for media backups -export AWS__S3__MEDIA_BUCKET=yage # inherited from local +export AWS__S3__MEDIA_BUCKET=yage # from local export AWS__S3__MEDIA_TARGETS='.local/share/dolphin-emu,.porn,Games/roms,Games/wrynscape,Documents,Media,Pictures,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 # inherited from local +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 # from local +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/env/local.blaziken b/config/scwrypts/env/local.blaziken index 2bb443a..c45fed8 100644 --- a/config/scwrypts/env/local.blaziken +++ b/config/scwrypts/env/local.blaziken @@ -1,22 +1,33 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools -export AWS_ACCOUNT=088935110352 # inherited from local -export AWS_PROFILE=yage # inherited from local -export AWS_REGION=us-east-2 # inherited from local +export AWS_ACCOUNT=088935110352 # from local +export AWS_PROFILE=yage # from local +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 # inherited from local +export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local # s3 bucket name and filesystem targets for media backups -export AWS__S3__MEDIA_BUCKET=yage # inherited from local +export AWS__S3__MEDIA_BUCKET=yage # from local export AWS__S3__MEDIA_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= + # 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 # inherited from local +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 # from local +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/env/local.butterfree b/config/scwrypts/env/local.butterfree index 2836fb2..e29b41b 100644 --- a/config/scwrypts/env/local.butterfree +++ b/config/scwrypts/env/local.butterfree @@ -1,22 +1,33 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools -export AWS_ACCOUNT=088935110352 # inherited from local -export AWS_PROFILE=yage # inherited from local -export AWS_REGION=us-east-2 # inherited from local +export AWS_ACCOUNT=088935110352 # from local +export AWS_PROFILE=yage # from local +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 # inherited from local +export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local # s3 bucket name and filesystem targets for media backups -export AWS__S3__MEDIA_BUCKET=yage # inherited from local +export AWS__S3__MEDIA_BUCKET=yage # from local export AWS__S3__MEDIA_TARGETS='.local/share/dolphin-emu,Games/roms,Games/wrynscape,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= + # 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 # inherited from local +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 # from local +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/env/local.gardevoir b/config/scwrypts/env/local.gardevoir index 05bfa9b..3faf25b 100644 --- a/config/scwrypts/env/local.gardevoir +++ b/config/scwrypts/env/local.gardevoir @@ -1,22 +1,33 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools -export AWS_ACCOUNT=088935110352 # inherited from local -export AWS_PROFILE=yage # inherited from local -export AWS_REGION=us-east-2 # inherited from local +export AWS_ACCOUNT=088935110352 # from local +export AWS_PROFILE=yage # from local +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 # inherited from local +export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local # s3 bucket name and filesystem targets for media backups -export AWS__S3__MEDIA_BUCKET=yage # inherited from local +export AWS__S3__MEDIA_BUCKET=yage # from local export AWS__S3__MEDIA_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= + # 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 # inherited from local +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 # from local +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/env/local.umbreon b/config/scwrypts/env/local.umbreon index 72b7e5e..2f29e94 100644 --- a/config/scwrypts/env/local.umbreon +++ b/config/scwrypts/env/local.umbreon @@ -1,22 +1,33 @@ #!/bin/zsh +##################################################################### +### scwrypts runtime configuration ################################## +##################################################################### # standard AWS environment variables used by awscli and other tools -export AWS_ACCOUNT=088935110352 # inherited from local -export AWS_PROFILE=yage # inherited from local -export AWS_REGION=us-east-2 # inherited from local +export AWS_ACCOUNT=088935110352 # from local +export AWS_PROFILE=yage # from local +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 # inherited from local +export AWS__EFS__LOCAL_MOUNT_POINT=/mnt/efs/yage # from local # s3 bucket name and filesystem targets for media backups -export AWS__S3__MEDIA_BUCKET=yage # inherited from local +export AWS__S3__MEDIA_BUCKET=yage # from local export AWS__S3__MEDIA_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= + # 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=$DOTWRYN/config/i3.conf # inherited from local +export I3__MODEL_CONFIG=$DOTWRYN/config/i3.conf # from local # linear.app project management configuration export LINEAR__API_TOKEN= @@ -25,3 +36,12 @@ export LINEAR__API_TOKEN= export REDIS_AUTH= export REDIS_HOST= export REDIS_PORT= + +# twilio account / credentials +export TWILIO__ACCOUNT_SID=ACac926b109b3cd8a78685a2a0994d0271 # from local +export TWILIO__API_KEY= +export TWILIO__API_SECRET= +export TWILIO__DEFAULT_PHONE_FROM= +export TWILIO__DEFAULT_PHONE_TO= + +##################################################################### diff --git a/config/scwrypts/vundle.zsh b/config/scwrypts/vundle.zsh index 2e67dae..60a4fe6 100644 --- a/config/scwrypts/vundle.zsh +++ b/config/scwrypts/vundle.zsh @@ -12,3 +12,35 @@ VUNDLE_BUILD__vim-surround() {} VUNDLE_BUILD__vim-hexokinase() { make hexokinase; } VUNDLE_BUILD__youcompleteme() { ./install.py --all; } + +VUNDLE__BUILD__ale() { + # ... build steps from /home/w0ryn/.vim/ale +} + +VUNDLE__BUILD__nerdtree() { + # ... build steps from /home/w0ryn/.vim/nerdtree +} + +VUNDLE__BUILD__vim-dim() { + # ... build steps from /home/w0ryn/.vim/vim-dim +} + +VUNDLE__BUILD__vim-fugitive() { + # ... build steps from /home/w0ryn/.vim/vim-fugitive +} + +VUNDLE__BUILD__vim-go() { + # ... build steps from /home/w0ryn/.vim/vim-go +} + +VUNDLE__BUILD__vim-hexokinase() { + # ... build steps from /home/w0ryn/.vim/vim-hexokinase +} + +VUNDLE__BUILD__vim-surround() { + # ... build steps from /home/w0ryn/.vim/vim-surround +} + +VUNDLE__BUILD__youcompleteme() { + # ... build steps from /home/w0ryn/.vim/youcompleteme +} diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add index a9b22ff..4c95ef6 100644 --- a/vim/en.utf-8.add +++ b/vim/en.utf-8.add @@ -109,3 +109,5 @@ Kubernetes NodeGroup rEFInd Kat +submodule +submodules diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl index 54e996d..7db50a1 100644 Binary files a/vim/en.utf-8.add.spl and b/vim/en.utf-8.add.spl differ diff --git a/vim/formatting.vim b/vim/formatting.vim index dce752e..77023c6 100644 --- a/vim/formatting.vim +++ b/vim/formatting.vim @@ -54,7 +54,7 @@ augroup filetype_specific_formatting autocmd FileType json call FormatFileType(2, v:false, 'indent', 99, v:false) augroup end -let g:markdown_fenced_languages = ['javascript', 'json', 'python', 'bash', 'yaml', 'shell=zsh'] +let g:markdown_fenced_languages = ['javascript', 'json', 'python', 'bash', 'yaml', 'shell=zsh', 'sql'] " }}}