From 91fb8527193234b50dbfefa604d65305d509f219 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Tue, 25 Jul 2023 00:21:05 +0200 Subject: [PATCH] randomizer fix,conky bars --- bin/mbclr | 63 +++++++++++++++++++++++++++----------------------- bin/randomizer | 2 +- bin/w2theme | 22 ++++++++---------- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/bin/mbclr b/bin/mbclr index f7dbe4c..b0d10db 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -81,18 +81,7 @@ fi dark=("#000000" "#111111" "#222222" "#333333" "#444444" "#555555" "#666666") light=("#FFFFFF" "#EEEEEE" "#DDDDDD" "#CCCCCC" "#BBBBBB" "#AAAAAA" "#999999") -#yt=("#181818" "#212121" "#3d3d3d" "#FFFFFF" "#AAAAAA") -plasma=("#e93a9a" "#e93d58" "#e9643a" "#e8cb2d" "#3dd425" "#00d3b8" "#3daee9" "#b875dc" "#926ee4" "#686b6f") -#ubuntu -ubuntu=("#E95420" "#18b0b0" "#3584e4" "#0e8420" "#c748ba" "#77216f" "#c7162b" "#f4a100") -#linuxmint -mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c15b58" "#c8ac69" "#5aaa9a") -#w8+=("#a4c400" "#60a917" "#008a00" "#00aba9" "#1ba1e2" "#3e65ff" "#0050ef" "#6a00ff" "#aa00ff" "#f472d0" "#d80073" "#a20025" "#e51400" "#fa6800" "#f0a30a" "#e3c800" "#825a2c" "#6d8764" "#647687" "#76608a" "#87794e" "#a0522d") -#for i in $(theme.sh -p |cut -d':' -f2) -#do -#colors+=("$i") -#done - +accents=("#e93d57" "#c7162b" "#e9633a" "#e95620" "#f4a300" "#e8cc2d" "#3cd425" "#0e8420" "#00d3b7" "#18b0b0" "#3dade9" "#686b6f" "#3584e4" "#916ee4" "#b875dc" "#77216e" "#c748ba" "#e93a9a") out+=("^sep($4)") if [[ "$2" == "jgctl" ]]; then @@ -124,38 +113,45 @@ out2+=(" 10 out2+=(" 5 ,jgctl $3 5 ;${5}") out2+=(" 0 ,jgctl $3 0 ;${5}") fi +if [[ "$2" == "t2ctl" ]]; then +T2RC="$HOME/.config/tint2/jaskier_mb.tint2rc" +read COLOR OP<<< $(grep "${3}" ${T2RC} | cut -d'=' -f2) +out+=("^sep($OPACITY)") +out+=("$OPACITY [ $OP ],^checkout(opacity)") +out2+=("^tag(opacity)") +out2+=("^sep($OPACITY [ $OP ]") +out2+=("100 ,t2ctl $3 100;${5}") +out2+=(" 95 ,t2ctl $3 95 ;${5}") +out2+=(" 90 ,t2ctl $3 90 ;${5}") +out2+=(" 80 ,t2ctl $3 80 ;${5}") +out2+=(" 70 ,t2ctl $3 70 ;${5}") +out2+=(" 60 ,t2ctl $3 60 ;${5}") +out2+=(" 50 ,t2ctl $3 50 ;${5}") +out2+=(" 40 ,t2ctl $3 40 ;${5}") +out2+=(" 30 ,t2ctl $3 30 ;${5}") +out2+=(" 20 ,t2ctl $3 20 ;${5}") +out2+=(" 10 ,t2ctl $3 10 ;${5}") +out2+=(" 5 ,t2ctl $3 5 ;${5}") +out2+=(" 0 ,t2ctl $3 0 ;${5}") +fi #Current out+=("^sep($SELECT_COLOR)") out+=(" $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}") out+=(" $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}") -# HERE CUR_FG=$(pastel textcolor $1|pastel format hex) -out+=("^sep($SHADES_OF_CURRENT $1 )") +out+=("^sep($SHADES_OF_CURRENT $1)") out+=("$LIGHTEN_DARKEN,^checkout(curshades)") out+=("$SATURATION,^checkout(saturate)") out+=("$ROTATE_HSL_HUE,^checkout(rotate_hsl)") #out+=("$SHADES_OF_CURRENT ($1),^checkout(curshades)") -# HERE - -out+=("^sep($WALLPAPER_COLORS)") -for i in "${wallcolors[@]}" -do -out+=("$i ,$2 $3 '${i}' ${6};${5}") -done - - out+=("^sep()") out+=("$ACCENT_COLORS,^checkout(accents)") out2+=("^tag(accents)") -out2+=("^sep(Ubuntu)") -for i in ${ubuntu[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done -out2+=("^sep(Mint)") -for i in ${mint[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done -out2+=("^sep(Plasma)") -for i in ${plasma[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done +out2+=("^sep($ACCENT_COLORS)") +for i in ${accents[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done out+=("^sep()") out+=(" $LIGHTCOLORS,^checkout(light)") @@ -175,6 +171,15 @@ out2+=("$i ,$2 done +out+=("^sep($WALLPAPER_COLORS)") +for i in "${wallcolors[@]}" +do +out+=("$i ,$2 $3 '${i}' ${6};${5}") +done + + + + # Shades out2+=("^tag(curshades)") out2+=("^sep($SHADES_OF $1)") diff --git a/bin/randomizer b/bin/randomizer index ba4f3c7..c19e040 100755 --- a/bin/randomizer +++ b/bin/randomizer @@ -65,7 +65,7 @@ pipemenu () { RESET_TO_DEFAULT="Reset to default settings..." HELP="Main Window and Help" ;; - en*) + *) SETRANDOM="Set random colorscheme for..." MENUS="Menus and Panels" OBWD="OpenBox Window Decoration" diff --git a/bin/w2theme b/bin/w2theme index 500b79c..a9d1dd2 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -39,6 +39,9 @@ if [[ "${#w[@]}" -lt 8 ]]; then w+=("#2e3440" "#4c566a" "#5e81ac" "#bf616b" "#b48ead" "#a3be8c" "#ebcb8b" "#d8dee9" "#eceff4") fi +accents=("#e93d57" "#c7162b" "#e9633a" "#e95620" "#f4a300" "#e8cc2d" "#3cd425" "#0e8420" "#00d3b7" "#18b0b0" "#3dade9" "#686b6f" "#3584e4" "#916ee4" "#b875dc" "#77216e" "#c748ba" "#e93a9a") + + menu_theme () { jgctl theme MBcolors case "$1" in @@ -86,27 +89,20 @@ conky_colors() { conkyctl default_color_all "${w[-1]}" conkyctl color0_all "${w[-3]}" conkyctl color1_all "${w[-4]}" - conkyctl color2_all "${w[-5]}" - if [[ $conky_diff_colors == "yes" ]];then - conkyctl win_bgcolor ${w[2]} "$HOME/.config/conky/mabox_tools_mbcolor.conkyrc" - conkyctl win_bgcolor ${w[1]} "$HOME/.config/conky/shortcuts_mbcolor.conkyrc" - conkyctl win_bgcolor ${w[3]} "$HOME/.config/conky/tiling_terminal_mbcolor.conkyrc" - fi - + #conkyctl color2_all "${w[-5]}" ;; *) #light bg conkyctl win_bgcolor_all "${w[-1]}" conkyctl default_color_all "${w[0]}" conkyctl color0_all "${w[2]}" conkyctl color1_all "${w[4]}" - conkyctl color2_all "${w[6]}" - if [[ $conky_diff_colors == "yes" ]];then - conkyctl win_bgcolor ${w[-3]} "$HOME/.config/conky/mabox_tools_mbcolor.conkyrc" - conkyctl win_bgcolor ${w[-5]} "$HOME/.config/conky/shortcuts_mbcolor.conkyrc" - conkyctl win_bgcolor ${w[-4]} "$HOME/.config/conky/tiling_terminal_mbcolor.conkyrc" - fi + #conkyctl color2_all "${w[6]}" ;; esac + #bars/graphs color + #random + conkyctl color2_all "${accents[ $RANDOM % ${#accents[@]} ]}" + } conky_colorsone () { source ~/.config/colorizer/colorizer.conf