diff --git a/config/i3.conf b/config/i3.conf index 93f0ef9..53dcfad 100644 --- a/config/i3.conf +++ b/config/i3.conf @@ -86,7 +86,7 @@ bindsym $mod+6 workspace number "6"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+7 workspace number "7"; exec --no-startup-id polybar-msg cmd show bindsym $mod+8 workspace number "8"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+9 workspace number "9"; exec --no-startup-id polybar-msg cmd show -bindsym $mod+0 workspace number "0"; exec --no-startup-id polybar-msg cmd hide +bindsym $mod+0 workspace "🎧"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+g workspace "🎮"; exec --no-startup-id polybar-msg cmd hide bindsym $mod+Shift+1 move container to workspace number "1" @@ -98,7 +98,7 @@ bindsym $mod+Shift+6 move container to workspace number "6" bindsym $mod+Shift+7 move container to workspace number "7" bindsym $mod+Shift+8 move container to workspace number "8" bindsym $mod+Shift+9 move container to workspace number "9" -bindsym $mod+Shift+0 move container to workspace number "0" +bindsym $mod+Shift+0 move container to workspace "🎧" bindsym $mod+Shift+g move container to workspace "🎮" mode "resize" { diff --git a/config/local/altaria/bin/apps.midi b/config/local/altaria/bin/apps.midi index 90624be..8003d78 100755 --- a/config/local/altaria/bin/apps.midi +++ b/config/local/altaria/bin/apps.midi @@ -1,6 +1,6 @@ #!/bin/zsh -cd $HOME/Projects/python/xorg-midi/code +cd ${XDG_DATA_HOME:-${HOME}/.local/share}/project-source-code/python/xorg-midi/code source ../env/bin/activate ./midi-controller diff --git a/config/local/altaria/bin/beeg-game b/config/local/altaria/bin/beeg-game index 4264c30..7239899 100755 --- a/config/local/altaria/bin/beeg-game +++ b/config/local/altaria/bin/beeg-game @@ -1,12 +1,15 @@ #!/bin/zsh -source ${0:a:h}/xorg.zsh +source ${0:a:h}/xorg.zsh $@ -xrandr --output $XRANDR_OUTPUT__smol --off +#DISABLE+=(livingroom) +DISABLE+=(bedroom) +DISABLE+=(smol) + +XRANDR_OFF ${DISABLE[@]} XRANDR_SET \ - --compositing disable \ + --compositing enable \ --screen-blank disable \ - --background roy-art.jpg \ --sound-effect gamedock \ - ${XRANDR_ARGS__livingroom__1440p[@]} --pos 0x0 --primary \ + ${XRANDR_ARGS__livingroom[@]} --pos 0x0 --primary \ ; diff --git a/config/local/altaria/bin/default b/config/local/altaria/bin/default index 9dadc5b..95bba72 100755 --- a/config/local/altaria/bin/default +++ b/config/local/altaria/bin/default @@ -1,21 +1,33 @@ #!/bin/zsh -source ${0:a:h}/xorg.zsh +[ $1 ] && RESOLUTION=$1 || RESOLUTION=2k +source ${0:a:h}/xorg.zsh ${RESOLUTION} ${@:2} case $MONITOR_CONFIGURATION in - home ) + ( home ) XRANDR_SET \ + --compositing enable \ --screen-blank disable \ - ${XRANDR_ARGS__smol__1440p[@]} --pos 0x0 --primary --rate 120.00 \ - ${XRANDR_ARGS__livingroom__1440p[@]} --pos 0x0 \ - ; - + --sound-effect login \ + --background ${I3_DEFAULT_THEME_BACKGROUND} \ + ${XRANDR_ARGS__livingroom[@]} --pos 0x0 \ + ${XRANDR_ARGS__bedroom[@]} --pos 0x0 \ + ${XRANDR_ARGS__smol[@]} --pos 0x0 --primary \ ;; - unknown ) + + ( unknown ) # temporary office setup + xrandr --output DP-4 --mode 2560x1440 --pos 0x0 --primary + scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg + scwrypts desktop screen blank -- disable + "${DOTWRYN}/bin/polybar" + return 0 + ;; + + ( unknown ) echo 'unknown state; using default configuration to prevent monitor issues' xrandr --output $(xrandr | grep ' connected' | awk '{print $1;}') --primary scwrypts desktop i3 set background -- $(scwrypts -n get theme).jpg - $DOTWRYN/bin/polybar - scwrypts desktop play sfx -- login + "$DOTWRYN/bin/polybar" + scwrypts desktop play sound -- login return 0 ;; esac diff --git a/config/local/altaria/bin/smol-game b/config/local/altaria/bin/smol-game index f9d83da..e2e0c24 100755 --- a/config/local/altaria/bin/smol-game +++ b/config/local/altaria/bin/smol-game @@ -1,12 +1,15 @@ #!/bin/zsh -source ${0:a:h}/xorg.zsh +source ${0:a:h}/xorg.zsh $@ -xrandr --output $XRANDR_OUTPUT__livingroom --off +DISABLE+=(livingroom) +DISABLE+=(bedroom) +#DISABLE+=(smol) + +XRANDR_OFF ${DISABLE[@]} XRANDR_SET \ --compositing enable \ --screen-blank disable \ --sound-effect gamedock \ - ${XRANDR_ARGS__smol__1440p[@]} --pos 0x0 --rate 180.00 --primary \ + ${XRANDR_ARGS__smol[@]} --pos 0x0 --primary \ ; - diff --git a/config/local/altaria/bin/xorg.zsh b/config/local/altaria/bin/xorg.zsh index 72eaeca..ab45e24 100644 --- a/config/local/altaria/bin/xorg.zsh +++ b/config/local/altaria/bin/xorg.zsh @@ -1,70 +1,123 @@ #!/bin/zsh -source $HOME/.config/wryn/env.zsh - -export DISPLAY=:0 - ##################################################################### -XRANDR_RESOLUTION__4k='3840x2160' -XRANDR_RESOLUTION__1440p='2560x1440' -XRANDR_RESOLUTION__1080p='1920x1080' - XRANDR_OUTPUT__livingroom='HDMI-0' +XRANDR_OUTPUT__bedroom='DP-0' XRANDR_OUTPUT__smol='DP-4' -XRANDR_ARGS__livingroom__4k=(--output $XRANDR_OUTPUT__livingroom --mode $XRANDR_RESOLUTION__4k --rate 119.88) -XRANDR_ARGS__livingroom__1440p=(--output $XRANDR_OUTPUT__livingroom --mode $XRANDR_RESOLUTION__1440p) -XRANDR_ARGS__livingroom__1080p=(--output $XRANDR_OUTPUT__livingroom --mode $XRANDR_RESOLUTION__1080p --rate 119.88) - -XRANDR_ARGS__smol__1440p=(--output $XRANDR_OUTPUT__smol --mode $XRANDR_RESOLUTION__1440p) -XRANDR_ARGS__smol__1080p=(--output $XRANDR_OUTPUT__smol --mode $XRANDR_RESOLUTION__1080p) - -##################################################################### +I3_DEFAULT_THEME_BACKGROUND=$(scwrypts -n get theme).jpg MONITOR_CONFIGURATION=unknown : \ - && xrandr --query | grep -q "^$XRANDR_OUTPUT__livingroom connected" \ - && xrandr --query | grep -q "^$XRANDR_OUTPUT__smol connected" \ + && xrandr --query | grep -q "^${XRANDR_OUTPUT__livingroom} connected" \ + && xrandr --query | grep -q "^${XRANDR_OUTPUT__bedroom} connected" \ + && xrandr --query | grep -q "^${XRANDR_OUTPUT__smol} connected" \ && MONITOR_CONFIGURATION=home \ ; +##################################################################### + +case $1 in + ( 1080 | 1080p ) + XRANDR_MODE=(--mode 1920x1080) + XRANDR_OFFSET_X=1920 + XRANDR_OFFSET_Y=1080 + + EXTRA_ARGS__livingroom=() + EXTRA_ARGS__bedroom=() + EXTRA_ARGS__smol=() + + I3_BACKGROUND=link-vs-gdizz.jpg + ;; + + ( 1440 | 1440p | 2k ) + XRANDR_MODE=(--mode 2560x1440) + XRANDR_OFFSET_X=2560 + XRANDR_OFFSET_Y=1440 + + EXTRA_ARGS__livingroom=() + EXTRA_ARGS__bedroom=() + EXTRA_ARGS__smol=() + + I3_BACKGROUND=roy-art.jpg + ;; + + ( 2160 | 2160p | 4k | '' ) # default for the RTX5080 + XRANDR_MODE=(--mode 3840x2160) + XRANDR_OFFSET_X=3840 + XRANDR_OFFSET_Y=2160 + + EXTRA_ARGS__livingroom=() + EXTRA_ARGS__bedroom=() + EXTRA_ARGS__smol=(--rate 239.99) + + I3_BACKGROUND=${I3_DEFAULT_THEME_BACKGROUND[@]} + ;; + + ( * ) + echo "error : unknown resolution '$1'" + exit 1 + ;; +esac + + +XRANDR_ARGS__livingroom=(--output ${XRANDR_OUTPUT__livingroom[@]} ${XRANDR_MODE[@]} ${EXTRA_ARGS__livingroom[@]}) +XRANDR_ARGS__bedroom=(--output ${XRANDR_OUTPUT__bedroom[@]} ${XRANDR_MODE[@]} ${EXTRA_ARGS__bedroom[@]}) +XRANDR_ARGS__smol=(--output ${XRANDR_OUTPUT__smol[@]} ${XRANDR_MODE[@]} ${EXTRA_ARGS__smol[@]}) + +########################################## + +source ${HOME}/.config/wryn/env.zsh +export DISPLAY=:0 + ############################################################################### +XRANDR_OFF() { + local MONITOR ARGS=() + for MONITOR in $@ + do + MONITOR="XRANDR_OUTPUT__${MONITOR}" + ARGS+=(--output ${(P)MONITOR} --off) + done + + xrandr ${ARGS[@]} +} + XRANDR_SET() { local ERRORS=0 local COMPOSITING=enable local SCREEN_BLANK=enable - local BACKGROUND=$(scwrypts -n get theme).jpg + local BACKGROUND=${I3_BACKGROUND} local SOUND_EFFECT=login local XRANDR_ARGS=() while [[ $# -gt 0 ]] do case $1 in - --compositing ) COMPOSITING="$2" ; shift 1 ;; - --screen-blank ) SCREEN_BLANK="$2" ; shift 1 ;; - --background ) BACKGROUND="$2" ; shift 1 ;; - --sound-effect ) SOUND_EFFECT="$2" ; shift 1 ;; + ( --compositing ) COMPOSITING="$2" ; shift 1 ;; + ( --screen-blank ) SCREEN_BLANK="$2" ; shift 1 ;; + ( --background ) BACKGROUND="$2" ; shift 1 ;; + ( --sound-effect ) SOUND_EFFECT="$2" ; shift 1 ;; - * ) XRANDR_ARGS+=($1) ; + ( * ) XRANDR_ARGS+=($1) ; esac shift 1 done - case $COMPOSITING in - enable ) (pkill compton; sleep 1; compton;) & ;; - disable ) pkill compton ;; + case ${COMPOSITING} in + ( enable ) (pkill compton; sleep 1; compton;) & ;; + ( disable ) pkill compton ;; * ) - echo "ERROR : invalid setting '$COMPOSITING' for compositing" >&2 + echo "ERROR : invalid setting '${COMPOSITING}' for compositing" >&2 return 1 esac - case $SCREEN_BLANK in + case ${SCREEN_BLANK} in enable | disable ) ;; * ) - echo "ERROR : invalid setting '$SCREEN_BLANK' for screen blank" >&2 + echo "ERROR : invalid setting '${SCREEN_BLANK}' for screen blank" >&2 return 1 esac @@ -77,8 +130,8 @@ XRANDR_SET() { sleep 1 - scwrypts desktop screen blank -- $SCREEN_BLANK - scwrypts desktop i3 set background -- $BACKGROUND || scwrypts desktop i3 set background -- purple.jpg - $DOTWRYN/bin/polybar - scwrypts desktop play sfx -- $SOUND_EFFECT + scwrypts desktop screen blank -- ${SCREEN_BLANK} + scwrypts desktop i3 set background -- ${BACKGROUND} || scwrypts desktop i3 set background -- purple.jpg + "${DOTWRYN}/bin/polybar" + scwrypts desktop play sound -- ${SOUND_EFFECT} } diff --git a/config/user/flameshot/flameshot.ini b/config/user/flameshot/flameshot.ini index abe3cb5..833bd38 100644 --- a/config/user/flameshot/flameshot.ini +++ b/config/user/flameshot/flameshot.ini @@ -2,8 +2,8 @@ contrastOpacity=188 contrastUiColor=#11bb98 disabledTrayIcon=false -drawColor=#e9a02f -drawThickness=15 +drawColor=#6911aa +drawThickness=9 filenamePattern=%Y-%m-%d_%I%H.SCREENSHOT saveAsFileExtension=png savePath=/home/w0ryn/Pictures/screenshot diff --git a/resume/resume.tex b/resume/resume.tex index 675cb34..5dd6511 100644 --- a/resume/resume.tex +++ b/resume/resume.tex @@ -97,7 +97,7 @@ Python \hfill JavaScript \hfill SH\hfill Go\hfill CLISP\hfill C / C++\hfill C\#\ \begin{Large}\textbf{\\Work History}\end{Large} -\textbf{Directus} \textit{(Fully Remote)}. Site Reliability Engineer \hfill April 2022 - Present +\textbf{Directus} \textit{(Fully Remote)}. Director of Infrastructure / SRE \hfill April 2022 - Present \begin{itemize}[noitemsep,topsep=0pt] \item Design, implement, and maintain a globally distributed, customer-facing software platform \item Optimize spend on cloud infrastructure across multiple providers, regions, and availability zones