- added sync media directories
- zsh plugin update
This commit is contained in:
yage 2022-02-10 11:12:21 -07:00 committed by yage
parent 6f7fca0029
commit 4c274248f1
12 changed files with 43 additions and 30 deletions

View File

@ -19,29 +19,29 @@ esac
##################################################################### #####################################################################
PULL_MEDIA() { PULL_MEDIA() {
local TARGET="$1"
local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1" local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1"
local LOCAL_TARGET="$HOME/$1" local LOCAL_TARGET="$HOME/$1"
local FLAGS=()
[ ! -d $LOCAL_TARGET ] && mkdir -p $LOCAL_TARGET [ ! -d $LOCAL_TARGET ] && mkdir -p $LOCAL_TARGET
local DELETE="$2" local DELETE="$2"
[ $DELETE ] && FLAGS=--delete [ $DELETE ] && FLAGS+=--delete
CHECK "downloading latest $1" CHECK "downloading latest $1"
aws --profile $DOTWRYN_AWS_PROFILE \ aws --profile $DOTWRYN_AWS_PROFILE \
s3 sync $REMOTE_TARGET $LOCAL_TARGET \ s3 sync $REMOTE_TARGET $LOCAL_TARGET \
$FLAGS >/dev/null 2>&1 \ $FLAGS \
&& OK || WARN && OK || WARN
} }
PUSH_MEDIA() { PUSH_MEDIA() {
local TARGET="$1"
local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1" local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1"
local LOCAL_TARGET="$HOME/$1" local LOCAL_TARGET="$HOME/$1"
local FLAGS=()
local DELETE="$2" local DELETE="$2"
[ $DELETE ] && FLAGS=--delete [ $DELETE ] && FLAGS+=--delete
CHECK "uploading $1" CHECK "uploading $1"
aws --profile $DOTWRYN_AWS_PROFILE \ aws --profile $DOTWRYN_AWS_PROFILE \

View File

@ -26,6 +26,8 @@ CLIENT_CLASS="${@:2}"
XFFSET=0.0 XFFSET=0.0
YFFSET=0.0 YFFSET=0.0
FACTOR=0.8 FACTOR=0.8
xrandr | grep primary | awk '{print $4;}' | grep -q '^3840' \
&& FACTOR=0.5
case $APPLICATION in case $APPLICATION in
pavucontrol ) FACTOR=0.4 YFFSET=200 ;; pavucontrol ) FACTOR=0.4 YFFSET=200 ;;
esac esac

View File

@ -17,7 +17,7 @@ case $COMMAND in
lock ) $DOTWRYN/bin/i3lock ;; lock ) $DOTWRYN/bin/i3lock ;;
bgrandomize ) $DOTWRYN/bin/randomize-background ;; bgrandomize ) $DOTWRYN/bin/set-background random ;;
alternateterm ) $DOTWRYN/bin/kitty/alternate-theme ;; alternateterm ) $DOTWRYN/bin/kitty/alternate-theme ;;

View File

@ -1,5 +0,0 @@
#!/bin/zsh
source "$HOME/.config/wryn/env.zsh"
[ -d "$WALLPAPER_PATH" ] \
&& feh --recursive --randomize --bg-fill "$WALLPAPER_PATH"

14
bin/set-background Executable file
View File

@ -0,0 +1,14 @@
#!/bin/zsh
source "$HOME/.config/wryn/env.zsh"
[ ! -d $WALLPAPER_PATH ] && exit 1
case $1 in
random )
feh --recursive --randomize --bg-fill $WALLPAPER_PATH
;;
* )
[ ! -f $WALLPAPER_PATH/$1 ] && exit 2
feh --bg-fill $WALLPAPER_PATH/$1
;;
esac

View File

@ -2,12 +2,12 @@
source ${0:a:h}/common source ${0:a:h}/common
xrandr \ xrandr \
--output HDMI-0 \ --output DP-0 \
--primary \ --primary \
--mode 3840x2160 \ --mode 3840x2160 \
--rotate normal \ --rotate normal \
--pos 0x0 \ --pos 0x0 \
; ;
$DOTWRYN/bin/randomize-background $DOTWRYN/bin/set-background random
PLAY_SFX login PLAY_SFX login

View File

@ -44,7 +44,7 @@ DISCONNECT_OTHER() {
done done
sleep 1 sleep 1
$DOTWRYN/bin/randomize-background $DOTWRYN/bin/set-background random
[ $SFX ] && ( PLAY_SFX $SFX ) & [ $SFX ] && ( PLAY_SFX $SFX ) &
return 0 return 0

View File

@ -34,7 +34,7 @@ bindsym $mod+c exec --no-startup-id $UTILS launch google-voice-desktop
bindsym $mod+m exec --no-startup-id $UTILS launch youtubemusic-nativefier bindsym $mod+m exec --no-startup-id $UTILS launch youtubemusic-nativefier
bindsym $mod+a exec --no-startup-id $UTILS launch pavucontrol ^Pavucontrol bindsym $mod+a exec --no-startup-id $UTILS launch pavucontrol ^Pavucontrol
bindsym $mod+Shift+p exec --no-startup-id $UTILS launch scrcpy bindsym $mod+Shift+p exec --no-startup-id $UTILS launch scrcpy
bindsym $mod+Shift+s exec --no-startup-id $UTILS launch slack ^Slack bindsym $mod+Shift+o exec --no-startup-id $UTILS launch obs ^obs
# Terminal # Terminal
bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+Return exec i3-sensible-terminal

26
setup/env/env.zsh vendored
View File

@ -31,18 +31,20 @@ DOTWRYN_AWS_OUTPUT='json'
S3_SYNC_AWS_PROFILE=$DOTWRYN_AWS_PROFILE S3_SYNC_AWS_PROFILE=$DOTWRYN_AWS_PROFILE
S3_SYNC_BUCKET='yage' S3_SYNC_BUCKET='yage'
S3_SYNC_MEDIA=( S3_SYNC_MEDIA=(
#".local/share/dolphin-emu" #'.local/share/dolphin-emu'
#"Games/roms" #'.porn'
#"Games/wrynscape" #'Documents'
"Documents" #'Games/roms'
"Media/fe10-radiant-dawn-ost" #'Games/wrynscape'
"Media/fiesta-online-ost" #'Media/commission'
"Media/sfx" 'Media/fe10-radiant-dawn-ost'
"Pictures/bg" 'Media/fiesta-online-ost'
"Pictures/bg-archives" 'Media/sfx'
"Pictures/custom-emoji" 'Pictures/bg'
"Pictures/jest" 'Pictures/bg-archives'
"Pictures/profile" 'Pictures/custom-emoji'
'Pictures/jest'
'Pictures/profile'
) )

@ -1 +1 @@
Subproject commit 854e69c134da89f41e9149dc3263b6bd86acb947 Subproject commit 2bd10bf9fd72a5855f8ed10a4cf43d453dfaabd8

@ -1 +1 @@
Subproject commit c5c6e1d82910fb24072a10855c03e31ea2c51563 Subproject commit e3fae7478fc365a04a06b9972b04766ffed78c1c

@ -1 +1 @@
Subproject commit 734684e683eb70f5241fe419757baa347d5c6ccb Subproject commit 3ad9f0667f8ae682fe7d8880f1087e8fce0f0a84