diff --git a/bin/aws/s3/sync-media b/bin/aws/s3/sync-media index 3453256..63f94fc 100755 --- a/bin/aws/s3/sync-media +++ b/bin/aws/s3/sync-media @@ -19,29 +19,29 @@ esac ##################################################################### PULL_MEDIA() { - local TARGET="$1" local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1" local LOCAL_TARGET="$HOME/$1" + local FLAGS=() [ ! -d $LOCAL_TARGET ] && mkdir -p $LOCAL_TARGET local DELETE="$2" - [ $DELETE ] && FLAGS=--delete + [ $DELETE ] && FLAGS+=--delete CHECK "downloading latest $1" aws --profile $DOTWRYN_AWS_PROFILE \ s3 sync $REMOTE_TARGET $LOCAL_TARGET \ - $FLAGS >/dev/null 2>&1 \ + $FLAGS \ && OK || WARN } PUSH_MEDIA() { - local TARGET="$1" local REMOTE_TARGET="s3://$S3_SYNC_BUCKET/$1" local LOCAL_TARGET="$HOME/$1" + local FLAGS=() local DELETE="$2" - [ $DELETE ] && FLAGS=--delete + [ $DELETE ] && FLAGS+=--delete CHECK "uploading $1" aws --profile $DOTWRYN_AWS_PROFILE \ diff --git a/bin/i3/launch-or-show b/bin/i3/launch-or-show index ac238f6..7a43687 100755 --- a/bin/i3/launch-or-show +++ b/bin/i3/launch-or-show @@ -26,6 +26,8 @@ CLIENT_CLASS="${@:2}" XFFSET=0.0 YFFSET=0.0 FACTOR=0.8 +xrandr | grep primary | awk '{print $4;}' | grep -q '^3840' \ + && FACTOR=0.5 case $APPLICATION in pavucontrol ) FACTOR=0.4 YFFSET=200 ;; esac diff --git a/bin/i3/utils b/bin/i3/utils index 38931f7..6e45674 100755 --- a/bin/i3/utils +++ b/bin/i3/utils @@ -17,7 +17,7 @@ case $COMMAND in lock ) $DOTWRYN/bin/i3lock ;; - bgrandomize ) $DOTWRYN/bin/randomize-background ;; + bgrandomize ) $DOTWRYN/bin/set-background random ;; alternateterm ) $DOTWRYN/bin/kitty/alternate-theme ;; diff --git a/bin/randomize-background b/bin/randomize-background deleted file mode 100755 index fa79746..0000000 --- a/bin/randomize-background +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/zsh -source "$HOME/.config/wryn/env.zsh" - -[ -d "$WALLPAPER_PATH" ] \ - && feh --recursive --randomize --bg-fill "$WALLPAPER_PATH" diff --git a/bin/set-background b/bin/set-background new file mode 100755 index 0000000..8fcd691 --- /dev/null +++ b/bin/set-background @@ -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 diff --git a/bin/xorg/altaria/hdmi4k b/bin/xorg/altaria/hdmi4k index a01e576..393ff02 100755 --- a/bin/xorg/altaria/hdmi4k +++ b/bin/xorg/altaria/hdmi4k @@ -2,12 +2,12 @@ source ${0:a:h}/common xrandr \ - --output HDMI-0 \ + --output DP-0 \ --primary \ --mode 3840x2160 \ --rotate normal \ --pos 0x0 \ ; -$DOTWRYN/bin/randomize-background +$DOTWRYN/bin/set-background random PLAY_SFX login diff --git a/bin/xorg/butterfree/common b/bin/xorg/butterfree/common index 6d576cc..98a5084 100644 --- a/bin/xorg/butterfree/common +++ b/bin/xorg/butterfree/common @@ -44,7 +44,7 @@ DISCONNECT_OTHER() { done sleep 1 - $DOTWRYN/bin/randomize-background + $DOTWRYN/bin/set-background random [ $SFX ] && ( PLAY_SFX $SFX ) & return 0 diff --git a/config/i3.conf b/config/i3.conf index 587aaeb..201488d 100644 --- a/config/i3.conf +++ b/config/i3.conf @@ -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+a exec --no-startup-id $UTILS launch pavucontrol ^Pavucontrol 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 bindsym $mod+Return exec i3-sensible-terminal diff --git a/setup/env/env.zsh b/setup/env/env.zsh index d4fe029..2d28171 100644 --- a/setup/env/env.zsh +++ b/setup/env/env.zsh @@ -31,18 +31,20 @@ DOTWRYN_AWS_OUTPUT='json' S3_SYNC_AWS_PROFILE=$DOTWRYN_AWS_PROFILE S3_SYNC_BUCKET='yage' S3_SYNC_MEDIA=( - #".local/share/dolphin-emu" - #"Games/roms" - #"Games/wrynscape" - "Documents" - "Media/fe10-radiant-dawn-ost" - "Media/fiesta-online-ost" - "Media/sfx" - "Pictures/bg" - "Pictures/bg-archives" - "Pictures/custom-emoji" - "Pictures/jest" - "Pictures/profile" + #'.local/share/dolphin-emu' + #'.porn' + #'Documents' + #'Games/roms' + #'Games/wrynscape' + #'Media/commission' + 'Media/fe10-radiant-dawn-ost' + 'Media/fiesta-online-ost' + 'Media/sfx' + 'Pictures/bg' + 'Pictures/bg-archives' + 'Pictures/custom-emoji' + 'Pictures/jest' + 'Pictures/profile' ) diff --git a/zsh/plugins/code-activator b/zsh/plugins/code-activator index 854e69c..2bd10bf 160000 --- a/zsh/plugins/code-activator +++ b/zsh/plugins/code-activator @@ -1 +1 @@ -Subproject commit 854e69c134da89f41e9149dc3263b6bd86acb947 +Subproject commit 2bd10bf9fd72a5855f8ed10a4cf43d453dfaabd8 diff --git a/zsh/plugins/fzf-tab b/zsh/plugins/fzf-tab index c5c6e1d..e3fae74 160000 --- a/zsh/plugins/fzf-tab +++ b/zsh/plugins/fzf-tab @@ -1 +1 @@ -Subproject commit c5c6e1d82910fb24072a10855c03e31ea2c51563 +Subproject commit e3fae7478fc365a04a06b9972b04766ffed78c1c diff --git a/zsh/plugins/ssh b/zsh/plugins/ssh index 734684e..3ad9f06 160000 --- a/zsh/plugins/ssh +++ b/zsh/plugins/ssh @@ -1 +1 @@ -Subproject commit 734684e683eb70f5241fe419757baa347d5c6ccb +Subproject commit 3ad9f0667f8ae682fe7d8880f1087e8fce0f0a84