got rid of zsh stuff I don't use; i3lock now uses active colorscheme; fixed color7 on halloween theme

This commit is contained in:
2022-08-23 17:44:56 -06:00
parent 2571cf4fe5
commit caf69459e2
8 changed files with 83 additions and 113 deletions

17
bin/get-colorscheme-hex Executable file
View File

@ -0,0 +1,17 @@
#!/bin/zsh
source $HOME/.config/wryn/env.zsh
#####################################################################
GET_COLORSCHEME_HEX() {
[ $1 ] && [[ $1 -le 15 ]] && [[ $1 -ge 0 ]] \
|| __FAIL 1 'must provide ANSI color number 0-15'
grep "^color$1" "$DOTWRYN/colorschemes/kitty.main" \
| awk '{print $2}' \
| sed 's/ //g; s/#//g' \
| tr '[:lower:]' '[:upper:]'
}
#####################################################################
[ ! $1 ] && return 0
GET_COLORSCHEME_HEX $@

View File

@ -1,34 +1,38 @@
#!/bin/zsh
# note: requires i3lock-color
which i3lock >/dev/null 2>&1 || {
notify-send 'i3lock-color' 'could not find installation of i3lock'
}
# note: requires i3lock-color
source $HOME/.config/wryn/env.zsh
source $DOTWRYN/bin/get-colorscheme-hex
#####################################################################
INSIDE_VER='001020'
RING_VER='004040'
RADIUS=$(xrandr | grep 'connected primary' | sed 's/.* \([0-9]\+\)x.*/\1/' | awk '{print int($1*0.08)}')
INSIDE_WRONG='200010'
RING_WRONG='4a0020'
ARGS=(
--ignore-empty-password
--force-clock
--pass-screen-keys
--pass-media-keys
--pass-volume-keys
--pass-power-keys
--verif-text=''
--wrong-text=''
)
INSIDE='002010'
RING='103020'
LINE='8888ff'
KEYDOWN='44ff44'
KEYREMOVE='4444ff'
[ $NOBLUR ] && ARGS+=(--color=$(GET_COLORSCHEME_HEX 0)69) || ARGS+=(--blur=11)
[ $RADIUS ] && ARGS+=(--radius=$RADIUS)
TIME='aaaaaa'
DATE='888888'
i3lock \
-e \
--pass-screen-keys --pass-media-keys --pass-volume-keys --pass-power-keys \
-B 6 \
--force-clock \
--insidever-color=$INSIDE_VER --ringver-color=$RING_VER --verif-color=$INSIDE_VER \
--insidewrong-color=$INSIDE_WRONG --ringwrong-color=$RING_WRONG --wrong-color=$INSIDE_WRONG \
--inside-color=002010 --ring-color=103020 \
--line-color=$LINE \
--time-color=$TIME --date-color=$DATE \
--keyhl-color=$KEYDOWN --bshl-color=$KEYREMOVE \
i3lock ${ARGS[@]} \
--insidever-color=$(GET_COLORSCHEME_HEX 6) \
--ringver-color=$(GET_COLORSCHEME_HEX 10) \
--insidewrong-color=$(GET_COLORSCHEME_HEX 1) \
--ringwrong-color=$(GET_COLORSCHEME_HEX 9) \
--inside-color=$(GET_COLORSCHEME_HEX 0) \
--ring-color=$(GET_COLORSCHEME_HEX 2) \
--time-color=$(GET_COLORSCHEME_HEX 7) \
--date-color=$(GET_COLORSCHEME_HEX 15) \
--keyhl-color=$(GET_COLORSCHEME_HEX 11) \
--bshl-color=$(GET_COLORSCHEME_HEX 13) \
|| notify-send 'i3lock-color' 'something went wrong; unable to lock' \
;