diff --git a/config/ascii/arch b/config/ascii/arch index 6e4161b..071e58b 100644 --- a/config/ascii/arch +++ b/config/ascii/arch @@ -1,4 +1,5 @@ - -` +#/4;27;4;11 +${C1} -` .o+` `ooo/ `+oooo: @@ -7,9 +8,9 @@ `/:-:++oooo+: `/++++/+++++++: `/++++++++++++++: - `/+++ooooooooooooo/` - ./ooosssso++osssssso+` - .oossssso-````/ossssss+` + `/+++o${C2}oooooooo${C1}oooo/` +${C2} ${C1}./${C2}ooosssso++osssssso${C1}+` +${C2} .oossssso-````/ossssss+` -osssssso. :ssssssso. :osssssss/ osssso+++. /ossssssss/ +ssssooo/- diff --git a/config/ascii/debian b/config/ascii/debian index f89d114..7fe68d2 100644 --- a/config/ascii/debian +++ b/config/ascii/debian @@ -1,16 +1,17 @@ - _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' . $$$ - $$P d$' , $$P - $$: $$. - ,d$$' - $$; Y$b._ _,d$P' - Y$$. `.`"Y$$$$P"' - `$$b "-.__ - `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ +#/1;7;9;15 +${C2} _,met&&&&&gg. + ,g&&&&&&&&&&&&&&&P. + ,g&&P" """Y&&.". + ,&&P' `&&&. +',&&P ,ggs. `&&b: +`d&&' ,&P"' ${C1}.${C2} &&& + &&P d&' ${C1},${C2} &&P + &&: &&. ${C1}-${C2} ,d&&' + &&; Y&b._ _,d&P' + Y&&. ${C1}`.${C2}`"Y&&&&P"' +${C2} `&&b ${C1}"-.__ +${C2} `Y&& + `Y&&. + `&&b. + `Y&&b. + `"Y&b._ diff --git a/config/ascii/fedora b/config/ascii/fedora index 3cffcb9..d4ba0e0 100644 --- a/config/ascii/fedora +++ b/config/ascii/fedora @@ -1,19 +1,20 @@ - .',;::::;,'. +#/12;7;4;15 +${C1} .',;::::;,'. .';:cccccccccccc:;,. .;cccccccccccccccccccccc;. .:cccccccccccccccccccccccccc:. - .;ccccccccccccc;.:dddl:.;ccccccc;. - .:ccccccccccccc;OWMKOOXMWd;ccccccc:. -.:ccccccccccccc;KMMc;cc;xMMc;ccccccc:. -,cccccccccccccc;MMM.;cc;;WW:;cccccccc, -:cccccccccccccc;MMM.;cccccccccccccccc: -:ccccccc;oxOOOo;MMM0OOk.;cccccccccccc: -cccccc;0MMKxdd:;MMMkddc.;cccccccccccc; -ccccc;XM0';cccc;MMM.;cccccccccccccccc' -ccccc;MMo;ccccc;MMW.;ccccccccccccccc; -ccccc;0MNc.ccc.xMMd;ccccccccccccccc; -cccccc;dNMWXXXWM0:;cccccccccccccc:, -cccccccc;.:odl:.;cccccccccccccc:,. + .;ccccccccccccc;${C2}.:dddl:.${C1};ccccccc;. + .:ccccccccccccc;${C2}OWMKOOXMWd${C1};ccccccc:. +.:ccccccccccccc;${C2}KMMc${C1};cc;${C2}xMMc${C1};ccccccc:. +,cccccccccccccc;${C2}MMM.${C1};cc;${C2};WW:${C1};cccccccc, +:cccccccccccccc;${C2}MMM.${C1};cccccccccccccccc: +:ccccccc;${C2}oxOOOo${C1};${C2}MMM0OOk.${C1};cccccccccccc: +cccccc;${C2}0MMKxdd:${C1};${C2}MMMkddc.${C1};cccccccccccc; +ccccc;${C2}XM0'${C1};cccc;${C2}MMM.${C1};cccccccccccccccc' +ccccc;${C2}MMo${C1};ccccc;${C2}MMW.${C1};ccccccccccccccc; +ccccc;${C2}0MNc.${C1}ccc${C2}.xMMd${C1};ccccccccccccccc; +cccccc;${C2}dNMWXXXWM0:${C1};cccccccccccccc:, +cccccccc;${C2}.:odl:.${C1};cccccccccccccc:,. :cccccccccccccccccccccccccccc:'. .:cccccccccccccccccccccc:;,.. '::cccccccccccccc::;,. diff --git a/config/ascii/gentoo b/config/ascii/gentoo index 12756db..013f8b4 100644 --- a/config/ascii/gentoo +++ b/config/ascii/gentoo @@ -1,18 +1,19 @@ - -/oyddmdhs+:. - -odNMMMMMMMMNNmhy+-` - -yNMMMMMMMMMMMNNNmmdhy+- - `omMMMMMMMMMMMMNmdmmmmddhhy/` - omMMMMMMMMMMMNhhyyyohmdddhhhdo` -.ydMMMMMMMMMMdhs++so/smdddhhhhdm+` - oyhdmNMMMMMMMNdyooydmddddhhhhyhNd. - :oyhhdNNMMMMMMMNNNmmdddhhhhhyymMh - .:+sydNMMMMMNNNmmmdddhhhhhhmMmy - /mMMMMMMNNNmmmdddhhhhhmMNhs: - `oNMMMMMMMNNNmmmddddhhdmMNhs+` - `sNMMMMMMMMNNNmmmdddddmNMmhs/. - /NMMMMMMMMNNNNmmmdddmNMNdso:` -+MMMMMMMNNNNNmmmmdmNMNdso/- -yMMNNNNNNNmmmmmNNMmhs+/-` -/hMMNNNNNNNNMNdhs++/-` -`/ohdmmddhys+++/:.` +#/5;7;13;69 +${C1} -/oyddmdhs+:. + -o${C2}dNMMMMMMMMNNmhy+${C1}-` + -y${C2}NMMMMMMMMMMMNNNmmdhy${C1}+- + `o${C2}mMMMMMMMMMMMMNmdmmmmddhhy${C1}/` + om${C2}MMMMMMMMMMMN${C1}hhyyyo${C2}hmdddhhhd${C1}o` +.y${C2}dMMMMMMMMMMd${C1}hs++so/s${C2}mdddhhhhdm${C1}+` + oy${C2}hdmNMMMMMMMN${C1}dyooy${C2}dmddddhhhhyhN${C1}d. + :o${C2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${C1}Mh + .:${C2}+sydNMMMMMNNNmmmdddhhhhhhmM${C1}my + /m${C2}MMMMMMNNNmmmdddhhhhhmMNh${C1}s: + `o${C2}NMMMMMMMNNNmmmddddhhdmMNhs${C1}+` + `s${C2}NMMMMMMMMNNNmmmdddddmNMmhs${C1}/. + /N${C2}MMMMMMMMNNNNmmmdddmNMNdso${C1}:` ++M${C2}MMMMMMNNNNNmmmmdmNMNdso${C1}/- +yM${C2}MNNNNNNNmmmmmNNMmhs+/${C1}-` +/h${C2}MMNNNNNNNNMNdhs++/${C1}-` +`/${C2}ohdmmddhys+++/:${C1}.` `-//////:--. diff --git a/config/ascii/opensuse b/config/ascii/opensuse index d72d3c5..3519a40 100644 --- a/config/ascii/opensuse +++ b/config/ascii/opensuse @@ -1,18 +1,19 @@ - .;ldkO0000Okdl;. +#/2;7;10;15 +${C2} .;ldkO0000Okdl;. .;d00xl:^''''''^:ok00d;. .d00l' 'o00d. - .d0Kd' Okxol:;,. :O0d. - .OKKKK0kOKKKKKKKKKKOxo:, lKO. - ,0KKKKKKKKKKKKKKKK0P^,,,^dx: ;00, -.OKKKKKKKKKKKKKKKKk'.oOPPb.'0k. cKO. -:KKKKKKKKKKKKKKKKK: kKx..dd lKd 'OK: -dKKKKKKKKKKKOx0KKKd ^0KKKO' kKKc dKd -dKKKKKKKKKKKK;.;oOKx,..^..;kKKK0. dKd -:KKKKKKKKKKKK0o;...^cdxxOK0O/^^' .0K: - kKKKKKKKKKKKKKKK0x;,,......,;od lKk - '0KKKKKKKKKKKKKKKKKKKKK00KKOo^ c00' - 'kKKKOxddxkOO00000Okxoc;'' .dKk' + .d0Kd'${C1} Okxol:;,. ${C2}:O0d. + .OK${C1}KKK0kOKKKKKKKKKKOxo:, ${C2}lKO. + ,0K${C1}KKKKKKKKKKKKKKK0P^${C2},,,${C1}^dx:${C2} ;00, +.OK${C1}KKKKKKKKKKKKKKKk'${C2}.oOPPb.${C1}'0k.${C2} cKO. +:KK${C1}KKKKKKKKKKKKKKK: ${C2}kKx..dd ${C1}lKd${C2} 'OK: +dKK${C1}KKKKKKKKKOx0KKKd ${C2}^0KKKO' ${C1}kKKc${C2} dKd +dKK${C1}KKKKKKKKKK;.;oOKx,..${C2}^${C1}..;kKKK0.${C2} dKd +:KK${C1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${C2}.0K: + kKK${C1}KKKKKKKKKKKKK0x;,,......,;od ${C2}lKk + '0K${C1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${C2}c00' + 'kK${C1}KKOxddxkOO00000Okxoc;'' ${C2}.dKk' l0Ko. .c00l' 'l0Kk:. .;xK0l' 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' \ No newline at end of file + '^:ldxkkkkxdl:^' diff --git a/config/ascii/opensuse-tumbleweed b/config/ascii/opensuse-tumbleweed index fe0105d..9e315cd 100644 --- a/config/ascii/opensuse-tumbleweed +++ b/config/ascii/opensuse-tumbleweed @@ -1,4 +1,5 @@ - ...... +#/2;7;10;15 +${C1} ...... .,cdxxxoc,. .:kKMMMNWMMMNk:. cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. ;WMK;. .lKMMNM, :NMK, .OMW; @@ -10,4 +11,4 @@ .XM0. ,OMMK, OMMMK. .XMK oWMO:. .;xNMMk, NNNMKl. .xWMx :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, \ No newline at end of file + ..... .:dOOXXKOxl, diff --git a/config/ascii/tide b/config/ascii/tide index 3f63fd4..23d20fb 100644 --- a/config/ascii/tide +++ b/config/ascii/tide @@ -1,4 +1,5 @@ - @@@@@@@@@ +#/6;10;5;12 +${C1} @@@@@@@@@ @@@~~~~~~~~~@@ @@~~~ ~~@ @~~ @ @@ -14,4 +15,4 @@ @@@ ~~~~ @@@@@ ~~~~ @@@ ~~~@@@@ @@@@~~~~~@@@@ @@@@~~~ ~~~~@@@~~~~ ~~~~@@@~~~ - ~~~ ~~~ \ No newline at end of file + ~~~ ~~~ diff --git a/config/ascii/ubuntu b/config/ascii/ubuntu index c218f51..c0d0bdc 100644 --- a/config/ascii/ubuntu +++ b/config/ascii/ubuntu @@ -1,20 +1,21 @@ - .-/+oossssoo+\-. +#/1;7;3;15 +${C1} .-/+oossssoo+\-. ยด:+ssssssssssssssssss+:` -+ssssssssssssssssssyyssss+- - .ossssssssssssssssssdMMMNysssso. - /ssssssssssshdmmNNmmyNMMMMhssssss\ - +ssssssssshmydMMMMMMMNddddyssssssss+ - /sssssssshNMMMyhhyyyyhmNMMMNhssssssss\ -.ssssssssdMMMNhsssssssssshNMMMdssssssss. -+sssshhhyNMMNyssssssssssssyNMMMysssssss+ -ossyNMMMNyMMhsssssssssssssshmmmhssssssso -ossyNMMMNyMMhsssssssssssssshmmmhssssssso -+sssshhhyNMMNyssssssssssssyNMMMysssssss+ -.ssssssssdMMMNhsssssssssshNMMMdssssssss. - \sssssssshNMMMyhhyyyyhdNMMMNhssssssss/ - +sssssssssdmydMMMMMMMMddddyssssssss+ - \ssssssssssshdmNNNNmyNMMMMhssssss/ - .ossssssssssssssssssdMMMNysssso. - -+sssssssssssssssssyyyssss+- + .ossssssssssssssssss${C2}dMMMNy${C1}sssso. + /sssssssssss${C2}hdmmNNmmyNMMMMh${C1}ssssss\ + +sssssssss${C2}hm${C1}yd${C2}MMMMMMMNddddy${C1}ssssssss+ + /ssssssss${C2}hNMMM${C1}yh${C2}hyyyyhmNMMMNh${C1}ssssssss\ +.ssssssss${C2}dMMMNh${C1}ssssssssss${C2}hNMMMd${C1}ssssssss. ++ssss${C2}hhhyNMMNy${C1}ssssssssssss${C2}yNMMMy${C1}sssssss+ +oss${C2}yNMMMNyMMh${C1}ssssssssssssss${C2}hmmmh${C1}ssssssso +oss${C2}yNMMMNyMMh${C1}sssssssssssssshmmmh${C1}ssssssso ++ssss${C2}hhhyNMMNy${C1}ssssssssssss${C2}yNMMMy${C1}sssssss+ +.ssssssss${C2}dMMMNh${C1}ssssssssss${C2}hNMMMd${C1}ssssssss. + \ssssssss${C2}hNMMM${C1}yh${C2}hyyyyhdNMMMNh${C1}ssssssss/ + +sssssssss${C2}dm${C1}yd${C2}MMMMMMMMddddy${C1}ssssssss+ + \sssssssssss${C2}hdmNNNNmyNMMMMh${C1}ssssss/ + .ossssssssssssssssss${C2}dMMMNy${C1}sssso. + -+sssssssssssssssss${C2}yyy${C1}ssss+- `:+ssssssssssssssssss+:` - .-\+oossssoo+/-. \ No newline at end of file + .-\+oossssoo+/-. diff --git a/config/config.yaml b/config/config.yaml index 4007a4b..3ad64eb 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,3 +1,5 @@ distro_ascii: auto fetch_script: auto -dependency_warning: true \ No newline at end of file +ansii_colors: [] +force_config_ansii: false +dependency_warning: true diff --git a/config/fetch_script.sh b/config/fetch_script.sh index a060048..84e8472 100644 --- a/config/fetch_script.sh +++ b/config/fetch_script.sh @@ -1,21 +1,21 @@ source fetch_script_functions.sh -echo "Distribution: ${DISTRO_LONG_NAME} ($(uname -m))" -echo "Hostname: $(cat /etc/hostname)" -echo "Kernel: $(uname -s) $(uname -r)" -echo "Packages: $(get_packages)" -echo "Shell: $(get_shell)" -echo "CPU: $(get_cpu_name) ($(nproc) threads)" +echo -e "${C3}Distribution: ${C4}${DISTRO_LONG_NAME} ($(uname -m))" +echo -e "${C3}Hostname: ${C4}$(cat /etc/hostname)" +echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)" +echo -e "${C3}Packages: ${C4}$(get_packages)" +echo -e "${C3}Shell: ${C4}$(get_shell)" +echo -e "${C3}CPU: ${C4}$(get_cpu_name) ($(nproc) threads)" if command_exists lshw; then - echo "GPU: $(lshw -class display 2> /dev/null | grep 'product' | cut -d":" -f2 | xargs)" + echo -e "${C3}GPU: ${C4}$(lshw -class display 2> /dev/null | grep 'product' | cut -d":" -f2 | xargs)" fi -echo "Memory: $(get_used_mem) MiB / $(get_total_mem) MiB" +echo -e "${C3}Memory: ${C4}$(get_used_mem) MiB / $(get_total_mem) MiB" if xhost >& /dev/null ; then if get_de_wm &> /dev/null; then - echo "DE/WM: $(get_de_wm)" + echo -e "${C3}DE/WM: ${C4}$(get_de_wm)" fi if command_exists xdpyinfo ; then - echo "Screen Resolution: $(get_screen_resolution)" + echo -e "${C3}Screen Resolution: ${C4}$(get_screen_resolution)" fi fi diff --git a/main.go b/main.go index 338ac13..e45e9eb 100644 --- a/main.go +++ b/main.go @@ -97,13 +97,14 @@ func readConfig() { } // Fetch ascii art and apply colors colorMap := make(map[string]string) - colorMap["C0"] = "C0=\033[0m" + colorMap["C0"] = "\033[0m" setColorMap := func() { - for i, color := range config.AnsiiColors { - if i > 6 { - break + for i := 0; i < 6; i++ { + if i > len(config.AnsiiColors)-1 { + colorMap["C"+strconv.Itoa(i+1)] = "\033[0m" + continue } - colorMap["C"+strconv.Itoa(i+1)] = fmt.Sprintf("\033[38;5;%dm", color) + colorMap["C"+strconv.Itoa(i+1)] = fmt.Sprintf("\033[1m\033[38;5;%dm", config.AnsiiColors[i]) } } setColorMap() @@ -174,7 +175,7 @@ func readConfig() { asciiSplit[lineIndex] = lastAsciiColor + line str := string(out) if lineIndex < len(strings.Split(str, "\n")) { - line = line + strings.Split(str, "\n")[lineIndex] + line = line + colorMap["C0"] + strings.Split(str, "\n")[lineIndex] } final += lastAsciiColor + line + "\n" }