diff --git a/config/altaria/user/alacritty/local.toml b/config/altaria/user/alacritty/local.toml new file mode 100644 index 0000000..e69de29 diff --git a/config/altaria/user/i3/local.yaml b/config/altaria/user/i3/local.yaml new file mode 100644 index 0000000..e69de29 diff --git a/config/altaria/user/polybar/local.ini b/config/altaria/user/polybar/local.ini new file mode 100644 index 0000000..e69de29 diff --git a/config/code-activator.conf b/config/code-activator.conf new file mode 100644 index 0000000..ca98c00 Binary files /dev/null and b/config/code-activator.conf differ diff --git a/config/colorschemes/active/getty.sh b/config/colorschemes/active/getty.sh index e7666bf..1757bd6 100644 --- a/config/colorschemes/active/getty.sh +++ b/config/colorschemes/active/getty.sh @@ -1,11 +1,11 @@ #!/bin/sh # do not edit; generated by scwrypts -# theme : main +# theme : spring-sunset # # source this file to apply colorscheme to linux getty # [[ "$TERM" =~ ^linux$ ]] || return 0 -/bin/echo -e " ]P0000505 ]P1c80064 ]P211bb98 ]P36911aa ]P42262bb ]P59922dd ]P622ccba ]P7d0f0f0 ]P8ff44ff ]P944dddd ]PAaa44ff ]PB229df6 ]PCdd88ff ]PD88ffff ]PEd0f0f0 ]PF7e707e " +/bin/echo -e " ]P00b1e32 ]P1f12875 ]P25c68c4 ]P3f2e044 ]P45ab5e0 ]P5f5e878 ]P67983ce ]P7e8eaf7 ]P8f694bc ]P99fa6dc ]PAf8ef9e ]PBb9e5f4 ]PCfbf5c4 ]PDc5c9ea ]PEd0f0f0 ]PF7e707e " [ ! $NO_CLEAR ] && clear return 0 sed $d diff --git a/config/colorschemes/active/name.txt b/config/colorschemes/active/name.txt index ba2906d..7e76c41 100644 --- a/config/colorschemes/active/name.txt +++ b/config/colorschemes/active/name.txt @@ -1 +1 @@ -main +spring-sunset diff --git a/config/colorschemes/active/rofi.rasi b/config/colorschemes/active/rofi.rasi index aba6a98..71dd2e1 100644 --- a/config/colorschemes/active/rofi.rasi +++ b/config/colorschemes/active/rofi.rasi @@ -1,14 +1,14 @@ /** * do not edit; generated by scwrypts - * theme : main + * theme : spring-sunset **/ *{ - background: #001129; + background: #0b1e32; foreground: #d0f0f0; - background-alt: #9922dd; + background-alt: #f5e878; foreground-alt: #000505; selected: #000505; - active: #6911aa; - urgent: #c80064; + active: #f2e044; + urgent: #f12875; } diff --git a/config/colorschemes/active/source.yaml b/config/colorschemes/active/source.yaml index edf1e6f..94fb27e 120000 --- a/config/colorschemes/active/source.yaml +++ b/config/colorschemes/active/source.yaml @@ -1 +1 @@ -../main.yaml \ No newline at end of file +../spring-sunset.yaml \ No newline at end of file diff --git a/config/i3.conf b/config/i3.conf index 53dcfad..2d6945d 100644 --- a/config/i3.conf +++ b/config/i3.conf @@ -157,8 +157,39 @@ bindsym $mod+Shift+c reload # i3-gaps settings for_window [class="^.*"] border pixel 4 -gaps inner 0 -gaps outer 0 +hide_edge_borders smart_no_gaps + +workspace "1" gaps inner 8 +workspace "1" gaps outer 8 + +workspace "2" gaps inner 0 +workspace "2" gaps outer 0 + +workspace "3" gaps inner 8 +workspace "3" gaps outer 8 + +workspace "4" gaps inner 0 +workspace "4" gaps outer 0 + +workspace "5" gaps inner 8 +workspace "5" gaps outer 8 + +workspace "6" gaps inner 0 +workspace "6" gaps outer 0 + +workspace "7" gaps inner 8 +workspace "7" gaps outer 8 + +workspace "8" gaps inner 0 +workspace "8" gaps outer 0 + +workspace "9" gaps inner 8 +workspace "9" gaps outer 8 + +workspace "🎧" gaps inner 0 +workspace "🎧" gaps outer 0 +workspace "🎮" gaps inner 0 +workspace "🎮" gaps outer 0 bindsym $mod+z gaps outer current plus 2; gaps inner current plus 2; diff --git a/config/i3.config.yaml b/config/i3.config.yaml index f2f154b..a927b84 100644 --- a/config/i3.config.yaml +++ b/config/i3.config.yaml @@ -14,8 +14,13 @@ application-launcher: >- # dmenu_run -c -l 5 -fn 'DejaVuSansMono Nerd Font-25' gaps: - inner: 0 - outer: 0 + odd: + inner: 8 + outer: 8 + + even: + inner: 0 + outer: 0 statusbar: # supported values are 'polybar' and 'i3status' diff --git a/config/local/altaria/bin/1080p-beeg-game b/config/local/altaria/bin/1080p-beeg-game deleted file mode 100755 index 30f7d6c..0000000 --- a/config/local/altaria/bin/1080p-beeg-game +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/zsh -source ${0:a:h}/xorg.zsh - -xrandr --output $XRANDR_OUTPUT__smol --off - -XRANDR_SET \ - --compositing disable \ - --screen-blank disable \ - --background link-vs-gdizz.jpg \ - --sound-effect gamedock \ - ${XRANDR_ARGS__livingroom__1080p[@]} --pos 0x0 --primary \ - ; diff --git a/config/local/altaria/bin/4k-beeg-game b/config/local/altaria/bin/4k-beeg-game deleted file mode 100755 index 9ba1538..0000000 --- a/config/local/altaria/bin/4k-beeg-game +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/zsh -source ${0:a:h}/xorg.zsh - -xrandr --output $XRANDR_OUTPUT__smol --off - -XRANDR_SET \ - --compositing disable \ - --screen-blank disable \ - --background vegeta.jpg \ - --sound-effect gamedock \ - ${XRANDR_ARGS__livingroom__4k[@]} --pos 0x0 --primary --rate 119.88 \ - ; diff --git a/config/local/altaria/bin/apps b/config/local/altaria/bin/apps index a784c77..ed7f8f6 100755 --- a/config/local/altaria/bin/apps +++ b/config/local/altaria/bin/apps @@ -4,9 +4,9 @@ tmux new -d -s apps -n 'foreman' 'htop' \; \ split-window -d -t apps:foreman "clear; echo 'Keeping apps fresh...'; while true; do sleep 30; done" \ 2>/dev/null -for APP in $(find "${0:a:h}" -name apps.\*) +for APP in $(find "${0:a:h}" -name apps.\* | sed 's/.*apps\.//') do echo "looking for $APP" tmux list-windows -t apps: | awk '{print $2;}' | grep -q $APP \ - || tmux new-window -dn $APP -t apps: "${0:a:h}/$APP" + || tmux new-window -dn $APP -t apps: "${0:a:h}/apps.$APP" done diff --git a/config/local/altaria/bin/beeg-game b/config/local/altaria/bin/beeg-game index 7239899..4ad8b1f 100755 --- a/config/local/altaria/bin/beeg-game +++ b/config/local/altaria/bin/beeg-game @@ -1,9 +1,9 @@ #!/bin/zsh -source ${0:a:h}/xorg.zsh $@ +[ $1 ] && RESOLUTION=$1 || RESOLUTION=4k +source ${0:a:h}/xorg.zsh ${RESOLUTION} ${@:2} -#DISABLE+=(livingroom) -DISABLE+=(bedroom) -DISABLE+=(smol) +#DISABLE+=(splitter) +DISABLE+=(desk) XRANDR_OFF ${DISABLE[@]} @@ -11,5 +11,5 @@ XRANDR_SET \ --compositing enable \ --screen-blank disable \ --sound-effect gamedock \ - ${XRANDR_ARGS__livingroom[@]} --pos 0x0 --primary \ + ${XRANDR_ARGS__splitter[@]} --pos 0x0 --primary \ ; diff --git a/config/local/altaria/bin/default b/config/local/altaria/bin/default index 95bba72..dedbfbd 100755 --- a/config/local/altaria/bin/default +++ b/config/local/altaria/bin/default @@ -4,22 +4,13 @@ source ${0:a:h}/xorg.zsh ${RESOLUTION} ${@:2} case $MONITOR_CONFIGURATION in ( home ) + xrandr --output DP-4 --off # I'm trying out using just HDMI for a bit XRANDR_SET \ --compositing enable \ --screen-blank disable \ --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 ) # 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 + ${XRANDR_ARGS__splitter[@]} --pos 0x0 --primary \ ;; ( unknown ) diff --git a/config/local/altaria/bin/smol-game b/config/local/altaria/bin/smol-game index e2e0c24..7aa1ab4 100755 --- a/config/local/altaria/bin/smol-game +++ b/config/local/altaria/bin/smol-game @@ -1,9 +1,9 @@ #!/bin/zsh -source ${0:a:h}/xorg.zsh $@ +[ $1 ] && RESOLUTION=$1 || RESOLUTION=4k +source ${0:a:h}/xorg.zsh ${RESOLUTION} ${@:2} -DISABLE+=(livingroom) -DISABLE+=(bedroom) -#DISABLE+=(smol) +DISABLE+=(splitter) +#DISABLE+=(desk) XRANDR_OFF ${DISABLE[@]} @@ -11,5 +11,5 @@ XRANDR_SET \ --compositing enable \ --screen-blank disable \ --sound-effect gamedock \ - ${XRANDR_ARGS__smol[@]} --pos 0x0 --primary \ + ${XRANDR_ARGS__desk[@]} --pos 0x0 --primary \ ; diff --git a/config/local/altaria/bin/xorg.zsh b/config/local/altaria/bin/xorg.zsh index ab45e24..80e3fae 100644 --- a/config/local/altaria/bin/xorg.zsh +++ b/config/local/altaria/bin/xorg.zsh @@ -1,20 +1,18 @@ #!/bin/zsh ##################################################################### -XRANDR_OUTPUT__livingroom='HDMI-0' -XRANDR_OUTPUT__bedroom='DP-0' -XRANDR_OUTPUT__smol='DP-4' +XRANDR_OUTPUT__splitter='HDMI-0' +XRANDR_OUTPUT__desk='DP-4' 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__bedroom} connected" \ - && xrandr --query | grep -q "^${XRANDR_OUTPUT__smol} connected" \ + && xrandr --query | grep -q "^${XRANDR_OUTPUT__splitter} connected" \ && MONITOR_CONFIGURATION=home \ ; + #&& xrandr --query | grep -q "^${XRANDR_OUTPUT__desk} connected" \ ##################################################################### @@ -24,9 +22,8 @@ case $1 in XRANDR_OFFSET_X=1920 XRANDR_OFFSET_Y=1080 - EXTRA_ARGS__livingroom=() - EXTRA_ARGS__bedroom=() - EXTRA_ARGS__smol=() + EXTRA_ARGS__splitter=() + EXTRA_ARGS__desk=() I3_BACKGROUND=link-vs-gdizz.jpg ;; @@ -36,9 +33,8 @@ case $1 in XRANDR_OFFSET_X=2560 XRANDR_OFFSET_Y=1440 - EXTRA_ARGS__livingroom=() - EXTRA_ARGS__bedroom=() - EXTRA_ARGS__smol=() + EXTRA_ARGS__splitter=(--rate 120.00) + EXTRA_ARGS__desk=() I3_BACKGROUND=roy-art.jpg ;; @@ -48,9 +44,8 @@ case $1 in XRANDR_OFFSET_X=3840 XRANDR_OFFSET_Y=2160 - EXTRA_ARGS__livingroom=() - EXTRA_ARGS__bedroom=() - EXTRA_ARGS__smol=(--rate 239.99) + EXTRA_ARGS__splitter=(--rate 120.00) + EXTRA_ARGS__desk=(--rate 120.00) I3_BACKGROUND=${I3_DEFAULT_THEME_BACKGROUND[@]} ;; @@ -62,9 +57,8 @@ case $1 in 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[@]}) +XRANDR_ARGS__splitter=(--output ${XRANDR_OUTPUT__splitter[@]} ${XRANDR_MODE[@]} ${EXTRA_ARGS__splitter[@]}) +XRANDR_ARGS__desk=(--output ${XRANDR_OUTPUT__desk[@]} ${XRANDR_MODE[@]} ${EXTRA_ARGS__desk[@]}) ########################################## @@ -133,5 +127,5 @@ XRANDR_SET() { 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} + scwrypts media play sfx -- ${SOUND_EFFECT} } diff --git a/config/scwrypts/dotfiles.zsh b/config/scwrypts/dotfiles.zsh new file mode 100644 index 0000000..1e29f1c --- /dev/null +++ b/config/scwrypts/dotfiles.zsh @@ -0,0 +1,19 @@ +# +# scwrypts dot-files config +# + +#TERMINFO_PATH=/path/to/sourced/terminfo/files + +# +# SAFE_SYMLINKS=1, makes a backup of config files that already exist +# SAFE_SYMLINKS=0, deletes existing config file +# +#SAFE_SYMLINKS=1 + + +# lines which begin with '#' are ignored +SYMLINKS=" +# fully qualified path ~/.config/THE-REST +# --------------------------------------------- +# /path/to/your/kitty.conf kitty/kitty.conf +" diff --git a/config/user/alacritty/theme.toml b/config/user/alacritty/theme.toml index 122b18e..a76d82c 100644 --- a/config/user/alacritty/theme.toml +++ b/config/user/alacritty/theme.toml @@ -1,28 +1,30 @@ # do not edit; generated by scwrypts -# theme : main +# theme : spring-sunset [colors.cursor] -cursor = '0xeeddff' +cursor = '0xfdfbe7' [colors.primary] -background = '0x000505' -foreground = '0xd0f0f0' +background = '0x0b1e32' +foreground = '0xe8eaf7' [colors.normal] black = '0x000505' -red = '0xc80064' -green = '0x11bb98' -yellow = '0x6911aa' -blue = '0x2262bb' -magenta = '0x9922dd' -cyan = '0x22ccba' +red = '0xf12875' +green = '0x5c68c4' +yellow = '0xf2e044' +blue = '0x5ab5e0' +magenta = '0xf5e878' +cyan = '0x7983ce' white = '0xd0f0f0' [colors.bright] black = '0x424253' -red = '0xff44ff' -green = '0x44dddd' -yellow = '0xaa44ff' -blue = '0x229df6' -magenta = '0xdd88ff' -cyan = '0x88ffff' +red = '0xf694bc' +green = '0x9fa6dc' +yellow = '0xf8ef9e' +blue = '0xb9e5f4' +magenta = '0xfbf5c4' +cyan = '0xc5c9ea' white = '0x7e707e' +[window] +opacity = 0.85 diff --git a/config/user/flameshot/flameshot.ini b/config/user/flameshot/flameshot.ini index 833bd38..cafce8c 100644 --- a/config/user/flameshot/flameshot.ini +++ b/config/user/flameshot/flameshot.ini @@ -1,18 +1,18 @@ [General] contrastOpacity=188 -contrastUiColor=#11bb98 +contrastUiColor=#5c68c4 disabledTrayIcon=false -drawColor=#6911aa -drawThickness=9 +drawColor=#f12875 +drawThickness=8 filenamePattern=%Y-%m-%d_%I%H.SCREENSHOT saveAsFileExtension=png savePath=/home/w0ryn/Pictures/screenshot showSidePanelButton=false showStartupLaunchMessage=false -uiColor=#490099 +uiColor=#f0ce3f undoLimit=100 uploadClientSecret= -userColors=picker, #aa44ff, #6911aa, #220069, #44dddd, #00aa79, #006922, #c80064, #ff44ff, #d0f0f0 +userColors=picker, #f8ef9e, #f2e044, #e9a02f, #9fa6dc, #404db9, #293097, #f12875, #f694bc, #000505 [Shortcuts] TYPE_ARROW=E diff --git a/config/user/kitty/theme.conf b/config/user/kitty/theme.conf index 634caf5..ee5678c 100644 --- a/config/user/kitty/theme.conf +++ b/config/user/kitty/theme.conf @@ -1,23 +1,23 @@ # do not edit; generated by scwrypts -# theme : main +# theme : spring-sunset color0 #000505 -color1 #c80064 -color2 #11bb98 -color3 #6911aa -color4 #2262bb -color5 #9922dd -color6 #22ccba +color1 #f12875 +color2 #5c68c4 +color3 #f2e044 +color4 #5ab5e0 +color5 #f5e878 +color6 #7983ce color7 #d0f0f0 color8 #424253 -color9 #ff44ff -color10 #44dddd -color11 #aa44ff -color12 #229df6 -color13 #dd88ff -color14 #88ffff +color9 #f694bc +color10 #9fa6dc +color11 #f8ef9e +color12 #b9e5f4 +color13 #fbf5c4 +color14 #c5c9ea color15 #7e707e -cursor #eeddff -background #000505 -foreground #d0f0f0 +cursor #fdfbe7 +background #0b1e32 +foreground #e8eaf7 selection_background # selection_foreground # diff --git a/config/user/polybar/theme.ini b/config/user/polybar/theme.ini index 0356788..112d502 100644 --- a/config/user/polybar/theme.ini +++ b/config/user/polybar/theme.ini @@ -1,23 +1,23 @@ # do not edit; generated by scwrypts -# theme : main +# theme : spring-sunset [colors] -background = #000505 -foreground = #d0f0f0 -background-alt = #6911aa -foreground-alt = #d0f0f0 -primary = #6911aa -secondary = #11bb98 -alert = #c80064 +background = #0b1e32 +foreground = #e8eaf7 +background-alt = #f2e044 +foreground-alt = #000505 +primary = #f2e044 +secondary = #5c68c4 +alert = #f12875 disabled = #424253 -primary-gradient-0 = #420069 -primary-gradient-1 = #490099 -primary-gradient-2 = #6911aa -primary-gradient-3 = #8811cc -primary-gradient-4 = #9922dd +primary-gradient-0 = #ecb737 +primary-gradient-1 = #f0ce3f +primary-gradient-2 = #f2e044 +primary-gradient-3 = #f3e35d +primary-gradient-4 = #f5e878 -secondary-gradient-0 = #006942 -secondary-gradient-1 = #009949 -secondary-gradient-2 = #00aa79 -secondary-gradient-3 = #11bb98 -secondary-gradient-4 = #22ccba +secondary-gradient-0 = #313ba3 +secondary-gradient-1 = #3a45af +secondary-gradient-2 = #404db9 +secondary-gradient-3 = #5c68c4 +secondary-gradient-4 = #7983ce diff --git a/scwrypts/dotwryn/desktop/xorg/i3/generate-config.module.zsh b/scwrypts/dotwryn/desktop/xorg/i3/generate-config.module.zsh index d813847..e228f7e 100644 --- a/scwrypts/dotwryn/desktop/xorg/i3/generate-config.module.zsh +++ b/scwrypts/dotwryn/desktop/xorg/i3/generate-config.module.zsh @@ -62,8 +62,11 @@ ${scwryptsmodule}() { s^\([ ]\+status_command\) .*$\1 $(GET .bar.status) s^\(set \$refresh_statusbar\) .*$\1 $(GET .bar.refresh) - s/^\(gaps inner\) .*$/\1 $(GET .gaps.inner)/ - s/^\(gaps outer\) .*$/\1 $(GET .gaps.outer)/ + s/^\(workspace \"[13579]\" gaps inner\) .*$/\1 $(GET .gaps.odd.inner)/ + s/^\(workspace \"[13579]\" gaps outer\) .*$/\1 $(GET .gaps.odd.outer)/ + + s/^\(workspace \"[24680]\" gaps inner\) .*$/\1 $(GET .gaps.even.inner)/ + s/^\(workspace \"[24680]\" gaps outer\) .*$/\1 $(GET .gaps.even.outer)/ s/^\(# color settings\).*$/\1 (theme '$(basename $(readlink -f "$DOTWRYN/config/colorschemes/active/main.conf") | sed 's/\.conf//')')/ diff --git a/scwrypts/remote/tmux/manager b/scwrypts/remote/tmux/manager index fa2d574..835a729 100755 --- a/scwrypts/remote/tmux/manager +++ b/scwrypts/remote/tmux/manager @@ -97,7 +97,7 @@ do scwrypts --name test --group remote --type zsh \ -- \ --name ${REMOTE_NAME} \ - --command 'command -v tmux' \ + --command 'source ~/.zprofile &>/dev/null; command -v tmux' \ &>>"${OMNI_LOGFILE}" \ && export CAN_CONNECT__${REMOTE_NAME}=true \ || export CAN_CONNECT__${REMOTE_NAME}=false \