From 849c4644f8e2d81dfcfdd022e6c0620668c798fb Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 19 May 2022 14:50:08 +0200 Subject: [PATCH] update --- bin/checkupdates.sh | 38 +++++++++++++ bin/colorizer-conky | 10 ++++ bin/colorizer-menus | 54 +++++++------------ bin/colorizer-ob | 18 +++---- bin/conkyctl | 10 +++- bin/mbclr | 6 +-- .../conky/scripts => bin}/quote.sh | 0 removecolorizer | 9 ++++ .../conky/clock_and_date_mbcolor.conkyrc | 10 ++-- .../conky/clock_mbcolor.conkyrc | 8 +-- .../conky/logo_mbcolor.conkyrc | 12 ++--- .../conky/mabox_tools_mbcolor.conkyrc | 8 +-- .../conky/quoter_mbcolor.conkyrc | 6 +-- .../conky/shortcuts_mbcolor.conkyrc | 8 +-- .../conky/sysinfo_graph_mbcolor.conkyrc | 10 ++-- .../conky/sysinfo_mbcolor.conkyrc | 13 ++--- .../conky/tiling_terminal_mbcolor.conkyrc | 8 +-- 17 files changed, 140 insertions(+), 88 deletions(-) create mode 100755 bin/checkupdates.sh rename {share/mabox-colorizer/conky/scripts => bin}/quote.sh (100%) create mode 100644 removecolorizer diff --git a/bin/checkupdates.sh b/bin/checkupdates.sh new file mode 100755 index 0000000..f58d109 --- /dev/null +++ b/bin/checkupdates.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# check updates and show how many packeges to update in Conky + +# We don't need to run checkupdates at Conky start as it takes few seconds and block Conky + +CNF_DIR="$HOME/.config/colorizer/conky" +CNF_FILE="$CNF_DIR/conky.cfg" +source <(grep = $CNF_FILE) + +case "$1" in + -s) + CONKYPID=$(pgrep -f sysinfo_mbcolor) + ;; + -g) + CONKYPID=$(pgrep -f sysinfo_graph_mbcolor) + ;; + *) + : + ;; +esac + + +if [ -f /tmp/"$CONKYPID" ]; then + PKGS=$(pamac checkupdates -aq| wc -l) + if [ "$PKGS" != "0" ]; then + if [[ "$update_notifications" == "true" ]];then + notify-send.sh -i mbcc "Updates available" "Packages to update: $PKGS" -o "Update with yay (cli):terminator -T 'Update packages with yay' -e yay" \ + -o "Update with Pamac (GUI):pamac-manager --updates" -o "Disable notifications:mb-setvar update_notifications=false ${CNF_FILE}" + fi + printf "\${font}\${alignr} Available updates: \${color red}" + echo "$PKGS" + else + printf "\${font}\${color}\${alignr} System is up to date :)" + fi +else + echo "$SUM" > /tmp/${CONKYPID} +fi diff --git a/bin/colorizer-conky b/bin/colorizer-conky index ec4fa75..bebc011 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -6,6 +6,14 @@ BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc" if [ ! -f "${BASECONKY}" ]; then rsync -a /usr/share/mabox-colorizer/conky/* ${CONKYDIR}/ fi +CNF_DIR="$HOME/.config/colorizer/conky" +CNF_FILE="$CNF_DIR/conky.cfg" +[ ! -d "$CNF_DIR" ] && mkdir -p "$CNF_DIR" +if [ ! -f $CNF_FILE ]; then +cat < ${CNF_FILE} +update_notifications=true +EOF +fi getvalues () { read WINTRANS <<< "$(grep own_window_transparent ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)" @@ -55,6 +63,8 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out+=("FONTS [ $FONT $FONTSIZE ],^checkout(font)") out2+=("^tag(font)") out2+=("^sep(BASE_FONT)") + out2+=("Set custom basefont...,mb-setfont conky_all;$me") + out2+=("^sep()") out2+=("++ Increase,conkyctl basefont_inc_all;$me") out2+=("-- Decrease,conkyctl basefont_dec_all;$me") out2+=("^sep(Outline/Shadow)") diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 024d5a7..73c53aa 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -41,25 +41,6 @@ getvalues () { } getvalues -#color_menu_bg = #ECE9E6 90 -#color_menu_bg_to = #ffffff 90 -#color_menu_border = #ECE9E6 100 -#menu_gradient_pos=bottom_left - -#sep_height = 0 -#sep_halign = right -#color_sep_fg = #222222 40 -#color_title_bg = #222222 30 -#color_title_fg = #EEEEEE 100 -#color_title_border = #222222 3 - -#item_border = 1 -#item_radius = 2 -#color_norm_bg = #222222 0 -#color_norm_fg = #222222 100 -#color_sel_bg = #222222 60 -#color_sel_fg = #EEEEEE 90 -#color_sel_border = #222222 50 out+=("^sep(Menu theme: ${jgmenu_theme})") out+=("$(printf '%3s' "$MBGA") COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg COLOR_MENU_BG '$me')") @@ -67,14 +48,7 @@ out+=("$(printf '%3s' "$MBGTA") $(printf '%3s' "$MBORDERA") COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border COLOR_MENU_BORDER '$me')") out+=("^sep()") out+=("GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") -out+=("^sep(separator/title)") -out+=("$(printf '%3s' "$TBGA") COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg COLOR_TITLE_BG '$me')") -out+=("$(printf '%3s' "$TFGA") AbCd COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg COLOR_TITLE_FG '$me')") -out+=("$(printf '%3s' "$TBORDERA") COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border COLOR_TITLE_BORDER '$me')") -out+=("^sep()") -out+=("SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") -out+=("^sep()") -out+=("$(printf '%3s' "$SEPFGA") ------ COLOR_SEP_FG,^pipe(mbclr '$SEPFG' jgctl color_sep_fg COLOR_SEP_FG '$me')") + out+=("^sep(item)") out+=("$(printf '%3s' "$NFGA") AbCd COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg COLOR_NORM_FG '$me')") out+=("$(printf '%3s' "$SBGA") COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg COLOR_SEL_BG '$me')") @@ -85,6 +59,15 @@ out+=("ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") out+=("^sep()") [[ ! -z "$NORMBG" ]] && out+=("$(printf '%3s' "$NORMBGA") COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg COLOR_NORM_BG '$me')") +out+=("^sep(separator/title)") +out+=("$(printf '%3s' "$TBGA") COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg COLOR_TITLE_BG '$me')") +out+=("$(printf '%3s' "$TFGA") AbCd COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg COLOR_TITLE_FG '$me')") +out+=("$(printf '%3s' "$TBORDERA") COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border COLOR_TITLE_BORDER '$me')") +out+=("^sep()") +out+=("SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") +out+=("^sep()") +out+=("$(printf '%3s' "$SEPFGA") ------ COLOR_SEP_FG,^pipe(mbclr '$SEPFG' jgctl color_sep_fg COLOR_SEP_FG '$me')") + out2+=("^tag(gradientpos)") out2+=("^sep(GRADIENT_POS $GRADIENT)") out2+=("none,jgctl menu_gradient_pos none;$me") @@ -121,16 +104,11 @@ out2+=("5,jgctl item_radius 5;$me") out2+=("6,jgctl item_radius 6;$me") -out+=("") -out+=("^sep()") -if [ -f "${THEMERC}.bak" ]; then - out+=("RESET,jgctl reset;$me") -fi -out+=("EDIT FILE...,xdg-open $THEMERC") -out+=("rand,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") + out+=("^sep(GLOBAL MENU SETTINGS)") ### COPIED FROM jgmenusettings-pipe for now -out+=("FONT_CUSTOM [ ${menu_font_family:-0} ${menu_font_size:-0} ],mb-setfont menu;$me") +out+=("FONT_ITEM [ ${menu_font_family:-0} ${menu_font_size:-0} ],mb-setfont menu;$me") +out+=("FONT_TITLE [ ${menu_sep_font_family:-0} ${menu_sep_font_size:-0} ],mb-setfont menu_sep;$me") out+=("BORDER [ ${jgtools_border:-0} ],^checkout(mborder)") out+=("PADDING [ ${jgtools_padding:-0} ],^checkout(mpadding)") out+=("RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") @@ -144,6 +122,12 @@ for i in 0 1 2 3 4 6 8 12 14 16 18 20 40; do out2+=("$(printf "%3s,%s" out2+=("^tag(subspacing)") for i in -20 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done +out+=("^sep()") +if [ -f "${THEMERC}.bak" ]; then + out+=("Reset ${jgmenu_theme} to default,jgctl reset;$me") +fi +out+=("Edit ${jgmenu_theme} file,xdg-open $THEMERC") +out+=("Set random menu theme,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") ### RUN if [[ "$1" == "-s" ]]; then diff --git a/bin/colorizer-ob b/bin/colorizer-ob index bc28487..d4e1e20 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -68,18 +68,18 @@ getvalues out+=("^sep(Openbox theme: $OBTHEME)") out+=("^sep(TITLEBAR)") -out+=(" ACTIVEBG,^pipe(mbclr '$ABG' obtctl clractivebg ACTIVE_BG '$me')") -out+=(" NORMALBG,^pipe(mbclr '$NBG' obtctl clrnormalbg NORMAL_BG '$me')") +out+=(" ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg ACTIVE_BG '$me')") +out+=(" INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg INACTIVE_BG '$me')") out+=("TEXT,^checkout(titletext)") +out+=("GRADIENT [ ${REST##* } ],^checkout(gradient)") out+=("PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") out+=("^sep(BORDER)") -out+=(" ACTIVELINE,^pipe(mbclr '$ALINE' obtctl activeborderColor ACTIVE_BORDER_COLOR '$me')") -out+=(" NORMALLINE,^pipe(mbclr '$NLINE' obtctl inactiveborderColor INACTIVE_BORDER_COLOR '$me')") +out+=(" ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor ACTIVE_BORDER_COLOR '$me')") +out+=(" INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor INACTIVE_BORDER_COLOR '$me')") out+=("BORDER [ $BORD ],^checkout(border)") out+=("HANDLEWIDTH [ $HANDLE ],^checkout(handlewidth)") out+=("^sep(EFFECTS)") -out+=("GRADIENT [ ${REST##* } ],^checkout(gradient)") out+=("RAISED? [ $WINRAISED ],^checkout(raised)") out+=("ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") out+=("^sep()") @@ -101,8 +101,8 @@ out2+=("FONT...,mb-setfont obtitle;$me") out2+=("TEXTALIGN [ $TXTJUST ],^checkout(talign)") out2+=("SHADOW,^checkout(shadow)") out2+=("^sep()") -out2+=(" ACTIVEFG,^pipe(mbclr '$AFG' obtctl activetextcolor ACTIVE_COLOR '$me')") -out2+=(" NORMALFG,^pipe(mbclr '$NFG' obtctl inactivetextcolor INACTIVE_COLOR '$me')") +out2+=(" ACTIVE_FG,^pipe(mbclr '$AFG' obtctl activetextcolor ACTIVE_COLOR '$me')") +out2+=(" INACTIVE_FG,^pipe(mbclr '$NFG' obtctl inactivetextcolor INACTIVE_COLOR '$me')") #TEXTALIGN out2+=("^tag(talign)") out2+=("^sep(TEXTALIGN)") @@ -165,8 +165,8 @@ out2+=("Diagonal,obtctl gradient diagonal;$me") out2+=("CrossDiagonal,obtctl gradient crossdiagonal;$me") out2+=("Pyramid,obtctl gradient pyramid;$me") out2+=("^sep(COLORS)") -[[ ! -z "$ABGTO" ]] && out2+=(" ACTIVEBGTO,^pipe(mbclr '$ABGTO' obtctl clractivebgto ACTIVE_BG_TO '$me')") -[[ ! -z "$ABGTO" ]] && out2+=(" NORMALBGTO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto INACTIVE_BG_TO '$me')") +[[ ! -z "$ABGTO" ]] && out2+=(" ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto ACTIVE_BG_TO '$me')") +[[ ! -z "$ABGTO" ]] && out2+=(" INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto INACTIVE_BG_TO '$me')") #HANDLE out2+=("^tag(handle)") out2+=("^sep(ACTIVEHANDLE)") diff --git a/bin/conkyctl b/bin/conkyctl index 6ed7777..31e23a7 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -218,13 +218,13 @@ single () { out+=("HORIZONTAL GAP [ $GAPX ],^checkout(gapx)") out2+=("^tag(gapx)") out2+=("^sep(HORIZONTAL_GAP)") - for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340 ; do + for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340 360; do out2+=("${i},conkyctl gap_x ${i} ${1};$me") done out+=("VERTICAL GAP [ $GAPY ],^checkout(gapy)") out2+=("^tag(gapy)") out2+=("^sep(VERTICAL_GAP)") - for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340; do + for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340 360; do out2+=("${i},conkyctl gap_y ${i} ${1};$me") done @@ -249,6 +249,10 @@ single () { out+=("FONTS [ $FONT $FONTSIZE ],^checkout(fontsingle)") out2+=("^tag(fontsingle)") out2+=("^sep(BASE_FONT)") + # if "$1" not quote + out2+=("Set custom basefont...,mb-setfont conky_single ${1};$me") + out2+=("^sep()") + # fi out2+=("++ Increase,conkyctl basefont_inc ${1};$me") out2+=("-- Decrease,conkyctl basefont_dec ${1};$me") out2+=("^sep(Outline/Shadow)") @@ -302,6 +306,8 @@ case "$1" in basefont_dec_all) basefont_dec_all;; basefont_inc) basefont_inc "$2";; basefont_dec) basefont_dec "$2";; + setfont_all) setfont_all;; + serfont) setfont;; shades_all) shades_all "$2";; shades) shades "$2" "$3";; single) single "$2";; diff --git a/bin/mbclr b/bin/mbclr index 147bc38..218019c 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -65,7 +65,7 @@ fi #Current out+=("^sep(SELECT_COLOR)") -out+=(" Select or pick from screen,mbclr pick $2 $3 ${5}") +out+=(" Select or pick from screen,mbclr pick $2 $3 ${5} ${6}") out+=("^sep()") out+=(" shades of current,^checkout(curshades)") @@ -142,13 +142,13 @@ printf '%s\n' "${out2[@]}" pickcolor () { color=$(gcolor3 2>/dev/null) if [ "$color" ]; then - mycmd=("$1 $2 '${color}';${3} -s") + mycmd=("$1 $2 '${color}' ${4};${3} -s") fi eval "${mycmd[@]}" #notify-send.sh "Qpa $1" "${mycmd[@]}" } case "$1" in - pick) pickcolor "$2" "${3}" "${5}";; + pick) pickcolor "$2" "${3}" "${5}" "${6}";; *) main "$@" ;; esac diff --git a/share/mabox-colorizer/conky/scripts/quote.sh b/bin/quote.sh similarity index 100% rename from share/mabox-colorizer/conky/scripts/quote.sh rename to bin/quote.sh diff --git a/removecolorizer b/removecolorizer new file mode 100644 index 0000000..9013e1c --- /dev/null +++ b/removecolorizer @@ -0,0 +1,9 @@ +#!/bin/bash + +rm ~/.config/conky/*mbcolor* +rm ~/.config/conky/images/mabox_3d.png +rm -rf ~/.config/conky/scripts + +rm -rf ~/.themes/MBcolors + +rm ~/.config/mabox/jgobthemes/MBcolo* diff --git a/share/mabox-colorizer/conky/clock_and_date_mbcolor.conkyrc b/share/mabox-colorizer/conky/clock_and_date_mbcolor.conkyrc index c570fa4..209e91c 100644 --- a/share/mabox-colorizer/conky/clock_and_date_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/clock_and_date_mbcolor.conkyrc @@ -6,15 +6,15 @@ conky.config = { own_window_hints = 'undecorated,below,skip_taskbar,skip_pager,sticky', own_window_colour = '#142c2c', own_window_class = 'Conky', - own_window_title = 'Mabox Simple Clock', + own_window_title = 'Mabox Simple Clock and Date', - alignment = 'middle_middle', + alignment = 'top_middle', gap_x = 0, - gap_y = 0, + gap_y = 60, -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, diff --git a/share/mabox-colorizer/conky/clock_mbcolor.conkyrc b/share/mabox-colorizer/conky/clock_mbcolor.conkyrc index d8cce22..979a3a6 100644 --- a/share/mabox-colorizer/conky/clock_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/clock_mbcolor.conkyrc @@ -10,11 +10,11 @@ conky.config = { alignment = 'bottom_right', gap_x = 30, - gap_y = 340, + gap_y = 360, -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, @@ -64,7 +64,7 @@ conky.config = { conky.text = [[ -${font Cantarell:size=100:bold}${color1}${time %k:%M}${font} +${font Ubuntu:size=100:bold}${color1}${time %k:%M}${font} ${voffset 20}${alignr}${color} $cpu% $legacymem ]]; diff --git a/share/mabox-colorizer/conky/logo_mbcolor.conkyrc b/share/mabox-colorizer/conky/logo_mbcolor.conkyrc index 4a12cff..506531f 100644 --- a/share/mabox-colorizer/conky/logo_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/logo_mbcolor.conkyrc @@ -8,15 +8,15 @@ conky.config = { own_window_class = 'Conky', own_window_title = 'Mabox Logo', - alignment = 'bottom_right', - gap_x = 20, - gap_y = 60, + alignment = 'middle_middle', + gap_x = 0, + gap_y = 0, minimum_height = 220, minimum_width = 220, -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -27,12 +27,12 @@ conky.config = { default_outline_color = '#222222', default_color = '#309552', - color0 = '#accdc7', + color0 = '#fbfdfd', -- BORDERS draw_borders = false, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, diff --git a/share/mabox-colorizer/conky/mabox_tools_mbcolor.conkyrc b/share/mabox-colorizer/conky/mabox_tools_mbcolor.conkyrc index 4494be1..16a057d 100644 --- a/share/mabox-colorizer/conky/mabox_tools_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/mabox_tools_mbcolor.conkyrc @@ -8,14 +8,14 @@ conky.config = { own_window_class = 'Conky', own_window_title = 'Mabox Tools Conky', - alignment = 'bottom_right', - gap_x = 300, + alignment = 'bottom_left', + gap_x = 260, gap_y = 60, minimum_width = '200', -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, diff --git a/share/mabox-colorizer/conky/quoter_mbcolor.conkyrc b/share/mabox-colorizer/conky/quoter_mbcolor.conkyrc index 3ff3e90..09c0ac7 100644 --- a/share/mabox-colorizer/conky/quoter_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/quoter_mbcolor.conkyrc @@ -15,7 +15,7 @@ conky.config = { -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, @@ -62,7 +62,7 @@ conky.config = { }; conky.text = [[ -${execpi 1200 $HOME/.config/conky/scripts/quote.sh} +${execpi 1800 quote.sh} ]]; diff --git a/share/mabox-colorizer/conky/shortcuts_mbcolor.conkyrc b/share/mabox-colorizer/conky/shortcuts_mbcolor.conkyrc index 402c268..8dbe2ac 100644 --- a/share/mabox-colorizer/conky/shortcuts_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/shortcuts_mbcolor.conkyrc @@ -6,7 +6,7 @@ conky.config = { own_window_hints = 'undecorated,below,skip_taskbar,skip_pager,sticky', own_window_colour = '#142c2c', own_window_class = 'Conky', - own_window_title = 'Mabox Shortcuts Conky Grey', + own_window_title = 'Mabox Shortcuts Conky', alignment = 'bottom_left', gap_x = 30, @@ -15,7 +15,7 @@ conky.config = { -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8, @@ -69,7 +69,9 @@ ${color0}quake-terminal ${alignr}${color}ctrl+~ ${color0}file manager ${alignr}${color}super+f ${color0}web browser ${alignr}${color}super+w ${color0}text editor ${alignr}${color}super+e +${color0}file search ${alignr}${color}super+/ ${color0}galculator ${alignr}${color}super+g +${color0}internet radio ${alignr}${color}super+r ${color0}volume control ${alignr}${color}super+v ${color0}toggle Picom ${alignr}${color}super+p ${color0}toggle Conky ${alignr}${color}super+c diff --git a/share/mabox-colorizer/conky/sysinfo_graph_mbcolor.conkyrc b/share/mabox-colorizer/conky/sysinfo_graph_mbcolor.conkyrc index a4a513d..e40add4 100644 --- a/share/mabox-colorizer/conky/sysinfo_graph_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/sysinfo_graph_mbcolor.conkyrc @@ -14,7 +14,7 @@ conky.config = { minimum_width = '200', use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -32,7 +32,7 @@ conky.config = { draw_borders = true, - stippled_borders = 2, + stippled_borders = 3, border_inner_margin = 8, border_outer_margin = 8, border_width = 1, @@ -73,12 +73,14 @@ $alignr$color memory ${color0}$legacymem - $memmax # ${voffset 10}$alignr${color} Mabox Linux ${execi 10000 awk -F'=' '/DISTRIB_RELEASE=/ {printf $2" "} /CODENAME/ {print $2}' /etc/lsb-release} # -$alignr${execi 1200 whoami}@${nodename} +$alignr${execi 10000 whoami}@${nodename} ${alignr}${color0}uptime ${color}${uptime_short} ${alignr}${color0}${alignr}kernel ${color}${kernel} ${alignr}${color0}${alignr}arch ${color}${machine} -${alignr}${color0}${alignr}filesystem ${color}${fs_type} +${alignr}${color0}${alignr}filesystem ${color}${fs_type}${voffset 10} +${alignr}${color}${execpi 1800 checkupdates.sh -g}${font}${color} #${voffset 10}${alignr}${color} available updates ${color1}${font Cantarell:bold:size=10}${execpi 1800 pamac checkupdates -aq| wc -l}${font}${color} ${alignr}${color} installed pkgs: ${color0}${execi 10000 pacman -Q | wc -l} ${alignr}${color} branch: ${color0}${execi 10000 pacman-mirrors -G} +${voffset -50} ]]; diff --git a/share/mabox-colorizer/conky/sysinfo_mbcolor.conkyrc b/share/mabox-colorizer/conky/sysinfo_mbcolor.conkyrc index bd748c6..b390f04 100644 --- a/share/mabox-colorizer/conky/sysinfo_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/sysinfo_mbcolor.conkyrc @@ -9,12 +9,12 @@ conky.config = { own_window_title = 'Mabox Sysinfo Bar Conky', alignment = 'top_right', - gap_x = 300, + gap_x = 260, gap_y = 60, minimum_width = '200', use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -32,7 +32,7 @@ conky.config = { draw_borders = true, - stippled_borders = 2, + stippled_borders = 3, border_inner_margin = 8, border_outer_margin = 8, border_width = 1, @@ -72,12 +72,13 @@ $alignr$color memory ${color0}$legacymem - $memmax #${alignr}${color0}${font Cantarell:size=9}swap $swapmax - $swap # ${voffset 10}$alignr${color} Mabox Linux ${execi 10000 awk -F'=' '/DISTRIB_RELEASE=/ {printf $2" "} /CODENAME/ {print $2}' /etc/lsb-release} -$alignr${execi 1200 whoami}@${nodename} +$alignr${execi 10000 whoami}@${nodename} ${alignr}${color0}uptime ${color}${uptime_short} ${alignr}${color0}${alignr}kernel ${color}${kernel} ${alignr}${color0}${alignr}arch ${color}${machine} -${alignr}${color0}${alignr}filesystem ${color}${fs_type} -#${voffset 10}${alignr}${color} available updates ${color1}${font Cantarell:bold:size=10}${execpi 1800 pamac checkupdates -aq| wc -l}${font}${color} +${alignr}${color0}${alignr}filesystem ${color}${fs_type}${voffset 10} +${alignr}${color}${execpi 1800 checkupdates.sh -s}${font}${color} ${alignr}${color} installed pkgs: ${color0}${execi 10000 pacman -Q | wc -l} ${alignr}${color} branch: ${color0}${execi 10000 pacman-mirrors -G} +${voffset -50} ]]; diff --git a/share/mabox-colorizer/conky/tiling_terminal_mbcolor.conkyrc b/share/mabox-colorizer/conky/tiling_terminal_mbcolor.conkyrc index 21f903a..a220e30 100644 --- a/share/mabox-colorizer/conky/tiling_terminal_mbcolor.conkyrc +++ b/share/mabox-colorizer/conky/tiling_terminal_mbcolor.conkyrc @@ -8,14 +8,14 @@ conky.config = { own_window_class = 'Conky', own_window_title = 'Mabox Terminator Conky', - alignment = 'bottom_left', - gap_x = 240, + alignment = 'bottom_right', + gap_x = 300, gap_y = 60, minimum_width = '200', -- FONTS use_xft = true, - font = 'Cantarell:size=9', + font = 'Ubuntu:size=10', xftalpha = 1, override_utf8_locale = true, @@ -31,7 +31,7 @@ conky.config = { -- BORDERS draw_borders = true, -- Stippled borders? - stippled_borders = 2, + stippled_borders = 3, -- border margins border_inner_margin = 8, border_outer_margin = 8,