From f9d881e9051a266cc113565213a89165b3ca696a Mon Sep 17 00:00:00 2001 From: dylan araps Date: Tue, 10 Oct 2017 08:29:55 +1100 Subject: [PATCH 001/300] image: Fix bug with getting wallpaper from feh. --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0ce2959d..2fbd6898 100755 --- a/neofetch +++ b/neofetch @@ -2492,7 +2492,9 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(awk -F\' '/feh/ {printf $2}' "${HOME}/.fehbg")" + image="$(< "${HOME}/.fehbg")" + image="${image#*\'}" + image="${image%\'*}" elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ From b763c31ad73acc297c4cf318e42fd3489c5e347b Mon Sep 17 00:00:00 2001 From: dylan araps Date: Tue, 10 Oct 2017 08:44:09 +1100 Subject: [PATCH 002/300] image: Fix bug with getting wallpaper from feh. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2fbd6898..06e36695 100755 --- a/neofetch +++ b/neofetch @@ -2492,7 +2492,7 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(< "${HOME}/.fehbg")" + image="$(awk '{print $NF}' "${HOME}/.fehbg")" image="${image#*\'}" image="${image%\'*}" From b57cdee02acecc2a45c388608400c552da28be6e Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 11 Oct 2017 08:49:07 +1100 Subject: [PATCH 003/300] image: Fix bug with getting wallpaper from feh. --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 06e36695..9edd4d10 100755 --- a/neofetch +++ b/neofetch @@ -2492,9 +2492,7 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(awk '{print $NF}' "${HOME}/.fehbg")" - image="${image#*\'}" - image="${image%\'*}" + image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ From 952f2e5b2256a4535c43bebccef099dc91a3c0db Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:24:56 +1100 Subject: [PATCH 004/300] fix Install Date for macOS --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0ce2959d..2614c123 100755 --- a/neofetch +++ b/neofetch @@ -2254,7 +2254,13 @@ get_install_date() { return ;; - *) install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" ;; + *) + if [[ "$os" == "Mac OS X" ]]; then + install_date="$(ls -dlctuT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + else + install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + fi + ;; esac install_date="${install_date//-/ }" From 3cac29c804d763352db07e37a996e474d2719240 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:32:58 +1100 Subject: [PATCH 005/300] Change -u to -U in macOS install date --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2614c123..f578ba7c 100755 --- a/neofetch +++ b/neofetch @@ -2256,7 +2256,7 @@ get_install_date() { *) if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctuT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" else install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" fi From 123d1652ff0549505acb1f30abbc7d37b7ccb3f1 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:44:22 +1100 Subject: [PATCH 006/300] fix line length to be under 100 chars in macOS install date --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f578ba7c..2636d8ed 100755 --- a/neofetch +++ b/neofetch @@ -2256,7 +2256,7 @@ get_install_date() { *) if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" else install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" fi From 75148f63eeb6ec1f8d0c902d8c26d9f9901c0911 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 15:08:28 +1100 Subject: [PATCH 007/300] docs: CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd81736..332793ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ ## Contributors [**@yslgirl**](https://github.com/yslgirl) +[**@iandrewt**](https://github.com/iandrewt) ## OS - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) +- Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) From f6c362f5a16b92cb64be2c4cdfa02d49078c0ce3 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 15 Oct 2017 07:21:40 +0700 Subject: [PATCH 008/300] Install Date: Use a separate case for MacOS ls --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 77d2ecde..5a3ac83e 100755 --- a/neofetch +++ b/neofetch @@ -2254,12 +2254,12 @@ get_install_date() { return ;; + *"HLOPRSTUWabc"*) # macOS ls + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" + ;; + *) - if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" - else - install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" - fi + install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" ;; esac From 51ff3d1c8853c58cfc4c56b9f155c68245c0d421 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 15 Oct 2017 07:26:27 +0700 Subject: [PATCH 009/300] docs: CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332793ca..31a6495b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## Contributors -[**@yslgirl**](https://github.com/yslgirl) -[**@iandrewt**](https://github.com/iandrewt) +- [**@yslgirl**](https://github.com/yslgirl) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@chrisweeksnz**](https://github.com/chrisweeksnz) ## OS @@ -9,3 +10,4 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) +- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) From a26fd76ca6a3f466bd4652e4a6150c52cbbf3925 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Mon, 16 Oct 2017 07:42:37 +1100 Subject: [PATCH 010/300] OS: Added support for Lunar Linux. --- ascii/distro/lunar | 13 +++++++++++++ neofetch | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 ascii/distro/lunar diff --git a/ascii/distro/lunar b/ascii/distro/lunar new file mode 100644 index 00000000..26bd295c --- /dev/null +++ b/ascii/distro/lunar @@ -0,0 +1,13 @@ +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| diff --git a/neofetch b/neofetch index 9edd4d10..20dcb0e1 100755 --- a/neofetch +++ b/neofetch @@ -3388,6 +3388,11 @@ get_distro_colors() { ascii_file="lubuntu" ;; + "Lunar"*) + set_colors 4 7 3 + ascii_file="lunar" + ;; + "mac"*"_small") set_colors 2 3 1 5 4 ascii_file="mac_small" From 3217b921e5c57c101b8a07604aae00fab051e6b0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 22:47:12 +1100 Subject: [PATCH 011/300] WM: Fix chunkwm being detected as Kwm on macOS --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4de22a6a..c5135ea4 100755 --- a/neofetch +++ b/neofetch @@ -710,8 +710,8 @@ get_wm() { ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" case "$ps_line" in - *"kwm"*) wm="Kwm" ;; *"chunkwm"*) wm="chunkwm" ;; + *"kwm"*) wm="Kwm" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; *) wm="Quartz Compositor" ;; From 468c49efe7322a0d2dedb8501c53582873547bc2 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 22:51:44 +1100 Subject: [PATCH 012/300] docs: CHANGELOG --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31a6495b..a6baba06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,5 +9,13 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) + +## Info + +**Window Manager** + +- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) + +**Install Date** +- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) From f7dc4441fc5f12cd0051f60f9cdada6adcdf7d27 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 23:13:36 +1100 Subject: [PATCH 013/300] gpu_driver: Add macOS (Nvidia) support --- config/config.conf | 2 +- neofetch | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/config.conf b/config/config.conf index e43f89f5..f0d7cdb9 100644 --- a/config/config.conf +++ b/config/config.conf @@ -26,7 +26,7 @@ print_info() { info "GPU" gpu info "Memory" memory - # info "GPU Driver" gpu_driver # Linux only + # info "GPU Driver" gpu_driver # Linux/macOS only # info "CPU Usage" cpu_usage # info "Disk" disk # info "Battery" battery diff --git a/neofetch b/neofetch index c5135ea4..5b561a73 100755 --- a/neofetch +++ b/neofetch @@ -2280,6 +2280,13 @@ get_gpu_driver() { '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" gpu_driver="${gpu_driver%, }" ;; + "Mac OS X") + if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then + gpu_driver="Nvidia Web Driver" + else + gpu_driver="macOS Default Graphics Driver" + fi + ;; esac } From 1ab898e94452232d550d5fe500235300d009d735 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 11:25:27 +1100 Subject: [PATCH 014/300] resolution: Fix errors on non-retina screens [macOS] Added a check to see if the plist file we use for checking the scale factor exists --- neofetch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 5b561a73..8924c80f 100755 --- a/neofetch +++ b/neofetch @@ -1540,14 +1540,18 @@ get_resolution() { awk '/Resolution:/ {printf $2"x"$4" @ "$6"Hz, "}')" fi - scale_factor="$(PlistBuddy -c "Print DisplayAnyUserSets:0:0:Resolution" \ - /Library/Preferences/com.apple.windowserver.plist)" + if [[ -e "/Library/Preferences/com.apple.windowserver.plist" ]]; then + scale_factor="$(PlistBuddy -c "Print DisplayAnyUserSets:0:0:Resolution" \ + /Library/Preferences/com.apple.windowserver.plist)" + else + scale_factor="" + fi # If no refresh rate is empty. [[ "$resolution" == *"@ Hz"* ]] && \ resolution="${resolution//@ Hz}" - ((${scale_factor%.*} == 2)) && \ + [[ "${scale_factor%.*}" == 2 ]] && \ resolution="${resolution// @/@2x @}" if [[ "$refresh_rate" == "off" ]]; then From 322acffb952600214ddaee2c3c6a709ec3940cf4 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 11:28:41 +1100 Subject: [PATCH 015/300] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6baba06..d7bf9400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,4 +18,9 @@ - [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) **Install Date** + - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) + +**Resolution** + +- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) From 4f3f0f73c0bae09fad45a37aabb6704f302e3b11 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:37:00 +1100 Subject: [PATCH 016/300] distro: fix whitespace for High Sierra --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8924c80f..8b981837 100755 --- a/neofetch +++ b/neofetch @@ -177,7 +177,7 @@ get_distro() { "10.10"*) codename="OS X Yosemite" ;; "10.11"*) codename="OS X El Capitan" ;; "10.12"*) codename="macOS Sierra" ;; - "10.13"*) codename="macOS High Sierra" ;; + "10.13"*) codename="macOS High Sierra" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" From 434a4d4fb76cfc57813beb0ca351b9146c08befc Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:57:05 +1100 Subject: [PATCH 017/300] model: add new iOS devices --- neofetch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 8b981837..5c9c5486 100755 --- a/neofetch +++ b/neofetch @@ -279,13 +279,16 @@ get_model() { "iPhone OS") case "$machine_arch" in "iPad1,1") model="iPad" ;; - "iPad2,"[1-4]) model="iPad2" ;; - "iPad3,"[1-3]) model="iPad3" ;; - "iPad3,"[4-6]) model="iPad4" ;; + "iPad2,"[1-4]) model="iPad 2" ;; + "iPad3,"[1-3]) model="iPad 3" ;; + "iPad3,"[4-6]) model="iPad 4" ;; + "iPad6,"[11-12]) model="iPad 5" ;; "iPad4,"[1-3]) model="iPad Air" ;; "iPad5,"[3-4]) model="iPad Air 2" ;; "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; "iPad6,"[3-4]) model="iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]) model="iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]) model="iPad Pro (10.5 Inch)" ;; "iPad2,"[5-7]) model="iPad mini" ;; "iPad4,"[4-6]) model="iPad mini 2" ;; "iPad4,"[7-9]) model="iPad mini 3" ;; @@ -306,6 +309,9 @@ get_model() { "iPhone8,4") model="iPhone SE" ;; "iPhone9,1" | "iPhone9,3") model="iPhone 7" ;; "iPhone9,2" | "iPhone9,4") model="iPhone 7 Plus" ;; + "iPhone10,1" | "iPhone10,4") model="iPhone 8" ;; + "iPhone10,2" | "iPhone10,5") model="iPhone 8 Plus" ;; + "iPhone10,3" | "iPhone10,6") model="iPhone X" ;; "iPod1,1") model="iPod touch" ;; "ipod2,1") model="iPod touch 2G" ;; From 87140464fcaf2cc762a456302c2965f420501ba8 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:58:37 +1100 Subject: [PATCH 018/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7bf9400..560033d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) ## Info From 402ac0bc00ae72fe31760fabff79f4e242a8c262 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 16:17:52 +1100 Subject: [PATCH 019/300] model: fix SC2102 on iPad --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5c9c5486..9e66c4bc 100755 --- a/neofetch +++ b/neofetch @@ -282,7 +282,7 @@ get_model() { "iPad2,"[1-4]) model="iPad 2" ;; "iPad3,"[1-3]) model="iPad 3" ;; "iPad3,"[4-6]) model="iPad 4" ;; - "iPad6,"[11-12]) model="iPad 5" ;; + "iPad6,11" | "iPad 6,12") model="iPad 5" ;; "iPad4,"[1-3]) model="iPad Air" ;; "iPad5,"[3-4]) model="iPad Air 2" ;; "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; From 857cbb21b48375b437ca7164238cf877f6502d05 Mon Sep 17 00:00:00 2001 From: natemaia Date: Thu, 26 Oct 2017 02:01:55 -0700 Subject: [PATCH 020/300] Update archlabs distro ascii art --- ascii/distro/archlabs | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs index 8e0b840e..74f8a026 100644 --- a/ascii/distro/archlabs +++ b/ascii/distro/archlabs @@ -1,18 +1,21 @@ -${c1} sy - h--d - d---: - :----/N - :------/N - N/----:---+ - N/---+/ :--:o - N/--:/ ::::s - +--- ::::s - N+---+ ::::s - N+----o +:o s::::s - N/----:: s:::s h:::::s - N/----:::y::::+ o::::::o - N/---::::::::::s d::::::::+N - /--::::::::::::dd::::::::::+N - :-:::/+syhd NNN N dhys+/:::/ - d::+ydN /s+/d -arc y\\. +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. From 98e2a0db99046f8e7163061be90f1eaf37fbdf34 Mon Sep 17 00:00:00 2001 From: Jesse Liles Date: Thu, 2 Nov 2017 16:13:55 -0400 Subject: [PATCH 021/300] Added Pop\!_OS distribution --- ascii/distro/pop_os | 21 +++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 ascii/distro/pop_os diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os new file mode 100644 index 00000000..a399f18f --- /dev/null +++ b/ascii/distro/pop_os @@ -0,0 +1,21 @@ +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// + diff --git a/neofetch b/neofetch index 9e66c4bc..11eccc98 100755 --- a/neofetch +++ b/neofetch @@ -3571,6 +3571,11 @@ get_distro_colors() { ascii_file="peppermint" ;; + "Pop!_OS"*) + set_colors 6 7 + ascii_file="pop_os" + ;; + "Porteus"*) set_colors 6 7 ascii_file="porteus" From 498991b106e83d08348a211acdfe8f90c5a6ac2b Mon Sep 17 00:00:00 2001 From: Maulik Mistry Date: Fri, 3 Nov 2017 02:26:31 -0700 Subject: [PATCH 022/300] Added color updates for Kubuntu logo. --- ascii/distro/kubuntu | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu index 3f7126c1..6302ff0f 100644 --- a/ascii/distro/kubuntu +++ b/ascii/distro/kubuntu @@ -1,20 +1,20 @@ ${c1} `.:/ossyyyysso/:. .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo-``/yyyyyyysyyyyo- - -syyyyyyyyyy` +yyyy/` `/yyyys- - +yyys/./syyyy: ..-` /yyyyyy+ - `oyyyy: `:syys+oooo+:. .yyyyyyyyo` - +yyyyyy/ `/yyyyyyyyyyys/` /sssssyyy+ --yyyyyyyy- -syyyyyyyyyyyyyys- syyy- -oyyyyso+: .yyyyyyyyyyyyyyyyyy. `.+yyyo -yyys /yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys.` /yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyyso: .yyyyyyyyyyyyyyyyyy.`.-:/syyyo --yyyyyyyy. -syyyyyyyyyyyyyys- syyy- - +yyyyyy: `syyyyyyyyyyys/` /o+++oyyy+ - `oyyyy. -syyy++oooo+/. oyyyyyyyyo - +yyys/-oyyyys` `..` -yyyyyyy+ - -syyyyyyyyy: .syyy/` `syyyys- - -oyyyyyyy:.`-yyyyyys+syyyyo- + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- ./oyyyyyyyyyyyyyyyyyyo/. `.:/oosyyyysso/:.` From d21f9e928dc62bd32a8aba835f78f84d4ef4cbb4 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 8 Nov 2017 07:20:25 +1100 Subject: [PATCH 023/300] model: Fix garbage --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9e66c4bc..f2546c77 100755 --- a/neofetch +++ b/neofetch @@ -353,6 +353,7 @@ get_model() { model="${model//Not Specified}" model="${model//Type1ProductConfigId}" model="${model//INVALID}" + model="${model//�}" case "$model" in "Standard PC"*) model="KVM/QEMU (${model})" ;; From dd8ee366b125ed4e2af654c99184c38618dd4f2c Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Sat, 18 Nov 2017 23:52:55 +0100 Subject: [PATCH 024/300] add neofetch --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 06e36695..1ca4506a 100755 --- a/neofetch +++ b/neofetch @@ -544,6 +544,9 @@ get_packages() { package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi + + type -p butch >/dev/null && \ + packages="$((packages+=$(butch list | wc -l)))" if type -p pkg >/dev/null; then case "$kernel_name" in From 744dd463300591692fd3481709b2d411f683e921 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 13 Nov 2017 22:37:29 +0100 Subject: [PATCH 025/300] ascii: add LEDE --- ascii/distro/lede | 9 +++++++++ neofetch | 5 +++++ 2 files changed, 14 insertions(+) create mode 100644 ascii/distro/lede diff --git a/ascii/distro/lede b/ascii/distro/lede new file mode 100644 index 00000000..b1af9495 --- /dev/null +++ b/ascii/distro/lede @@ -0,0 +1,9 @@ + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ diff --git a/neofetch b/neofetch index 9c8ad885..a1e515a5 100755 --- a/neofetch +++ b/neofetch @@ -3397,6 +3397,11 @@ get_distro_colors() { ascii_file="kubuntu" ;; + "LEDE"*) + set_colors 4 7 1 + ascii_file="lede" + ;; + "Linux") set_colors fg 8 3 ascii_file="linux" From 63df9687db98e2fbc86e184e7edac43668fd8895 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 19 Nov 2017 16:49:49 +0100 Subject: [PATCH 026/300] distro: fix trueos detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885..38be3f15 100755 --- a/neofetch +++ b/neofetch @@ -153,7 +153,7 @@ get_distro() { # Workarounds for FreeBSD based distros. [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" - [[ -f "/etc/rc.conf.trueos" ]] && distro="TrueOS" + [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" # /etc/pacbsd-release is an empty file [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" From a1e684388480f213eee2e54e12bd92c52e43983d Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Wed, 22 Nov 2017 22:08:11 +0100 Subject: [PATCH 027/300] disk: change Haiku's df detection 'blocks' keyword is also present in busybox' df. Busybox' df also has -P and -h flags, so it can be detected as normal df. 'Tracker' keyword seems to be exclusive to Haiku's df. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885..f129394c 100755 --- a/neofetch +++ b/neofetch @@ -2032,7 +2032,7 @@ get_disk() { # Get "df" version. df_version="$(df --version 2>&1)" case "$df_version" in - *"blocks"*) # Haiku + *"Tracker"*) # Haiku err "Your version of df cannot be used due to the non-standard flags" return ;; From acdd75220e1e6cda9146104fe8017adb9be8265f Mon Sep 17 00:00:00 2001 From: StarryTony Date: Thu, 23 Nov 2017 01:55:08 +0000 Subject: [PATCH 028/300] fix in mac can not make_thumbnail # fix in mac high Sierra cannot replace '/' with '_', optionally can use ${image//\//_} --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885..79d7bf7f 100755 --- a/neofetch +++ b/neofetch @@ -2686,7 +2686,8 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - image_name="$crop_mode-$crop_offset-$width-$height-${image//'/'/_}" + # fix in mac cannot replace '/' with '_', optionally can use ${image//\//_} + image_name="$crop_mode-$crop_offset-$width-$height-${image##*/}" # Handle file extensions. case "${image##*.}" in From c3d47ece7de5ac775c5557e0d24b889b7fd2ef98 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 26 Nov 2017 19:00:29 +0700 Subject: [PATCH 029/300] docs: CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 560033d0..3b658c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,18 @@ - [**@yslgirl**](https://github.com/yslgirl) - [**@iandrewt**](https://github.com/iandrewt) - [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- [**@dawidd6**](https://github.com/dawidd6) +- [**@MitchWeaver**](https://github.com/MitchWeaver) ## OS - Fixed detection bug with Gentoo. +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) +- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) ## Info @@ -22,6 +26,10 @@ - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) +**Package Manager** + +- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) + **Resolution** - [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) From fe9933f54421211658a413d5a8aa94741e7961c0 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:52:03 +0700 Subject: [PATCH 030/300] Image mode (MacOS): Fixed garbage letter appeared in iTerm2 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 157cf386..4ac54a4c 100755 --- a/neofetch +++ b/neofetch @@ -3003,7 +3003,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset}" + printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3016,7 +3016,7 @@ get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" printf "%b%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}" \ - "${underline// /$underline_char}${reset}" + "${underline// /$underline_char}${reset} " unset -v length fi prin=1 From ed99973989ea8f8026df3d40a169652f6f29d621 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:54:02 +0700 Subject: [PATCH 031/300] docs: CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b658c5c..5427d5fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [**@chrisweeksnz**](https://github.com/chrisweeksnz) - [**@dawidd6**](https://github.com/dawidd6) - [**@MitchWeaver**](https://github.com/MitchWeaver) +- [**@StarryTony**](https://github.com/StarryTony) ## OS @@ -16,6 +17,12 @@ - Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) + +## Images + +- [MacOS/iTerm2] Fixed thumbnail not appearing (replaced by placeholder) [**@StarryTony**](https://github.com/StarryTony) + + ## Info **Window Manager** From 39cda4f29fe3d77107a97fe7d71d7c0094ac9fe0 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:54:50 +0700 Subject: [PATCH 032/300] Misc: Remove comment --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 4ac54a4c..d420429c 100755 --- a/neofetch +++ b/neofetch @@ -2689,7 +2689,6 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - # fix in mac cannot replace '/' with '_', optionally can use ${image//\//_} image_name="$crop_mode-$crop_offset-$width-$height-${image##*/}" # Handle file extensions. From 1e8f12dd4a876fd2b8868641e506efde9a4e683c Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:38:11 +1100 Subject: [PATCH 033/300] gpu_driver: Add version to NVIDIA output --- neofetch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index d420429c..6124c601 100755 --- a/neofetch +++ b/neofetch @@ -551,9 +551,9 @@ get_packages() { package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi - + type -p butch >/dev/null && \ - packages="$((packages+=$(butch list | wc -l)))" + packages="$((packages+=$(butch list | wc -l)))" if type -p pkg >/dev/null; then case "$kernel_name" in @@ -2293,10 +2293,16 @@ get_gpu_driver() { gpu_driver="$(lspci -nnk | awk -F ': ' \ '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" gpu_driver="${gpu_driver%, }" + + if [[ "$gpu_driver" == *"nvidia"* ]]; then + gpu_driver="$(< /proc/driver/nvidia/version)" + gpu_driver="${gpu_driver/*Module }" + gpu_driver="NVIDIA ${gpu_driver/ *}" + fi ;; "Mac OS X") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then - gpu_driver="Nvidia Web Driver" + gpu_driver="NVIDIA Web Driver" else gpu_driver="macOS Default Graphics Driver" fi From ca49b178fe9cdf50b8de1d15a24a4cbcbdc6cd8a Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:43:05 +1100 Subject: [PATCH 034/300] de: Add GNOME version --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 6124c601..07ad1a99 100755 --- a/neofetch +++ b/neofetch @@ -689,6 +689,7 @@ get_de() { *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; *"mate"*) de="MATE" ;; + *"GNOME"*) de="GNOME $(gnome-shell --version)" ;; esac # Log that the function was run. From db21981373737c0865ba5bce475b652aeca2e761 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:45:47 +1100 Subject: [PATCH 035/300] de: Fix GNOME bug --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 07ad1a99..9cbf8441 100755 --- a/neofetch +++ b/neofetch @@ -689,7 +689,10 @@ get_de() { *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; *"mate"*) de="MATE" ;; - *"GNOME"*) de="GNOME $(gnome-shell --version)" ;; + *"GNOME"*) + de="$(gnome-shell --version)" + de="${de/Shell }" + ;; esac # Log that the function was run. From 8540a2f1e30a1233aca663bf23ebb5141630f4d6 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:56:33 +1100 Subject: [PATCH 036/300] cpu_temp: Detect CPU temperature file. --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9cbf8441..a2db5711 100755 --- a/neofetch +++ b/neofetch @@ -926,7 +926,12 @@ get_cpu() { esac speed_dir="/sys/devices/system/cpu/cpu0/cpufreq" - temp_dir="/sys/class/hwmon/hwmon0/temp1_input" + + # Select the right temperature file. + for temp_dir in /sys/class/hwmon/*; do + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power) ]] && \ + { temp_dir="${temp_dir}/temp1_input"; break; } + done # Get CPU speed. if [[ -d "$speed_dir" ]]; then From c43ffb028e83a0c855a453abed911b862e3d2532 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 10:29:14 +1100 Subject: [PATCH 037/300] image: Make (--size none) keep original image aspect ratio. --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index a2db5711..e73f5dbf 100755 --- a/neofetch +++ b/neofetch @@ -2690,6 +2690,12 @@ get_image_size() { width="${size%% *}" height="${size##* }" crop_mode="none" + + while (( "$width" >= ("$term_width" / 2) || + "$height" >= "$term_height" )); do + width="$((width / 2))" + height="$((height / 2))" + done ;; *) image_size="${image_size/px}" ;; From 7fc4f84217c101c49636732912e32e74d7ce6e2e Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:08:10 +1100 Subject: [PATCH 038/300] wm_theme: Fixed sawfish detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e73f5dbf..8a920205 100755 --- a/neofetch +++ b/neofetch @@ -758,7 +758,7 @@ get_wm_theme() { ;; "Sawfish") - wm_theme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' \ + wm_theme="$(awk -F "'|)" '!/^;/ && /default-frame-style/ {a=$(NF-1)} END{print a}') \ "${HOME}/.sawfish/custom")" ;; From ed05c6460b9aa3cd1eb0b5168b5d363db5f429f1 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:19:53 +1100 Subject: [PATCH 039/300] general: Add command used to run neofetch to verbose output. --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 8a920205..23534299 100755 --- a/neofetch +++ b/neofetch @@ -4764,6 +4764,9 @@ main() { # Take a screenshot. [[ "$scrot" == "on" ]] && take_scrot + # Add neofetch command to verbose output. + err "Neofetch command: $0 $*" + # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From 9b5d75907bac74ebdb96381e7e662e6ca55f838d Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:30:17 +1100 Subject: [PATCH 040/300] general: Add neofetch version to verbose output. --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 23534299..c9c26da0 100755 --- a/neofetch +++ b/neofetch @@ -4764,8 +4764,9 @@ main() { # Take a screenshot. [[ "$scrot" == "on" ]] && take_scrot - # Add neofetch command to verbose output. + # Add neofetch info to verbose output. err "Neofetch command: $0 $*" + err "Neofetch version: $version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From c5c4f901ba9b001d0cd991606c746ca1ffccd7cb Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:31:12 +1100 Subject: [PATCH 041/300] general: Add config version to verbose output --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index c9c26da0..c8bc85e8 100755 --- a/neofetch +++ b/neofetch @@ -4767,6 +4767,7 @@ main() { # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" + err "Neofetch config: $config_version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From 9f263fe1849d0a6a78232682368f9f4b9e650190 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:42:10 +1100 Subject: [PATCH 042/300] general: Fixed extra trailing prompt newline --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c8bc85e8..0f419aa1 100755 --- a/neofetch +++ b/neofetch @@ -4098,7 +4098,7 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 0)) && printf "%b" "\033[${lines}B" + ((lines > 1)) && printf "%b" "\033[${lines}B" } old_functions() { From a2290b739897c65086e4d885e1dd7c303a302239 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:48:49 +1100 Subject: [PATCH 043/300] cpu_temp: $temp is an environment variable on Windows. --- neofetch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 0f419aa1..e84ed1b6 100755 --- a/neofetch +++ b/neofetch @@ -949,8 +949,8 @@ get_cpu() { # Get CPU temp. if [[ -f "$temp_dir" ]]; then - temp="$(< "$temp_dir")" - temp="$((temp * 100 / 10000))" + deg="$(< "$temp_dir")" + deg="$((deg * 100 / 10000))" fi # Get CPU cores. @@ -1013,12 +1013,12 @@ get_cpu() { # Get CPU temp. case "$kernel_name" in "FreeBSD"* | "DragonFly"* | "NetBSD"*) - temp="$(sysctl -n dev.cpu.0.temperature)" - temp="${temp/C}" + deg="$(sysctl -n dev.cpu.0.temperature)" + deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - temp="$(sysctl -n hw.sensors.lm0.temp0)" - temp="${temp/ degC}" + deg="$(sysctl -n hw.sensors.lm0.temp0)" + deg="${deg/ degC}" ;; esac ;; @@ -1135,15 +1135,15 @@ get_cpu() { fi # Add CPU temp to the output. - if [[ "$cpu_temp" != "off" && "$temp" ]]; then - temp="${temp//.}" + if [[ "$cpu_temp" != "off" && "$deg" ]]; then + deg="${deg//.}" # Convert to Fahrenheit if enabled - [[ "$cpu_temp" == "F" ]] && temp="$((temp * 90 / 50 + 320))" + [[ "$cpu_temp" == "F" ]] && deg="$((deg * 90 / 50 + 320))" # Format the output - temp="[${temp/${temp: -1}}.${temp: -1}°${cpu_temp:-C}]" - cpu="$cpu $temp" + deg="[${deg/${deg: -1}}.${deg: -1}°${cpu_temp:-C}]" + cpu="$cpu $deg" fi } From 8762403de9fc0648fbb941a1de599891d318ba61 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 14:43:21 +1100 Subject: [PATCH 044/300] wm_theme: Fix sawfish theme. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e84ed1b6..065a7ea6 100755 --- a/neofetch +++ b/neofetch @@ -758,7 +758,7 @@ get_wm_theme() { ;; "Sawfish") - wm_theme="$(awk -F "'|)" '!/^;/ && /default-frame-style/ {a=$(NF-1)} END{print a}') \ + wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ "${HOME}/.sawfish/custom")" ;; From 6711ebc91f9bea32a6c2c75b56324f35ca691925 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sat, 16 Dec 2017 15:51:07 +1100 Subject: [PATCH 045/300] image: Added pixterm backend. --- config/config.conf | 2 +- neofetch | 20 +++++++++++++++----- neofetch.1 | 7 +++++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/config/config.conf b/config/config.conf index f0d7cdb9..aadbf825 100644 --- a/config/config.conf +++ b/config/config.conf @@ -543,7 +543,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' # Flag: --backend image_backend="ascii" diff --git a/neofetch b/neofetch index 065a7ea6..a2c33551 100755 --- a/neofetch +++ b/neofetch @@ -2374,7 +2374,8 @@ image_backend() { "ascii") get_ascii ;; "off") image_backend="off" ;; - "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" | "tycat" | "w3m" | "sixel") + "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" |\ + "tycat" | "w3m" | "sixel" | "pixterm") get_image_source if [[ ! -f "$image" ]]; then @@ -2400,7 +2401,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', - 'off', 'sixel', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii ;; @@ -2800,8 +2801,16 @@ display_image() { to_off "Image: jp2a failed to display the image." ;; + "pixterm") + pixterm -tc "$((width / font_width))" \ + -tr "$((height / font_height))" \ + "$image" ||\ + to_off "Image: pixterm failed to display the image." + ;; + "sixel") - img2sixel -w "$width" "$image" || to_off "Image: libsixel failed to display the image." + img2sixel -w "$width" "$image" ||\ + to_off "Image: libsixel failed to display the image." ;; "termpix") @@ -4430,6 +4439,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. + --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. @@ -4645,8 +4655,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--sixel" |\ - "--termpix" | "--tycat" | "--w3m") + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m") image_backend="${1/--}" case "$2" in "-"* | "") ;; diff --git a/neofetch.1 b/neofetch.1 index 160b9905..33958fb1 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH NEOFETCH "1" "September 2017" "Neofetch 3.3.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. +.TH NEOFETCH "1" "December 2017" "Neofetch 3.3.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -207,6 +207,9 @@ Shortcut to use 'iterm2' backend. \fB\-\-jp2a\fR source Shortcut to use 'jp2a' backend. .TP +\fB\-\-pixterm\fR source +Shortcut to use 'pixterm' backend. +.TP \fB\-\-sixel\fR source Shortcut to use 'sixel' backend. .TP From a9df517fd41edc34af8a05e55c8fdf0ce54b61d2 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:08:05 +1100 Subject: [PATCH 046/300] wm: Add support for way-cooler --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a2c33551..e4adc5c9 100755 --- a/neofetch +++ b/neofetch @@ -716,7 +716,11 @@ get_wm() { # Fallback for Wayland wms. [[ "$wm" == "xwlc" ]] && \ - wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")" + wm="$(ps -e | grep -m 1 -o -F -e "sway" \ + -e "orbment" \ + -e "velox" \ + -e "orbital" \ + -e "way-cooler")" else case "$os" in From 80a34bdf28801b05bc45fdba3d4ca641205f1980 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:08:30 +1100 Subject: [PATCH 047/300] wm: Remove uneeded velox detection --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index e4adc5c9..1724d6c3 100755 --- a/neofetch +++ b/neofetch @@ -718,7 +718,6 @@ get_wm() { [[ "$wm" == "xwlc" ]] && \ wm="$(ps -e | grep -m 1 -o -F -e "sway" \ -e "orbment" \ - -e "velox" \ -e "orbital" \ -e "way-cooler")" From 9ad9d4d75e368736649ef45d3ffbe68c4eaa6033 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:43:41 +1100 Subject: [PATCH 048/300] wm: Better wayland detection --- neofetch | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 1724d6c3..7fb09fd9 100755 --- a/neofetch +++ b/neofetch @@ -677,7 +677,7 @@ get_de() { esac # Fallback to using xprop. - [[ -n "$DISPLAY" && -z "$de" ]] && \ + [[ "$DISPLAY" && -z "$de" ]] && \ de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')" # Format strings. @@ -703,7 +703,30 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$WAYLAND_DISPLAY" ]]; then + if [[ "$SWAYSOCK" ]]; then + wm="sway" + + else + wm="$(ps -e | grep -m 1 -o -F -e "asc" \ + -e "fireplace" \ + -e "grefsen" \ + -e "mazecompositor" \ + -e "maynard" \ + -e "motorcar" \ + -e "orbment" \ + -e "orbital" \ + -e "perceptia" \ + -e "rustland" \ + -e "velox" \ + -e "wavy" \ + -e "wayhouse" \ + -e "way-cooler" \ + -e "westford" \ + -e "weston")" + fi + + elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -714,13 +737,6 @@ get_wm() { # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" - # Fallback for Wayland wms. - [[ "$wm" == "xwlc" ]] && \ - wm="$(ps -e | grep -m 1 -o -F -e "sway" \ - -e "orbment" \ - -e "orbital" \ - -e "way-cooler")" - else case "$os" in "Mac OS X") @@ -1634,7 +1650,7 @@ get_style() { # Fix weird output when the function is run multiple times. unset gtk2_theme gtk3_theme theme path - if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then # Get DE if user has disabled the function. ((de_run != 1)) && get_de From 4870a863ac3c3f2ab818eb38b44bb23cc3a03935 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 21:10:48 +1100 Subject: [PATCH 049/300] wm: cleanup --- neofetch | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index 7fb09fd9..05c441cd 100755 --- a/neofetch +++ b/neofetch @@ -704,27 +704,24 @@ get_wm() { ((wm_run == 1)) && return if [[ "$WAYLAND_DISPLAY" ]]; then - if [[ "$SWAYSOCK" ]]; then - wm="sway" - - else - wm="$(ps -e | grep -m 1 -o -F -e "asc" \ - -e "fireplace" \ - -e "grefsen" \ - -e "mazecompositor" \ - -e "maynard" \ - -e "motorcar" \ - -e "orbment" \ - -e "orbital" \ - -e "perceptia" \ - -e "rustland" \ - -e "velox" \ - -e "wavy" \ - -e "wayhouse" \ - -e "way-cooler" \ - -e "westford" \ - -e "weston")" - fi + wm="$(ps -e | grep -m 1 -o -F \ + -e "asc" \ + -e "fireplace" \ + -e "grefsen" \ + -e "mazecompositor" \ + -e "maynard" \ + -e "motorcar" \ + -e "orbment" \ + -e "orbital" \ + -e "perceptia" \ + -e "rustland" \ + -e "sway" \ + -e "velox" \ + -e "wavy" \ + -e "wayhouse" \ + -e "way-cooler" \ + -e "westford" \ + -e "weston")" elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" @@ -752,11 +749,13 @@ get_wm() { ;; "Windows") - wm="$(tasklist | grep -m 1 -o -F -e "bugn" \ - -e "Windawesome" \ - -e "blackbox" \ - -e "emerge" \ - -e "litestep")" + wm="$(tasklist | grep -m 1 -o -F \ + -e "bugn" \ + -e "Windawesome" \ + -e "blackbox" \ + -e "emerge" \ + -e "litestep")" + [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; From 2e5384581f86c46de5fdb81829916f8bb1baa1db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 17 Dec 2017 21:41:27 +1100 Subject: [PATCH 050/300] Update CHANGELOG.md --- CHANGELOG.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5427d5fc..30a557da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,25 +14,62 @@ - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) +- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) +- Added support for Lunar Linux. + + +## General + +- Added more info to verbose mode for debugging. +- Fixed bug in prompt location calculation. + + +## Ascii + +- Added color updates for Kubuntu logo. **Maulik Mistry** ## Images -- [MacOS/iTerm2] Fixed thumbnail not appearing (replaced by placeholder) [**@StarryTony**](https://github.com/StarryTony) - +- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) +- Fixed bug with getting wallpaper from feh. +- Added `pixterm` backend. ## Info +**Desktop Environment** + +- Added GNOME version. + **Window Manager** -- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) +- Added support for most (*if not all*) current Wayland compositors/window manager's. +- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) + +**Window Manager Theme** + +- Fixed `sawfish` detection. **Install Date** - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) +**Theme** + +- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) + +**CPU** + +- [linux] Detect the correct temperature file to use. +- [windows] Removed `$temp` usage as it's an envar. + +**GPU** + +- [linux] Added driver version to NVIDIA output. +- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) + **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) @@ -40,3 +77,15 @@ **Resolution** - [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) + +**Song** + +- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) + +**Model** + +- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) + +**Disk** + +- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) From 6e20dfe75926d06ad5c1bbeba8fbd663048da429 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:11:45 +1100 Subject: [PATCH 051/300] DE/WM: Added support for TDE --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1724d6c3..9987bc35 100755 --- a/neofetch +++ b/neofetch @@ -114,7 +114,7 @@ get_distro() { elif type -p tazpkg >/dev/null; then distro="SliTaz $(< /etc/slitaz-release)" - elif type -p kpm > /dev/null; then + elif type -p kpt /dev/null && type -p kpm > /dev/null; then distro="KSLinux" elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then @@ -476,6 +476,7 @@ get_packages() { # This solves issues with neofetch opening the "pacman" game. local PATH=":${PATH}:" local PATH="${PATH/':/usr/games:'/:}" + local PATH="${PATH/':/opt/trinity/bin:'/:}" local PATH="${PATH%:}" local PATH="${PATH#:}" @@ -666,6 +667,9 @@ get_de() { elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then de="MATE" + + elif [[ "$TDE_FULL_SESSION" ]]; then + de="Trinity" fi # When a window manager is started from a display manager @@ -683,7 +687,6 @@ get_de() { # Format strings. case "$de" in "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"TDE_FULL_SESSION"*) de="Trinity" ;; *"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; @@ -707,7 +710,7 @@ get_wm() { id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*_NET_WM_NAME = }" + wm="${wm/*WM_NAME = }" wm="${wm/\"}" wm="${wm/\"*}" From 11a2adc8edfeb21d96bd25dc60007e61f8eb8a26 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:22:03 +1100 Subject: [PATCH 052/300] packages: Fix kpm --- neofetch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 8f2868eb..b719da29 100755 --- a/neofetch +++ b/neofetch @@ -476,7 +476,6 @@ get_packages() { # This solves issues with neofetch opening the "pacman" game. local PATH=":${PATH}:" local PATH="${PATH/':/usr/games:'/:}" - local PATH="${PATH/':/opt/trinity/bin:'/:}" local PATH="${PATH%:}" local PATH="${PATH#:}" @@ -488,9 +487,6 @@ get_packages() { type -p dpkg >/dev/null && \ packages="$((packages+=$(dpkg --get-selections | grep -cv deinstall$)))" - type -p kpm >/dev/null && \ - packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" - type -p pkgtool >/dev/null && \ packages="$((packages+=$(ls -1 /var/log/packages | wc -l)))" @@ -547,6 +543,9 @@ get_packages() { type -p alps >/dev/null && \ packages="$((packages+=$(alps showinstalled | wc -l)))" + ` + [[ "$distro" == "KSLinux" ]] && type -p kpm >/dev/null && \ + packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) From 77596ea868d51d1828fcfbb378c81c52582fab75 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:26:48 +1100 Subject: [PATCH 053/300] TDE: Better fix --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b719da29..18d81c3a 100755 --- a/neofetch +++ b/neofetch @@ -114,7 +114,8 @@ get_distro() { elif type -p tazpkg >/dev/null; then distro="SliTaz $(< /etc/slitaz-release)" - elif type -p kpt /dev/null && type -p kpm > /dev/null; then + elif type -p kpt >/dev/null && \ + type -p kpm >/dev/null; then distro="KSLinux" elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then @@ -543,8 +544,9 @@ get_packages() { type -p alps >/dev/null && \ packages="$((packages+=$(alps showinstalled | wc -l)))" - ` - [[ "$distro" == "KSLinux" ]] && type -p kpm >/dev/null && \ + + type -p kpt >/dev/null && \ + type -p kpm >/dev/null && \ packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then From f2300d33062fe337b7f39ef8a8452bb4e7ab1333 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:42:58 +1100 Subject: [PATCH 054/300] gpu [intel]: Show driver version if glxinfo isn't installed --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 18d81c3a..acf517e4 100755 --- a/neofetch +++ b/neofetch @@ -1244,9 +1244,12 @@ get_gpu() { ;; *"intel"*) - gpu="$(glxinfo | grep "Device:.*Intel")" + type -p glxinfo >/dev/null && \ + gpu="$(glxinfo | grep "Device:.*Intel")" + gpu="${gpu/*Intel/Intel}" gpu="${gpu/'(R)'}" + gpu="${gpu/'Corporation'}" gpu="${gpu/ \(*}" [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" From 8c277ac74aaefbeb4981838acb60c62036ddbf4a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 08:39:47 +1100 Subject: [PATCH 055/300] general: Swap sequences from \033 to \e --- neofetch | 60 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index acf517e4..642cfbca 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" shopt -s nocasematch # Reset colors and bold. -reset="\033[0m" +reset="\\e[0m" # DETECT INFORMATION @@ -2356,9 +2356,9 @@ get_cols() { # Generate the string. for ((start; start<=end; start++)); do case "$start" in - [0-6]) blocks+="${reset}\033[3${start}m\033[4${start}m${block_width}" ;; - 7) blocks+="${reset}\033[3${start}m\033[4${start}m${block_width}" ;; - *) blocks2+="\033[38;5;${start}m\033[48;5;${start}m${block_width}" ;; + [0-6]) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; + 7) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; + *) blocks2+="\\e[38;5;${start}m\\e[48;5;${start}m${block_width}" ;; esac done @@ -2371,12 +2371,12 @@ get_cols() { # Add newlines to the string. cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\033[${text_padding}C${zws}}" + cols="${cols//nl/\\n\\\e[${text_padding}C${zws}}" # Add block height to info height. info_height="$((info_height+=block_height+2))" - printf "%b\n" "\033[${text_padding}C${zws}${cols}" + printf "%b\n" "\\e[${text_padding}C${zws}${cols}" fi unset -v blocks blocks2 cols @@ -2433,7 +2433,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "%b" "\033[${lines:-0}A\033[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\\e[${lines:-0}A\\e[9999999D" } get_ascii() { @@ -2621,14 +2621,14 @@ get_term_size() { # so we have to use a slightly different sequence to # get the terminal size. if [[ -n "$TMUX" ]]; then - printf "%b" "\033Ptmux;\033\033[14t\033\033[c\033\\" + printf "%b" "\\ePtmux;\\e\\e[14t\\e\\e[c\\e\\" read_flags=(-d c) elif [[ "$image_backend" == "tycat" ]]; then - printf "%b" "\033}qs\000" + printf "%b" "\\e}qs\000" else - printf "%b" "\033[14t\033[c" + printf "%b" "\\e[14t\\e[c" read_flags=(-d c) fi @@ -2647,7 +2647,7 @@ get_term_size() { term_width="${term_size[2]/t*}" fi - # Get terminal width/height if \033[14t is unsupported. + # Get terminal width/height if \\e[14t is unsupported. if [[ -z "$term_width" ]] || (( "$term_width" < 50 )); then if type -p xdotool >/dev/null 2>&1; then current_window="$(xdotool getactivewindow)" @@ -2845,10 +2845,10 @@ display_image() { "iterm2") image="$(base64 < "$image")" - iterm_cmd="\033]1337;File=width=${width}px;height=${height}px;inline=1:${image}" + iterm_cmd="\\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" # Tmux requires an additional escape sequence for this to work. - [[ -n "$TMUX" ]] && iterm_cmd="\033Ptmux;\033${iterm_cmd}\033\\" + [[ -n "$TMUX" ]] && iterm_cmd="\\ePtmux;\\e${iterm_cmd}\\e\\" printf "%b\a\n" "$iterm_cmd" ;; @@ -2884,7 +2884,7 @@ to_ascii() { get_ascii # Set cursor position next image/ascii. - printf "%b" "\033[${lines:-0}A\033[9999999D" + printf "%b" "\\e[${lines:-0}A\\e[9999999D" } to_off() { @@ -3044,7 +3044,7 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\033[0m'}")" + string="$(trim "${string//$'\\e[0m'}")" # Log length if it doesn't exist. if [[ -z "$length" ]]; then @@ -3057,7 +3057,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} " + printf "%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3069,7 +3069,7 @@ prin() { get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" - printf "%b%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}" \ + printf "%b%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${underline_color}" \ "${underline// /$underline_char}${reset} " unset -v length fi @@ -3090,12 +3090,12 @@ get_line_break() { get_bold() { case "$ascii_bold" in - "on") ascii_bold="\033[1m" ;; + "on") ascii_bold="\\e[1m" ;; "off") ascii_bold="" ;; esac case "$bold" in - "on") bold="\033[1m" ;; + "on") bold="\\e[1m" ;; "off") bold="" ;; esac } @@ -3124,10 +3124,10 @@ trim_quotes() { } strip_sequences() { - strip="${1//$'\033['3[0-9]m}" - strip="${strip//$'\033['38\;5\;[0-9]m}" - strip="${strip//$'\033['38\;5\;[0-9][0-9]m}" - strip="${strip//$'\033['38\;5\;[0-9][0-9][0-9]m}" + strip="${1//$'\\e['3[0-9]m}" + strip="${strip//$'\\e['38\;5\;[0-9]m}" + strip="${strip//$'\\e['38\;5\;[0-9][0-9]m}" + strip="${strip//$'\\e['38\;5\;[0-9][0-9][0-9]m}" printf "%s\n" "$strip" } @@ -3926,9 +3926,9 @@ set_text_colors() { color() { case "$1" in - [0-6]) printf "%b" "${reset}\033[3${1}m" ;; - 7 | "fg") printf "%b" "\033[37m${reset}" ;; - *) printf "%b" "\033[38;5;${1}m" ;; + [0-6]) printf "%b" "${reset}\\e[3${1}m" ;; + 7 | "fg") printf "%b" "\\e[37m${reset}" ;; + *) printf "%b" "\\e[38;5;${1}m" ;; esac } @@ -3951,7 +3951,7 @@ stdout() { } err() { - err+="$(color 1)[!]\033[0m $1\n" + err+="$(color 1)[!]\\e[0m $1\n" } get_full_path() { @@ -4132,7 +4132,7 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 1)) && printf "%b" "\033[${lines}B" + ((lines > 1)) && printf "%b" "\\e[${lines}B" } old_functions() { @@ -4780,10 +4780,10 @@ main() { # Minix doesn't support these sequences. if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then # If the script exits for any reason, unhide the cursor. - trap 'printf "\033[?25h\033[?7h"' EXIT + trap 'printf "\\e[?25h\\e[?7h"' EXIT # Hide the cursor and disable line wrap. - printf "\033[?25l\033[?7l" + printf "\\e[?25l\\e[?7l" fi image_backend From a53cbdbc14d68c6b3d740b17fbbabeb8ff56a0eb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 11:04:50 +1100 Subject: [PATCH 056/300] general: Fix prompt on openBSD --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 642cfbca..92890228 100755 --- a/neofetch +++ b/neofetch @@ -4132,7 +4132,11 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 1)) && printf "%b" "\\e[${lines}B" + if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then + printf "%b" "\\e[${lines}B" + else + tput cub "$lines" + fi } old_functions() { From 5ffd5149b4224cffd7642832c6070366b0956db5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 19:25:54 +1100 Subject: [PATCH 057/300] memory [openbsd]: Fix crash --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 92890228..cc992c4b 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,7 @@ get_memory() { # Mem used. case "$kernel_name" in - "OpenBSD"*) mem_used="$(($(vmstat | awk 'END{printf $4}') / 1024))" ;; + "OpenBSD"*) mem_used="$(($(vmstat | awk -F ' |M' 'END{printf $4}') / 1024))" ;; *) mem_used="$((mem_total - mem_free))" ;; esac ;; From beee0203d08cb37a6b393249b24bf641f4c74c96 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 19:27:57 +1100 Subject: [PATCH 058/300] general: Fix prompt on openBSD --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cc992c4b..25feae3f 100755 --- a/neofetch +++ b/neofetch @@ -4135,7 +4135,7 @@ dynamic_prompt() { if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then printf "%b" "\\e[${lines}B" else - tput cub "$lines" + tput cud "$lines" fi } From 21cc7bab938c6865988035266f2b374b2d61b5ed Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 26 Dec 2017 07:20:50 +1100 Subject: [PATCH 059/300] general: Fix prompt on openBSD --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 25feae3f..6a742f19 100755 --- a/neofetch +++ b/neofetch @@ -4132,10 +4132,11 @@ dynamic_prompt() { fi # Set the prompt location. - if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then - printf "%b" "\\e[${lines}B" - else - tput cud "$lines" + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\\e[${lines}B" ;; + esac fi } From dc929a65949d08586c4e95f236b89e7f78c88d1a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 26 Dec 2017 07:38:11 +1100 Subject: [PATCH 060/300] memory: Fix crash on OpenBSD --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6a742f19..977ead29 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,10 @@ get_memory() { # Mem used. case "$kernel_name" in - "OpenBSD"*) mem_used="$(($(vmstat | awk -F ' |M' 'END{printf $4}') / 1024))" ;; + "OpenBSD"*) + mem_used="$(vmstat | awk 'END{printf $4}')" + mem_used="$((${mem_used/M} / 1024))" + ;; *) mem_used="$((mem_total - mem_free))" ;; esac ;; From 21f1faec6222c62fc44d025e5a3e3c8b9dba66d9 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Sun, 31 Dec 2017 14:50:28 -0500 Subject: [PATCH 061/300] Support added for FreeMiNT on Atari computers and clones/VMs --- ascii/distro/gem | 19 ++++++++++ neofetch | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 ascii/distro/gem diff --git a/ascii/distro/gem b/ascii/distro/gem new file mode 100644 index 00000000..d69ae938 --- /dev/null +++ b/ascii/distro/gem @@ -0,0 +1,19 @@ + + + ${c1} ## + ## ######### + #### ## + #### #### ## + #### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## + + diff --git a/neofetch b/neofetch index 977ead29..4d629770 100755 --- a/neofetch +++ b/neofetch @@ -44,6 +44,7 @@ get_os() { "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; "IRIX64") os="IRIX" ;; + "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 @@ -230,6 +231,10 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; + + "FreeMiNT") + distro="FreeMiNT" + ;; esac distro="${distro//Enterprise Server}" @@ -238,7 +243,7 @@ get_distro() { # Get OS architecture. case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX") machine_arch="$(uname -p)" ;; + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; *) machine_arch="$(uname -m)" ;; esac @@ -340,6 +345,10 @@ get_model() { "AIX") model="$(/usr/bin/uname -M)" ;; + + "FreeMiNT") + model="$(sysctl -n hw.model)" + ;; esac # Remove dummy OEM info. @@ -426,6 +435,13 @@ get_uptime() { h="${h#0}" t="${t#0}" seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" ;; + + "FreeMiNT") + boot="$(sysctl -n kern.boottime)" + now="$(date +%s)" + seconds="$((now - boot))" + ;; + esac days="$((seconds / 60 / 60 / 24)) days" @@ -604,6 +620,12 @@ get_packages() { "IRIX") packages="$(($(versions -b | wc -l)-3))" ;; + + "FreeMiNT") + type -p rpm >/dev/null && \ + packages="$((packages+=$(rpm -qa | wc -l)))" + ;; + esac ((packages == 0)) && unset packages @@ -653,6 +675,26 @@ get_de() { esac ;; + "FreeMiNT") + get_wm + + if [ -e /proc/thing* ]; then + de="Thing" + elif [ -e /proc/jinnee* ]; then + de="Jinnee" + elif [ -e /proc/tera* ]; then + de="Teradesk" + elif [ -e /proc/mdesk ]; then + de="mDesk" + elif [ -e /proc/neod* ]; then + de="NeoDesk" + elif [ -e /proc/zdesk* ]; then + de="zDesk" + else + de="Atari" + fi + ;; + *) ((wm_run != 1)) && get_wm @@ -727,7 +769,7 @@ get_wm() { -e "westford" \ -e "weston")" - elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -763,6 +805,21 @@ get_wm() { [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; + + "FreeMiNT") + if [ -e /proc/xaaes* ]; then + wm="XaAES" + elif [ -e /proc/myaes* ]; then + wm="MyAES" + elif [ -e /proc/naes* ]; then + wm="N.AES" + elif [ -e /proc/geneva* ]; then + wm="Geneva" + else + wm="Atari AES" + fi + ;; + esac fi @@ -1104,6 +1161,12 @@ get_cpu() { # Get CPU cores. cores="$(sysconf NPROC_ONLN)" ;; + + "FreeMiNT") + cpu="$(cat /kern/cpuinfo | awk -F':' '/CPU:/ {printf $2}')" + speed="$(cat /kern/cpuinfo | awk -F':' '/Clocking:/ {printf $2}' | awk -F'.' '{ printf $1 }')" + ;; + esac # Remove un-needed patterns from cpu output. @@ -1188,7 +1251,8 @@ get_cpu_usage() { "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi @@ -1445,6 +1509,15 @@ get_memory() { mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" ;; + + "FreeMiNT") + mem_total="$(cat /kern/meminfo | awk -F ':|kB' '/MemTotal:/ {printf $2}')" + mem_free="$(cat /kern/meminfo | awk -F ':|kB' '/MemFree:/ {printf $2}')" + mem_used="$(( mem_total - mem_free ))" + mem_total="$(( mem_total / 1024 ))" + mem_used="$(( mem_used / 1024 ))" + ;; + esac memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" @@ -1833,6 +1906,11 @@ get_term() { *) term="${TERM_PROGRAM/\.app}" ;; esac + # Most likely TosWin2 on FreeMiNT - quick check + if [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]]; then + term="TosWin2" + fi + # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do if [[ "$SSH_CONNECTION" ]]; then @@ -2384,6 +2462,12 @@ get_cols() { unset -v blocks blocks2 cols + # TosWin2 on FreeMiNT is terrible at this, + # so we'll reset colors arbitrarily + if [ "${term}" == "TosWin2" ]; then + printf "%b\n" "\\e[30;47m" + fi + # Tell info() that we printed manually. prin=1 } @@ -3368,6 +3452,13 @@ get_distro_colors() { ascii_file="freebsd" ;; + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well + # set_colors 0 + ascii_file="gem" + ;; + "Frugalware"*) set_colors 4 7 1 ascii_file="frugalware" From 69c219e351db5f3cf78447409cdaddd46fc7f845 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Mon, 1 Jan 2018 12:20:07 -0500 Subject: [PATCH 062/300] Formatting fixes and awk improvements for FreeMiNT. Changed method for finding DE and WM processes in FreeMiNT. --- ascii/distro/gem | 34 +++++++++++------------- neofetch | 69 ++++++++++++++++++++---------------------------- 2 files changed, 43 insertions(+), 60 deletions(-) diff --git a/ascii/distro/gem b/ascii/distro/gem index d69ae938..49c8849d 100644 --- a/ascii/distro/gem +++ b/ascii/distro/gem @@ -1,19 +1,15 @@ - - - ${c1} ## - ## ######### - #### ## - #### #### ## - #### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## - - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## diff --git a/neofetch b/neofetch index 4d629770..d01c63dd 100755 --- a/neofetch +++ b/neofetch @@ -441,7 +441,6 @@ get_uptime() { now="$(date +%s)" seconds="$((now - boot))" ;; - esac days="$((seconds / 60 / 60 / 24)) days" @@ -625,7 +624,6 @@ get_packages() { type -p rpm >/dev/null && \ packages="$((packages+=$(rpm -qa | wc -l)))" ;; - esac ((packages == 0)) && unset packages @@ -678,21 +676,16 @@ get_de() { "FreeMiNT") get_wm - if [ -e /proc/thing* ]; then - de="Thing" - elif [ -e /proc/jinnee* ]; then - de="Jinnee" - elif [ -e /proc/tera* ]; then - de="Teradesk" - elif [ -e /proc/mdesk ]; then - de="mDesk" - elif [ -e /proc/neod* ]; then - de="NeoDesk" - elif [ -e /proc/zdesk* ]; then - de="zDesk" - else - de="Atari" - fi + for possibles in "$(ls /proc)"; do + case "$possibles" in + *thing*) de="Thing" ;; + *jinnee*) de="Jinnee" ;; + *tera*) de="Teradesk" ;; + *neod*) de="NeoDesk" ;; + *zdesk*) de="zDesk" ;; + *mdesk*) de="mDesk" ;; + esac + done ;; *) @@ -807,19 +800,16 @@ get_wm() { ;; "FreeMiNT") - if [ -e /proc/xaaes* ]; then - wm="XaAES" - elif [ -e /proc/myaes* ]; then - wm="MyAES" - elif [ -e /proc/naes* ]; then - wm="N.AES" - elif [ -e /proc/geneva* ]; then - wm="Geneva" - else - wm="Atari AES" - fi + wm="Atari AES" + for possibles in "$(ls /proc | awk -F'[ .]' '/aes|geneva/ {print $1}')"; do + case "$possibles" in + *xaaes*) wm="XaAES" ;; + *myaes*) wm="MyAES" ;; + *naes*) wm="N.AES" ;; + geneva) wm="Geneva" ;; + esac + done ;; - esac fi @@ -1163,10 +1153,9 @@ get_cpu() { ;; "FreeMiNT") - cpu="$(cat /kern/cpuinfo | awk -F':' '/CPU:/ {printf $2}')" - speed="$(cat /kern/cpuinfo | awk -F':' '/Clocking:/ {printf $2}' | awk -F'.' '{ printf $1 }')" + cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F'[:.]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" ;; - esac # Remove un-needed patterns from cpu output. @@ -1511,11 +1500,11 @@ get_memory() { ;; "FreeMiNT") - mem_total="$(cat /kern/meminfo | awk -F ':|kB' '/MemTotal:/ {printf $2}')" - mem_free="$(cat /kern/meminfo | awk -F ':|kB' '/MemFree:/ {printf $2}')" - mem_used="$(( mem_total - mem_free ))" - mem_total="$(( mem_total / 1024 ))" - mem_used="$(( mem_used / 1024 ))" + mem_total="$(awk -F ':|kB' '/MemTotal:/ {printf $2}' /kern/meminfo)" + mem_free="$(awk -F ':|kB' '/MemFree:/ {printf $2}' /kern/meminfo)" + mem_used="$((mem_total - mem_free))" + mem_total="$((mem_total / 1024))" + mem_used="$((mem_used / 1024))" ;; esac @@ -1907,9 +1896,8 @@ get_term() { esac # Most likely TosWin2 on FreeMiNT - quick check - if [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]]; then + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ term="TosWin2" - fi # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do @@ -2464,9 +2452,8 @@ get_cols() { # TosWin2 on FreeMiNT is terrible at this, # so we'll reset colors arbitrarily - if [ "${term}" == "TosWin2" ]; then + [[ "$term" == "TosWin2" ]] && \ printf "%b\n" "\\e[30;47m" - fi # Tell info() that we printed manually. prin=1 From a0bd43f1f83a78017b193dc8647c5c8fbc5ecde8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:37:03 +1100 Subject: [PATCH 063/300] docs: README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 16ad5e91..b7d1dab4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ # Neofetch + + Packaging status + + [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) + Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using etc. Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. From 7798974bc0112090a3ec3241241dd8ed9e0e7e3b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:51:33 +1100 Subject: [PATCH 064/300] docs: README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b7d1dab4..2c83e022 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ For more information: **https://github.com/dylanaraps/neofetch/wiki** -![neofetch screenshot](https://u.teknik.io/KlBsD.png) +neofetch +neofetch ## Dependencies From dc936b5b236ddc028399430899bdfc97ad281224 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:52:48 +1100 Subject: [PATCH 065/300] docs: README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c83e022..0ee83bca 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ For more information: **https://github.com/dylanaraps/neofetch/wiki** -neofetch -neofetch +neofetch +neofetch ## Dependencies From 82875114fe79fac4cbbc74296f47046b60ca5c9b Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Tue, 2 Jan 2018 20:33:54 -0500 Subject: [PATCH 066/300] Additional FreeMiNT simplifications. Added careful fix for CPU clocking check on FreeMiNT. --- neofetch | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index d01c63dd..429e3f70 100755 --- a/neofetch +++ b/neofetch @@ -412,7 +412,7 @@ get_uptime() { seconds="${seconds/.*}" ;; - "Mac OS X" | "iPhone OS" | "BSD") + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") boot="$(sysctl -n kern.boottime)" boot="${boot/'{ sec = '}" boot="${boot/,*}" @@ -435,12 +435,6 @@ get_uptime() { h="${h#0}" t="${t#0}" seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" ;; - - "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - now="$(date +%s)" - seconds="$((now - boot))" - ;; esac days="$((seconds / 60 / 60 / 24)) days" @@ -676,8 +670,8 @@ get_de() { "FreeMiNT") get_wm - for possibles in "$(ls /proc)"; do - case "$possibles" in + for files in /proc/*; do + case "$files" in *thing*) de="Thing" ;; *jinnee*) de="Jinnee" ;; *tera*) de="Teradesk" ;; @@ -801,8 +795,8 @@ get_wm() { "FreeMiNT") wm="Atari AES" - for possibles in "$(ls /proc | awk -F'[ .]' '/aes|geneva/ {print $1}')"; do - case "$possibles" in + for files in /proc/*; do + case "$files" in *xaaes*) wm="XaAES" ;; *myaes*) wm="MyAES" ;; *naes*) wm="N.AES" ;; @@ -1154,7 +1148,7 @@ get_cpu() { "FreeMiNT") cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" - speed="$(awk -F'[:.]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F '[:.M]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" ;; esac @@ -1500,8 +1494,9 @@ get_memory() { ;; "FreeMiNT") - mem_total="$(awk -F ':|kB' '/MemTotal:/ {printf $2}' /kern/meminfo)" - mem_free="$(awk -F ':|kB' '/MemFree:/ {printf $2}' /kern/meminfo)" + mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" + mem_free="${mem/* }" + mem_total="${mem/ *}" mem_used="$((mem_total - mem_free))" mem_total="$((mem_total / 1024))" mem_used="$((mem_used / 1024))" From 0f4fcc46df41898a07172dc2c926ffacfb286abd Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Wed, 3 Jan 2018 20:16:08 -0500 Subject: [PATCH 067/300] Minor comment updates in FreeMiNT sections. --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 429e3f70..f8e88c34 100755 --- a/neofetch +++ b/neofetch @@ -2446,7 +2446,7 @@ get_cols() { unset -v blocks blocks2 cols # TosWin2 on FreeMiNT is terrible at this, - # so we'll reset colors arbitrarily + # so we'll reset colors arbitrarily. [[ "$term" == "TosWin2" ]] && \ printf "%b\n" "\\e[30;47m" @@ -3436,8 +3436,7 @@ get_distro_colors() { "FreeMiNT"*) # Don't explicitly set colors since - # TosWin2 doesn't reset well - # set_colors 0 + # TosWin2 doesn't reset well. ascii_file="gem" ;; From 0c8b0974feface8790b1f78358704fcff9082ef1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 4 Jan 2018 18:17:42 +1100 Subject: [PATCH 068/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ee83bca..12954b09 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Neofetch is a CLI system information tool written in BASH. Neofetch displays inf Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. -Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. +Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, `FreeMint`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. For more information: From a9ed7835d509e2e55cc383ab6072b2b432d94f4a Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 05:44:44 +0100 Subject: [PATCH 069/300] OS: detect 32-bit IRIX --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f8e88c34..bb24eb00 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX64" | "IRIX") os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From 6c3b0136dee6f44b24e80a70eb88b8a3b83747d6 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 06:32:14 +0100 Subject: [PATCH 070/300] Shells: add support for tcsh --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index f8e88c34..0c248db6 100755 --- a/neofetch +++ b/neofetch @@ -640,6 +640,10 @@ get_shell() { shell="${shell/version}" ;; + "tcsh") + shell+="$("$SHELL" -c 'printf "%s" "$tcsh"')" + ;; + *) shell+="$("$SHELL" --version 2>&1)" shell="${shell/ "${shell_name}"}" From d296741ac2914da848f44c9efc853ab1b8f0b8b4 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 07:05:47 +0100 Subject: [PATCH 071/300] Revert "OS: detect 32-bit IRIX" This reverts commit a9ed7835d509e2e55cc383ab6072b2b432d94f4a. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bb24eb00..f8e88c34 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64" | "IRIX") os="IRIX" ;; + "IRIX64") os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From 1000547569b514de13e6dbfe8364b947c57ba2f0 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 07:07:59 +0100 Subject: [PATCH 072/300] OS: detect 32-bit IRIX --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f8e88c34..a9feae92 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX"*) os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From dac53545f7a2bd1c0a347940dd1025017103a189 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 9 Jan 2018 11:25:24 +1100 Subject: [PATCH 073/300] merge master --- README.md | 3 ++ ascii/distro/gem | 15 +++++++++ neofetch | 86 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 ascii/distro/gem diff --git a/README.md b/README.md index 12954b09..93d37e0b 100644 --- a/README.md +++ b/README.md @@ -95,3 +95,6 @@ Donations will allow me to spend more time working on `neofetch`. If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** + + +hey rtexel diff --git a/ascii/distro/gem b/ascii/distro/gem new file mode 100644 index 00000000..49c8849d --- /dev/null +++ b/ascii/distro/gem @@ -0,0 +1,15 @@ +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## diff --git a/neofetch b/neofetch index 977ead29..cb0e8fde 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,8 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX"*) os="IRIX" ;; + "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 @@ -230,6 +231,10 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; + + "FreeMiNT") + distro="FreeMiNT" + ;; esac distro="${distro//Enterprise Server}" @@ -238,7 +243,7 @@ get_distro() { # Get OS architecture. case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX") machine_arch="$(uname -p)" ;; + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; *) machine_arch="$(uname -m)" ;; esac @@ -340,6 +345,10 @@ get_model() { "AIX") model="$(/usr/bin/uname -M)" ;; + + "FreeMiNT") + model="$(sysctl -n hw.model)" + ;; esac # Remove dummy OEM info. @@ -403,7 +412,7 @@ get_uptime() { seconds="${seconds/.*}" ;; - "Mac OS X" | "iPhone OS" | "BSD") + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") boot="$(sysctl -n kern.boottime)" boot="${boot/'{ sec = '}" boot="${boot/,*}" @@ -604,6 +613,11 @@ get_packages() { "IRIX") packages="$(($(versions -b | wc -l)-3))" ;; + + "FreeMiNT") + type -p rpm >/dev/null && \ + packages="$((packages+=$(rpm -qa | wc -l)))" + ;; esac ((packages == 0)) && unset packages @@ -626,6 +640,10 @@ get_shell() { shell="${shell/version}" ;; + "tcsh") + shell+="$("$SHELL" -c 'printf "%s" "$tcsh"')" + ;; + *) shell+="$("$SHELL" --version 2>&1)" shell="${shell/ "${shell_name}"}" @@ -653,6 +671,21 @@ get_de() { esac ;; + "FreeMiNT") + get_wm + + for files in /proc/*; do + case "$files" in + *thing*) de="Thing" ;; + *jinnee*) de="Jinnee" ;; + *tera*) de="Teradesk" ;; + *neod*) de="NeoDesk" ;; + *zdesk*) de="zDesk" ;; + *mdesk*) de="mDesk" ;; + esac + done + ;; + *) ((wm_run != 1)) && get_wm @@ -727,7 +760,7 @@ get_wm() { -e "westford" \ -e "weston")" - elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -763,6 +796,18 @@ get_wm() { [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; + + "FreeMiNT") + wm="Atari AES" + for files in /proc/*; do + case "$files" in + *xaaes*) wm="XaAES" ;; + *myaes*) wm="MyAES" ;; + *naes*) wm="N.AES" ;; + geneva) wm="Geneva" ;; + esac + done + ;; esac fi @@ -1104,6 +1149,11 @@ get_cpu() { # Get CPU cores. cores="$(sysconf NPROC_ONLN)" ;; + + "FreeMiNT") + cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F '[:.M]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" + ;; esac # Remove un-needed patterns from cpu output. @@ -1188,7 +1238,8 @@ get_cpu_usage() { "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi @@ -1445,6 +1496,16 @@ get_memory() { mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" ;; + + "FreeMiNT") + mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" + mem_free="${mem/* }" + mem_total="${mem/ *}" + mem_used="$((mem_total - mem_free))" + mem_total="$((mem_total / 1024))" + mem_used="$((mem_used / 1024))" + ;; + esac memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" @@ -1833,6 +1894,10 @@ get_term() { *) term="${TERM_PROGRAM/\.app}" ;; esac + # Most likely TosWin2 on FreeMiNT - quick check + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ + term="TosWin2" + # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do if [[ "$SSH_CONNECTION" ]]; then @@ -2384,6 +2449,11 @@ get_cols() { unset -v blocks blocks2 cols + # TosWin2 on FreeMiNT is terrible at this, + # so we'll reset colors arbitrarily. + [[ "$term" == "TosWin2" ]] && \ + printf "%b\n" "\\e[30;47m" + # Tell info() that we printed manually. prin=1 } @@ -3368,6 +3438,12 @@ get_distro_colors() { ascii_file="freebsd" ;; + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. + ascii_file="gem" + ;; + "Frugalware"*) set_colors 4 7 1 ascii_file="frugalware" From 8e21a69ea0c01f59f44e5e912adac725e0b047e6 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 12 Jan 2018 21:18:13 +0100 Subject: [PATCH 074/300] distro: fix OpenWrt/LEDE detection --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cb0e8fde..b6a1037d 100755 --- a/neofetch +++ b/neofetch @@ -122,8 +122,8 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" - elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release") + elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" || -f "/etc/openwrt_release" ]]; then + files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") # Source the os-release file for file in "${files[@]}"; do From 1506d3840f910ed4ebe65e39d80ceccf7832b79b Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 13 Jan 2018 16:53:20 +0100 Subject: [PATCH 075/300] indent if conditions + remove some trailing spaces --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index b6a1037d..66daa1a0 100755 --- a/neofetch +++ b/neofetch @@ -122,7 +122,9 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" - elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" || -f "/etc/openwrt_release" ]]; then + elif [[ -f "/etc/os-release" || \ + -f "/usr/lib/os-release" || \ + -f "/etc/openwrt_release" ]]; then files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") # Source the os-release file @@ -231,7 +233,7 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; - + "FreeMiNT") distro="FreeMiNT" ;; @@ -682,7 +684,7 @@ get_de() { *neod*) de="NeoDesk" ;; *zdesk*) de="zDesk" ;; *mdesk*) de="mDesk" ;; - esac + esac done ;; @@ -805,7 +807,7 @@ get_wm() { *myaes*) wm="MyAES" ;; *naes*) wm="N.AES" ;; geneva) wm="Geneva" ;; - esac + esac done ;; esac @@ -1239,7 +1241,7 @@ get_cpu_usage() { "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi From c81e01405ebf0bdea72521bf5386db3a1c3de13c Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:36:29 -0700 Subject: [PATCH 076/300] Changed OpenBSD CPU temp retrieval to take into account machines that only expose cpu0.temp0 instead of lm0.temp0 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 66daa1a0..10016076 100755 --- a/neofetch +++ b/neofetch @@ -1086,8 +1086,9 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg="$(sysctl -n hw.sensors.lm0.temp0)" - deg="${deg/ degC}" + deg_var="$(sysctl hw.sensors | grep -m1 temp0 | cut -d'=' -f1)" + deg="$(sysctl -n $deg_var)" + deg="${deg/0 degC}" ;; esac ;; From 96676ca4d5c8bf54aea579511366cf36630fe910 Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:46:25 -0700 Subject: [PATCH 077/300] Fixed OpenBSD mem_used value --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 10016076..fdff930b 100755 --- a/neofetch +++ b/neofetch @@ -1466,9 +1466,10 @@ get_memory() { # Mem used. case "$kernel_name" in "OpenBSD"*) - mem_used="$(vmstat | awk 'END{printf $4}')" - mem_used="$((${mem_used/M} / 1024))" + mem_used="$(vmstat | awk 'END{printf $3}')" + mem_used="${mem_used/M}" ;; + *) mem_used="$((mem_total - mem_free))" ;; esac ;; From 9984c51882dc3f7b1d2028ad427f84e7cb257c56 Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:48:33 -0700 Subject: [PATCH 078/300] Fixed indentation inconsistency --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fdff930b..32b5640a 100755 --- a/neofetch +++ b/neofetch @@ -3788,7 +3788,7 @@ get_distro_colors() { ascii_file="scientific" ;; - "Siduction"*) + "Siduction"*) set_colors 4 4 ascii_file="siduction" ;; From 840a6534582f7b4248e3bd702dc1d699246be27f Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 13:33:58 -0700 Subject: [PATCH 079/300] Changed OpenBSD cpu temp logic to grep specifically for lm0 or cpu0 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 32b5640a..c57e7754 100755 --- a/neofetch +++ b/neofetch @@ -1086,7 +1086,7 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg_var="$(sysctl hw.sensors | grep -m1 temp0 | cut -d'=' -f1)" + deg_var="$(sysctl hw.sensors | grep -m1 -E 'lm0.temp0|cpu0.temp0' | cut -d'=' -f1)" deg="$(sysctl -n $deg_var)" deg="${deg/0 degC}" ;; From c9f910f526824c9e7019b1818d22f9dd132865a3 Mon Sep 17 00:00:00 2001 From: rage311 Date: Wed, 17 Jan 2018 12:52:24 -0700 Subject: [PATCH 080/300] Changed OpenBSD temperature extraction from grep/cut to awk --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c57e7754..ccab3ccd 100755 --- a/neofetch +++ b/neofetch @@ -1086,9 +1086,8 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg_var="$(sysctl hw.sensors | grep -m1 -E 'lm0.temp0|cpu0.temp0' | cut -d'=' -f1)" - deg="$(sysctl -n $deg_var)" - deg="${deg/0 degC}" + deg="$(sysctl hw.sensors | awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" + deg="${deg/00/0}" ;; esac ;; From 64c80b7fc1168dde59a77a6dca05c859b0a1c0c0 Mon Sep 17 00:00:00 2001 From: rage311 Date: Mon, 22 Jan 2018 12:13:16 -0700 Subject: [PATCH 081/300] Broke up line that was over 100 chars long --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ccab3ccd..8df42edc 100755 --- a/neofetch +++ b/neofetch @@ -1086,7 +1086,8 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg="$(sysctl hw.sensors | awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" + deg="$(sysctl hw.sensors | \ + awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" deg="${deg/00/0}" ;; esac From 59c0d7362567181a0cb66299c7fef2d252068567 Mon Sep 17 00:00:00 2001 From: Herdiansyah Date: Tue, 23 Jan 2018 07:25:51 +0700 Subject: [PATCH 082/300] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30a557da..8bf369fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [**@dawidd6**](https://github.com/dawidd6) - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) +- [**@rage311**](https://github.com/rage311) ## OS @@ -64,12 +65,17 @@ - [linux] Detect the correct temperature file to use. - [windows] Removed `$temp` usage as it's an envar. +- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) **GPU** - [linux] Added driver version to NVIDIA output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) +**Memory** + +- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) + **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) From 33fce465251545c543dff22e5ff3ea855ce5fc46 Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 10:30:53 -0500 Subject: [PATCH 083/300] fix battery detection on Windows --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8df42edc..b7035759 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - [[ "$(trim "$battery")" ]] && battery="%" + [[ "$(trim "$battery")" ]] && battery="$(trim "$battery")%" ;; "Haiku") From d4177592c19a6e73d0f58b5a1e97f37f63f1eb34 Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 17:52:57 -0500 Subject: [PATCH 084/300] simplify check as per review --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b7035759..6e966d3a 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - [[ "$(trim "$battery")" ]] && battery="$(trim "$battery")%" + batttery=“$(trim “$battery”)%” ;; "Haiku") From 613ab7439a8877763c00d4595e3a1a7785576b2a Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 19:16:08 -0500 Subject: [PATCH 085/300] fix unicode quotes --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e966d3a..3aa5d470 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - batttery=“$(trim “$battery”)%” + batttery="$(trim "$battery")%" ;; "Haiku") From 2071fe608c473b0f3418bc85c99d50329b760757 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:03:18 +0100 Subject: [PATCH 086/300] anarchy --- ascii/distro/anarchy | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ascii/distro/anarchy diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy new file mode 100644 index 00000000..27a48aca --- /dev/null +++ b/ascii/distro/anarchy @@ -0,0 +1,30 @@ + + .. + .. + :.. + :+++. + .:::+++++++::. + .:+######++++######+:. + .+#########+++++##########:. + .+##########+++++++#+#########+. + +###########+++++++++############: + +##########++++++#++++#+###########+ + +###########+++++###++++#+###########+ + :##########+#++++####++++#+############: + ###########+++++#####+++++#+###++######+ + .##########++++++#####++++++++++++#######. + .##########+++++++++++++++++++###########. + #####++++++++++++++###++++++++#########+ + :###++++++++++#########+++++++#########: + +######+++++##########++++++++#######+ + +####+++++###########+++++++++#####+ + :##++++++############++++++++++##: + .++++++#############+++++++++++. + :++++###############+++++++:: + .++. .:+##############+++++++.. + .:. ..::++++++::..:+++++. + . .:+++. + .:: + .. + .. + From 9b7066ad5e1573e4a75daa35b474e5f20f201b29 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:04:10 +0100 Subject: [PATCH 087/300] Create calculate --- ascii/distro/calculate | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ascii/distro/calculate diff --git a/ascii/distro/calculate b/ascii/distro/calculate new file mode 100644 index 00000000..08798c03 --- /dev/null +++ b/ascii/distro/calculate @@ -0,0 +1,23 @@ + + ...... + ,,+++++++,. + .,,,....,,,+**+,,. + ............,++++,,, + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,#######################* + .,++++++. ..+##**###################+ + ..... ..+##***#################*. + .,.*#*****##############*. + ..,,**********#####****+. + .,++*****++*****************+++++,. + ,++++++**+++++***********+++++++++, + .,,,,++++,.. .,,,,,.....,+++,.,, + + From 40c079eb193be7449f8ac4ec302d2ef7f4f06f0a Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:05:07 +0100 Subject: [PATCH 088/300] Create nutyx --- ascii/distro/nutyx | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ascii/distro/nutyx diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx new file mode 100644 index 00000000..f095b82a --- /dev/null +++ b/ascii/distro/nutyx @@ -0,0 +1,29 @@ + + + + . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. + .-. .+- . -+. + . .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . + + + From aa074c3f4b8635949304ddfab1ed5cefc3627884 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:17:12 +0100 Subject: [PATCH 089/300] Add files via upload --- neofetch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/neofetch b/neofetch index 3aa5d470..c7a285f2 100755 --- a/neofetch +++ b/neofetch @@ -3241,6 +3241,11 @@ get_distro_colors() { ascii_file="amazon" ;; + "Anarchy"*) + set_colors 4 6 + ascii_file="anarchy" + ;; + "Android"*) set_colors 2 7 ascii_file="android" @@ -3332,6 +3337,11 @@ get_distro_colors() { ascii_file="bunsenlabs" ;; + "Calculate"*) + set_colors 0 3 + ascii_file="calculate" + ;; + "CentOS"*) set_colors 3 2 4 5 7 ascii_file="centos" @@ -3638,6 +3648,11 @@ get_distro_colors() { ascii_file="nurunner" ;; + "NuTyX"*) + set_colors 4 + ascii_file="nutyx" + ;; + "OBRevenge"*) set_colors 1 7 3 ascii_file="obrevenge" From 2cecb142e1bc651427e0590672144b609714f903 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 1 Feb 2018 12:14:03 +1100 Subject: [PATCH 090/300] misc: cleanup --- CHANGELOG.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf369fc..65e71d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,33 @@ - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) - [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) ## OS -- Fixed detection bug with Gentoo. -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) - Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) - Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) ## General - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Swapped sequences from `\033` to `\e`. ## Ascii @@ -35,7 +44,7 @@ ## Images - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. +- Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. ## Info @@ -43,6 +52,7 @@ **Desktop Environment** - Added GNOME version. +- Added support for TDE. **Window Manager** @@ -70,6 +80,7 @@ **GPU** - [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) **Memory** @@ -95,3 +106,11 @@ **Disk** - Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) From 7a543e8fa6902a3d946a4b912c898546eb794db9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 2 Feb 2018 09:24:48 +1100 Subject: [PATCH 091/300] general: Revert problamatic lines to over 100 chars long. --- .travis.yml | 2 +- neofetch | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 388082b0..735dceeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi + # - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi diff --git a/neofetch b/neofetch index 3aa5d470..8dd79d3e 100755 --- a/neofetch +++ b/neofetch @@ -1522,10 +1522,7 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|spotify|\ -Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|\ -xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|\ -guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|[Ss]potify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -1577,15 +1574,13 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" ;; esac ;; "itunes"*) - song="$(osascript -e 'tell application "iTunes" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " & name of current track as string')" ;; "banshee"*) @@ -1941,8 +1936,7 @@ get_term_font() { ;; "Apple_Terminal") - term_font="$(osascript -e 'tell application "Terminal" to \ - font name of window frontmost')" + term_font="$(osascript -e 'tell application "Terminal" to font name of window frontmost')" ;; "iTerm2") @@ -1953,8 +1947,7 @@ get_term_font() { # See: https://groups.google.com/forum/#!topic/iterm2-discuss/0tO3xZ4Zlwg local current_profile_name profiles_count profile_name diff_font none_ascii - current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name \ - of current session of current window')" + current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name of current session of current window')" # Warning: Dynamic profiles are not taken into account here! # https://www.iterm2.com/documentation-dynamic-profiles.html From bac9dcf3f4a347f8364d293a38d8d1390994be7d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 2 Feb 2018 09:46:18 +1100 Subject: [PATCH 092/300] song: Use grep instead of awk. --- neofetch | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8dd79d3e..c23cf985 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,36 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|[Ss]potify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps -e | grep -m 1 -o -F \ + -e "Google Play" \ + -e "Spotify" \ + -e "amarok" \ + -e "audacious" \ + -e "banshee" \ + -e "bluemindo" \ + -e "clementine" \ + -e "cmus" \ + -e "deadbeef" \ + -e "deepin-music" \ + -e "elisa" \ + -e "exaile" \ + -e "gnome-music" \ + -e "guayadeque" \ + -e "iTunes.app" \ + -e "juk" \ + -e "lollypop" \ + -e "mocp" \ + -e "mopidy" \ + -e "mpd" \ + -e "pogo" \ + -e "pragha" \ + -e "qmmp" \ + -e "quodlibet" \ + -e "rhythmbox" \ + -e "spotify" \ + -e "tomahawk" \ + -e "xmms2d" \ + -e "yarock")" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. From b76513d7b6461294a5b65a1c83156d2a7a935a7c Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 19:52:23 -0500 Subject: [PATCH 093/300] Change `osascript` calls to use heredocs so they don't extend beyond 100 chars --- neofetch | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index c23cf985..d0eea8be 100755 --- a/neofetch +++ b/neofetch @@ -1603,13 +1603,23 @@ get_song() { "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" + song="$(osascript < Date: Thu, 1 Feb 2018 21:58:06 -0500 Subject: [PATCH 094/300] Detect iTunes/Spotify successfully when the other is not running --- neofetch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index d0eea8be..f737c056 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_memory() { } get_song() { - player="$(ps -e | grep -m 1 -o -F \ + player="$(ps -e | grep -m 1 -o \ -e "Google Play" \ -e "Spotify" \ -e "amarok" \ @@ -1537,7 +1537,7 @@ get_song() { -e "exaile" \ -e "gnome-music" \ -e "guayadeque" \ - -e "iTunes.app" \ + -e "iTunes$" \ -e "juk" \ -e "lollypop" \ -e "mocp" \ @@ -1604,9 +1604,11 @@ get_song() { "Mac OS X") song="$(osascript < Date: Thu, 1 Feb 2018 22:01:22 -0500 Subject: [PATCH 095/300] Fix `uppercase()` outputting nothing under `bash` < v4 --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f737c056..28300962 100755 --- a/neofetch +++ b/neofetch @@ -3255,7 +3255,11 @@ strip_sequences() { } uppercase() { - ((bash_version >= 4)) && printf "%s" "${1^}" + if ((bash_version >= 4)); then + printf "%s" "${1^}" + else + echo $1 + fi } # COLORS From 80d7cef7a01e2db803e3bdfdd43a7e8c8f2fbb0a Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 22:01:35 -0500 Subject: [PATCH 096/300] Add macOS Light/Dark theme detection --- neofetch | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 28300962..cd807825 100755 --- a/neofetch +++ b/neofetch @@ -926,14 +926,21 @@ get_wm_theme() { ;; "Quartz Compositor") - wm_theme="$(PlistBuddy -c "Print AppleAquaColorVariant" \ - "${HOME}/Library/Preferences/.GlobalPreferences.plist")" + global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" + wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" + wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" - if [[ -z "$wm_theme" ]] || ((wm_theme == 1)); then - wm_theme="Blue" - else - wm_theme="Graphite" + if [[ -z "$wm_theme" ]]; then + wm_theme="Light" fi + + if [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)); then + wm_theme_color="Blue" + else + wm_theme_color="Graphite" + fi + + wm_theme="$wm_theme_color ($wm_theme)" ;; *"Explorer") From 9e4434e5e5163aeb1bc94c15dcd4de223d1c5993 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 22:26:18 -0500 Subject: [PATCH 097/300] Add missing double-quotes in `uppercase()` fix --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cd807825..b460019f 100755 --- a/neofetch +++ b/neofetch @@ -3265,7 +3265,7 @@ uppercase() { if ((bash_version >= 4)); then printf "%s" "${1^}" else - echo $1 + echo "$1" fi } From d8addb3e3b16ec20a07cf3aa0ffd9ba556854202 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 23:28:02 -0500 Subject: [PATCH 098/300] =?UTF-8?q?Change=20`echo`=20=E2=86=92=20`printf`?= =?UTF-8?q?=20for=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b460019f..d8f856e8 100755 --- a/neofetch +++ b/neofetch @@ -3265,7 +3265,7 @@ uppercase() { if ((bash_version >= 4)); then printf "%s" "${1^}" else - echo "$1" + printf "%s" "$1" fi } From eb062afe957ddc081c0d112f536c816ac7384d89 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 23:43:03 -0500 Subject: [PATCH 099/300] Align heredoc AppleScript strings to `osascript` calls --- neofetch | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index d8f856e8..c710775d 100755 --- a/neofetch +++ b/neofetch @@ -1611,11 +1611,12 @@ get_song() { "Mac OS X") song="$(osascript < Date: Thu, 1 Feb 2018 23:46:50 -0500 Subject: [PATCH 100/300] =?UTF-8?q?Full=20`if`=20=E2=86=92=20single=20line?= =?UTF-8?q?=20for=20macOS=20Light=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c710775d..91bf857b 100755 --- a/neofetch +++ b/neofetch @@ -930,9 +930,7 @@ get_wm_theme() { wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" - if [[ -z "$wm_theme" ]]; then - wm_theme="Light" - fi + [[ -z "$wm_theme" ]] && wm_theme="Light" if [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)); then wm_theme_color="Blue" From 8f25d0190bde4b4d912a96defc8ace64da9c8d59 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 16:49:32 +0100 Subject: [PATCH 101/300] Add files via upload --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c7a285f2..bcfb125a 100755 --- a/neofetch +++ b/neofetch @@ -3242,7 +3242,7 @@ get_distro_colors() { ;; "Anarchy"*) - set_colors 4 6 + set_colors 7 4 ascii_file="anarchy" ;; @@ -3338,7 +3338,7 @@ get_distro_colors() { ;; "Calculate"*) - set_colors 0 3 + set_colors 7 3 ascii_file="calculate" ;; @@ -3649,7 +3649,7 @@ get_distro_colors() { ;; "NuTyX"*) - set_colors 4 + set_colors 4 1 ascii_file="nutyx" ;; @@ -3863,7 +3863,7 @@ get_distro_colors() { ascii_file="tails" ;; - "Trisquel"*) + "Trisquel"*) set_colors 4 6 ascii_file="trisquel" ;; From 09a3b135a0864ad8472b41862cc04bc26f701421 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 16:51:53 +0100 Subject: [PATCH 102/300] Add files via upload --- ascii/distro/anarchy | 58 ++++++++++++++++++++---------------------- ascii/distro/calculate | 43 +++++++++++++++---------------- ascii/distro/nutyx | 52 +++++++++++++++++-------------------- 3 files changed, 71 insertions(+), 82 deletions(-) diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy index 27a48aca..d0f5a140 100644 --- a/ascii/distro/anarchy +++ b/ascii/distro/anarchy @@ -1,30 +1,28 @@ - - .. - .. - :.. - :+++. - .:::+++++++::. - .:+######++++######+:. - .+#########+++++##########:. - .+##########+++++++#+#########+. - +###########+++++++++############: - +##########++++++#++++#+###########+ - +###########+++++###++++#+###########+ - :##########+#++++####++++#+############: - ###########+++++#####+++++#+###++######+ - .##########++++++#####++++++++++++#######. - .##########+++++++++++++++++++###########. - #####++++++++++++++###++++++++#########+ - :###++++++++++#########+++++++#########: - +######+++++##########++++++++#######+ - +####+++++###########+++++++++#####+ - :##++++++############++++++++++##: - .++++++#############+++++++++++. - :++++###############+++++++:: - .++. .:+##############+++++++.. - .:. ..::++++++::..:+++++. - . .:+++. - .:: - .. - .. - + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/calculate b/ascii/distro/calculate index 08798c03..a6b256c4 100644 --- a/ascii/distro/calculate +++ b/ascii/distro/calculate @@ -1,23 +1,20 @@ - - ...... - ,,+++++++,. - .,,,....,,,+**+,,. - ............,++++,,, - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,#######################* - .,++++++. ..+##**###################+ - ..... ..+##***#################*. - .,.*#*****##############*. - ..,,**********#####****+. - .,++*****++*****************+++++,. - ,++++++**+++++***********+++++++++, - .,,,,++++,.. .,,,,,.....,+++,.,, - - +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx index f095b82a..84a6cc5a 100644 --- a/ascii/distro/nutyx +++ b/ascii/distro/nutyx @@ -1,29 +1,23 @@ - - - - . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. - .-. .+- . -+. - . .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . - - - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . \ No newline at end of file From 175adb7560e28d5d4b04828aa632a2954b8b71fa Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 17:00:44 +0100 Subject: [PATCH 103/300] Add files via upload --- CHANGELOG.md | 25 ++++++++++++++++++++++--- neofetch | 48 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf369fc..65e71d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,33 @@ - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) - [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) ## OS -- Fixed detection bug with Gentoo. -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) - Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) - Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) ## General - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Swapped sequences from `\033` to `\e`. ## Ascii @@ -35,7 +44,7 @@ ## Images - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. +- Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. ## Info @@ -43,6 +52,7 @@ **Desktop Environment** - Added GNOME version. +- Added support for TDE. **Window Manager** @@ -70,6 +80,7 @@ **GPU** - [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) **Memory** @@ -95,3 +106,11 @@ **Disk** - Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) diff --git a/neofetch b/neofetch index bcfb125a..daf4f6f5 100755 --- a/neofetch +++ b/neofetch @@ -1522,10 +1522,36 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|spotify|\ -Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|\ -xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|\ -guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps -e | grep -m 1 -o -F \ + -e "Google Play" \ + -e "Spotify" \ + -e "amarok" \ + -e "audacious" \ + -e "banshee" \ + -e "bluemindo" \ + -e "clementine" \ + -e "cmus" \ + -e "deadbeef" \ + -e "deepin-music" \ + -e "elisa" \ + -e "exaile" \ + -e "gnome-music" \ + -e "guayadeque" \ + -e "iTunes.app" \ + -e "juk" \ + -e "lollypop" \ + -e "mocp" \ + -e "mopidy" \ + -e "mpd" \ + -e "pogo" \ + -e "pragha" \ + -e "qmmp" \ + -e "quodlibet" \ + -e "rhythmbox" \ + -e "spotify" \ + -e "tomahawk" \ + -e "xmms2d" \ + -e "yarock")" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -1577,15 +1603,13 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" ;; esac ;; "itunes"*) - song="$(osascript -e 'tell application "iTunes" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " & name of current track as string')" ;; "banshee"*) @@ -1941,8 +1965,7 @@ get_term_font() { ;; "Apple_Terminal") - term_font="$(osascript -e 'tell application "Terminal" to \ - font name of window frontmost')" + term_font="$(osascript -e 'tell application "Terminal" to font name of window frontmost')" ;; "iTerm2") @@ -1953,8 +1976,7 @@ get_term_font() { # See: https://groups.google.com/forum/#!topic/iterm2-discuss/0tO3xZ4Zlwg local current_profile_name profiles_count profile_name diff_font none_ascii - current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name \ - of current session of current window')" + current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name of current session of current window')" # Warning: Dynamic profiles are not taken into account here! # https://www.iterm2.com/documentation-dynamic-profiles.html @@ -3863,7 +3885,7 @@ get_distro_colors() { ascii_file="tails" ;; - "Trisquel"*) + "Trisquel"*) set_colors 4 6 ascii_file="trisquel" ;; From 2ba3fc014ebc89e887eccff339ca8a0c0d19b633 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 3 Feb 2018 09:05:41 +1100 Subject: [PATCH 104/300] misc: cleanup --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e71d4b..20f077cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [**@matoro**](https://github.com/matoro) - [**@szfcbr**](https://github.com/szfcbr) - [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- [**@robertwolter**](https://github.com/robertwolter) ## OS @@ -22,6 +23,9 @@ - Added support for Lunar Linux. - Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) - Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) - Fixed detection bug with Gentoo. - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) From a2f44749afb0a255086181efa5de51965d4f8643 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 3 Feb 2018 09:10:57 +1100 Subject: [PATCH 105/300] misc: cleanup --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f077cd..ce3e3d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - [**@szfcbr**](https://github.com/szfcbr) - [**@ArmstrongJ**](https://github.com/ArmstrongJ) - [**@robertwolter**](https://github.com/robertwolter) +- [**@JadeMatrix**](https://github.com/JadeMatrix) ## OS @@ -37,6 +38,8 @@ - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. - Fixed prompt bug in OpenBSD. +- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) - Swapped sequences from `\033` to `\e`. @@ -66,6 +69,7 @@ **Window Manager Theme** - Fixed `sawfish` detection. +- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) **Install Date** @@ -102,6 +106,7 @@ **Song** - Added support for Elisa. [**@mstraube**](https://github.com/mstraube) +- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) **Model** From 877a975a32881633716c7ac9e4ba981f28980719 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 6 Feb 2018 12:29:02 +1100 Subject: [PATCH 106/300] OS: Added support for ArchMerge. Closes #907 --- ascii/distro/archmerge | 20 ++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 ascii/distro/archmerge diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge new file mode 100644 index 00000000..c849851e --- /dev/null +++ b/ascii/distro/archmerge @@ -0,0 +1,20 @@ +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. diff --git a/neofetch b/neofetch index 3789b7f0..01724887 100755 --- a/neofetch +++ b/neofetch @@ -3354,6 +3354,11 @@ get_distro_colors() { ascii_file="arch_xferience" ;; + "ArchMerge"*) + set_colors 6 6 7 1 + ascii_file="archmerge" + ;; + "Arch"*) set_colors 6 6 7 1 ascii_file="arch" From 899a8d7ce58236826920c6fc0fa3a2494142493f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 6 Feb 2018 12:30:07 +1100 Subject: [PATCH 107/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce3e3d46..8408cc0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ## OS +- Added support for ArchMerge. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 97660df3b871f1e3290c8fd2feae3dfa489d94b5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:44:22 +1100 Subject: [PATCH 108/300] OS: Added support for magpieOS. Closes #912, #908 --- ascii/distro/magpieos | 20 ++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 ascii/distro/magpieos diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos new file mode 100644 index 00000000..6859d96b --- /dev/null +++ b/ascii/distro/magpieos @@ -0,0 +1,20 @@ +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. diff --git a/neofetch b/neofetch index 01724887..920c4cca 100755 --- a/neofetch +++ b/neofetch @@ -3650,6 +3650,11 @@ get_distro_colors() { ascii_file="mageia" ;; + "MagpieOS"*) + set_colors 2 1 3 5 + ascii_file="magpieos" + ;; + "Manjaro"*) set_colors 2 7 ascii_file="manjaro" From 023e3ee8910654d93a43ffd3ddbf743427c36b62 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:45:50 +1100 Subject: [PATCH 109/300] docs: Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8408cc0a..b92a2a5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ## OS - Added support for ArchMerge. +- Added support for MagpieOS. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 56821a30e49f0f7230f784ac734579e64ecd67cc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:51:58 +1100 Subject: [PATCH 110/300] term_font: Add more paths for Alacritty. Closes #911 --- .travis.yml | 2 +- neofetch | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 735dceeb..388082b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. - # - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi + - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi diff --git a/neofetch b/neofetch index 920c4cca..d14e23f0 100755 --- a/neofetch +++ b/neofetch @@ -1978,8 +1978,18 @@ get_term_font() { case "$term" in "alacritty"*) + if [[ -f "${XDG_CONFIG_HOME}/alacritty.yml" ]]; then + alacritty_file="${XDG_CONFIG_HOME}/alacritty.yml" + + elif [[ -f "${XDG_CONFIG_HOME}/alacritty/alacritty.yml" ]]; then + alacritty_file="${XDG_CONFIG_HOME}/alacritty/alacritty.yml" + + elif [[ -f "${HOME}/.alacritty.yml" ]]; then + alacritty_file="${HOME}/.alacritty.yml" + fi + term_font="$(awk -F ':|#' '/normal:/ {getline; print}' \ - "${XDG_CONFIG_HOME}/alacritty/alacritty.yml")" + "$alacritty_file")" term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" From 91d2edf7c8a40dafd8a9008cff807418dd0c69f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:52:37 +1100 Subject: [PATCH 111/300] docs: CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92a2a5c..18a845ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,3 +125,7 @@ **Shell** - Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) + +**Terminal Font** + +- Added more paths for Alacritty. From c9146d9eee0508c5882d8310cf5357ba9ef862af Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:41:12 +1100 Subject: [PATCH 112/300] OS: Added support for postmarketos --- ascii/distro/postmarketos | 17 +++++++++++++++++ neofetch | 5 +++++ 2 files changed, 22 insertions(+) create mode 100644 ascii/distro/postmarketos diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos new file mode 100644 index 00000000..a2ebc838 --- /dev/null +++ b/ascii/distro/postmarketos @@ -0,0 +1,17 @@ +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/neofetch b/neofetch index d14e23f0..759258c3 100755 --- a/neofetch +++ b/neofetch @@ -3820,6 +3820,11 @@ get_distro_colors() { ascii_file="porteus" ;; + "PostMarketOS"*) + set_colors 2 7 + ascii_file="postmarketos" + ;; + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 ascii_file="puppy" From 4dd9cc15f0413b908cdc6516a3b0746957eb59bd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:43:22 +1100 Subject: [PATCH 113/300] misc: prompt --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 759258c3..9d19b968 100755 --- a/neofetch +++ b/neofetch @@ -4308,7 +4308,7 @@ dynamic_prompt() { return else [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height))" + lines="$((lines - info_height + 1))" fi # Set the prompt location. From d32fdce5061075960b22c7c1c768543e58840f84 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:43:43 +1100 Subject: [PATCH 114/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18a845ea..11816887 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for ArchMerge. - Added support for MagpieOS. +- Added support for PostMarketOS. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 6d549cd459f11d9e60a553d51e8a5969e3205f5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 13:07:21 +1100 Subject: [PATCH 115/300] wm: Added support for non-EWMH WMs --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index 9d19b968..db2db762 100755 --- a/neofetch +++ b/neofetch @@ -773,6 +773,13 @@ get_wm() { # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" + # Fallback for non-EWMH WMs. + [[ -z "$wm" ]] && \ + wm="$(ps -e | grep -m 1 -o -F \ + -e "catwm" \ + -e "monsterwm" \ + -e "tinywm")" + else case "$os" in "Mac OS X") From 8a17129ad2575558560f4711da5d30ef50dd06d8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 13:07:49 +1100 Subject: [PATCH 116/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11816887..6b75a047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ **Window Manager** - Added support for most (*if not all*) current Wayland compositors/window manager's. +- Added support for some non-EWMH window managers. - [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) **Window Manager Theme** From 4f9fe67a4380746c83ac6a5a2815b33a7c44a0ef Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 20 Feb 2018 16:27:54 +0100 Subject: [PATCH 117/300] OS: Add support for Hyperbola GNU/Linux-libre --- ascii/distro/hyperbola | 16 ++++++++++++++++ neofetch | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 ascii/distro/hyperbola diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola new file mode 100644 index 00000000..5e013359 --- /dev/null +++ b/ascii/distro/hyperbola @@ -0,0 +1,16 @@ +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W diff --git a/neofetch b/neofetch index db2db762..52965e16 100755 --- a/neofetch +++ b/neofetch @@ -3592,6 +3592,11 @@ get_distro_colors() { ascii_file="haiku" ;; + "Hyperbola"*) + set_colors 8 + ascii_file="hyperbola" + ;; + "Kali"*) set_colors 4 8 ascii_file="kali" From 1ef776519e69f64bf4cb880b94e45a712cb18518 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 21 Feb 2018 09:55:58 +1100 Subject: [PATCH 118/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b75a047..fd53eb6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Added support for ArchMerge. - Added support for MagpieOS. - Added support for PostMarketOS. +- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 0a9c58655a26e93d4892f5e737aa9b1a898f9e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Tue, 27 Feb 2018 13:57:03 +0100 Subject: [PATCH 119/300] Fix minor indent bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 52965e16..d0f158a3 100755 --- a/neofetch +++ b/neofetch @@ -4661,7 +4661,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. - --pixterm source Shortcut to use 'pixterm' backend. + --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. From 0cbdd6963e53386e173a01c3851c9fcee17758fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Mon, 26 Feb 2018 14:56:07 +0100 Subject: [PATCH 120/300] Added font support for kitty terminal --- neofetch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/neofetch b/neofetch index 52965e16..5907861b 100755 --- a/neofetch +++ b/neofetch @@ -2071,6 +2071,22 @@ END term_font="$(trim_quotes "$term_font")" ;; + "kitty"*) + if [[ -f "${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" ]]; then + kitty_file="${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" + elif [[ -f "${XDG_CONFIG_HOME}/kitty/kitty.conf" ]]; then + kitty_file="${XDG_CONFIG_HOME}/kitty/kitty.conf" + elif [[ -f "${HOME}/.config/kitty/kitty.conf" ]]; then + kitty_file="${HOME}/.config/kitty/kitty.conf" + elif [[ -f "${HOME}/Library/Preferences/kitty/kitty.conf" ]]; then + kitty_file="${HOME}/Library/Preferences/kitty/kitty.conf" + fi + + term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ + /font_size/ { size = $2 } END { print font " " size}' \ + "${kitty_file}")" + ;; + "konsole"*) # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" From 169de34ee6f48592d633b13ded548344d963a9ee Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Feb 2018 07:54:35 +1100 Subject: [PATCH 121/300] image: [catimg] Don't force res. Closes #921 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 52965e16..83deb792 100755 --- a/neofetch +++ b/neofetch @@ -2964,7 +2964,7 @@ display_image() { ;; "catimg") - catimg -w "$((width * 2 / font_width))" -r 0 "$image" ||\ + catimg -w "$((width * 2 / font_width))" "$image" ||\ to_off "Image: catimg failed to display the image." ;; From 4f04acbb003f7d61c26f658cd142cc02d6185f4c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Feb 2018 07:55:07 +1100 Subject: [PATCH 122/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd53eb6d..93335c11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) - Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. +- Don't force resolution in `catimg`. ## Info From 9694f80f2891e9133ab83f8036c0f74d1e2eba03 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Mon, 5 Mar 2018 01:12:44 +0100 Subject: [PATCH 123/300] add new DragonFly BSD logo, move old logo to dragonfly_old, add dragonfly_small --- ascii/distro/dragonflybsd | 33 +++++++++++++++------------------ ascii/distro/dragonflybsd_old | 18 ++++++++++++++++++ ascii/distro/dragonflybsd_small | 4 ++++ neofetch | 10 ++++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 ascii/distro/dragonflybsd_old create mode 100644 ascii/distro/dragonflybsd_small diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd index 3276d4f0..7ccc14bc 100644 --- a/ascii/distro/dragonflybsd +++ b/ascii/distro/dragonflybsd @@ -1,18 +1,15 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old new file mode 100644 index 00000000..3276d4f0 --- /dev/null +++ b/ascii/distro/dragonflybsd_old @@ -0,0 +1,18 @@ + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small new file mode 100644 index 00000000..3a48a925 --- /dev/null +++ b/ascii/distro/dragonflybsd_small @@ -0,0 +1,4 @@ +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | diff --git a/neofetch b/neofetch index f6379e6e..4b74cecc 100755 --- a/neofetch +++ b/neofetch @@ -3496,6 +3496,16 @@ get_distro_colors() { ascii_file="dracos" ;; + "dragonfly_old"*) + set_colors 1 7 3 + ascii_file="dragonflybsd_old" + ;; + + "dragonfly_small"*) + set_colors 1 7 3 + ascii_file="dragonflybsd_small" + ;; + "DragonFly"*) set_colors 1 7 3 ascii_file="dragonflybsd" From 7d231b88fa95b72fd3238426d33082f26a4a5283 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Mar 2018 11:11:42 +1100 Subject: [PATCH 124/300] misc: cleanup --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 904cecc8..11392b19 100755 --- a/neofetch +++ b/neofetch @@ -2074,12 +2074,16 @@ END "kitty"*) if [[ -f "${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" ]]; then kitty_file="${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" + elif [[ -f "${XDG_CONFIG_HOME}/kitty/kitty.conf" ]]; then kitty_file="${XDG_CONFIG_HOME}/kitty/kitty.conf" + elif [[ -f "${HOME}/.config/kitty/kitty.conf" ]]; then kitty_file="${HOME}/.config/kitty/kitty.conf" + elif [[ -f "${HOME}/Library/Preferences/kitty/kitty.conf" ]]; then kitty_file="${HOME}/Library/Preferences/kitty/kitty.conf" + fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ From e39cbbff32c6a0d3b053ad0c51e47ceb61c34c77 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Wed, 7 Mar 2018 04:37:29 +0100 Subject: [PATCH 125/300] fix pacman name conflict bug change to type paclog-pkglist typo --- neofetch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 4b74cecc..725c71e3 100755 --- a/neofetch +++ b/neofetch @@ -484,16 +484,9 @@ get_uptime() { } get_packages() { - # Remove /usr/games from $PATH. - # This solves issues with neofetch opening the "pacman" game. - local PATH=":${PATH}:" - local PATH="${PATH/':/usr/games:'/:}" - local PATH="${PATH%:}" - local PATH="${PATH#:}" - case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - type -p pacman >/dev/null && \ + type -p paclog-pkglist >/dev/null && \ packages="$(pacman -Qq --color never | wc -l)" type -p dpkg >/dev/null && \ From 3b34a78c4cb1505e30491b4d262e9b9327cec676 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 20 Mar 2018 07:10:37 +0700 Subject: [PATCH 126/300] OS: Separate Windows 10 into its own if clause --- neofetch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 11392b19..a74ee28d 100755 --- a/neofetch +++ b/neofetch @@ -58,15 +58,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ "$(< /proc/version)" == *"Microsoft"* || - "$kernel_version" == *"Microsoft"* ]]; then - case "$distro_shorthand" in - "on") distro="$(lsb_release -sir) [Windows 10]" ;; - "tiny") distro="Windows 10" ;; - *) distro="$(lsb_release -sd) on Windows 10" ;; - esac - - elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + if [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then case "$distro_shorthand" in "on") distro="$(lsb_release -sir) [Chrome OS]" ;; "tiny") distro="Chrome OS" ;; @@ -163,6 +155,15 @@ get_distro() { [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" fi fi + + if [[ "$(< /proc/version)" == *"Microsoft"* || + "$kernel_version" == *"Microsoft"* ]]; then + case "$distro_shorthand" in + "on") distro+=" [Windows 10]" ;; + "tiny") distro="Windows 10" ;; + *) distro+=" on Windows 10" ;; + esac + fi distro="$(trim_quotes "$distro")" distro="${distro/'NAME='}" ;; From e4abb3a98489beff49cfa73861d30ec40ad45587 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 20 Mar 2018 07:41:05 +0700 Subject: [PATCH 127/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93335c11..d7e6c3bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -104,6 +104,7 @@ **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) +- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) **Resolution** From 97c02742c194e2ba836c16213e8b944f9e09f8b7 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 20 Mar 2018 22:31:12 +0100 Subject: [PATCH 128/300] Distro: Add support for openSUSE Tumbleweed Closes #930 --- ascii/distro/tumbleweed | 13 +++++++++++++ neofetch | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 ascii/distro/tumbleweed diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed new file mode 100644 index 00000000..37ee33ad --- /dev/null +++ b/ascii/distro/tumbleweed @@ -0,0 +1,13 @@ +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, diff --git a/neofetch b/neofetch index 478c5122..88207b9b 100755 --- a/neofetch +++ b/neofetch @@ -3965,6 +3965,11 @@ get_distro_colors() { ascii_file="solaris" ;; + "openSUSE Tumbleweed"*) + set_colors 2 7 + ascii_file="tumbleweed" + ;; + "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 ascii_file="suse" From deae19ac50a21ec1bf73d4e34011b7864a6bec9a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 21 Mar 2018 06:45:37 +0700 Subject: [PATCH 129/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7e6c3bd..158237e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) - Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) - Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) +- Added suport for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) - Fixed detection bug with Gentoo. - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) From 39cd3ede324e919ba58ff33a72dd3c840039ed1f Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 24 Mar 2018 15:30:00 +0700 Subject: [PATCH 130/300] Distro: Separate ChromeOS detection --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index a74ee28d..3130af75 100755 --- a/neofetch +++ b/neofetch @@ -58,14 +58,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then - case "$distro_shorthand" in - "on") distro="$(lsb_release -sir) [Chrome OS]" ;; - "tiny") distro="Chrome OS" ;; - *) distro="$(lsb_release -sd) on Chrome OS" ;; - esac - - elif [[ -f "/etc/redstar-release" ]]; then + if [[ -f "/etc/redstar-release" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" @@ -163,7 +156,15 @@ get_distro() { "tiny") distro="Windows 10" ;; *) distro+=" on Windows 10" ;; esac + + elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + case "$distro_shorthand" in + "on") distro+=" [Chrome OS]" ;; + "tiny") distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; + esac fi + distro="$(trim_quotes "$distro")" distro="${distro/'NAME='}" ;; From 741493714b5c4675732a48e522ce6d25cefd7341 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 24 Mar 2018 15:33:08 +0700 Subject: [PATCH 131/300] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93335c11..4b954858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. ## General From 7fbab49ec3a5a5b0ef06da4d248ca9fffc19dcd7 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 27 Mar 2018 21:28:45 +0100 Subject: [PATCH 132/300] Fix kitty font_size regex --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8bebbaa6..8b9fb91a 100755 --- a/neofetch +++ b/neofetch @@ -2082,7 +2082,7 @@ END fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /font_size/ { size = $2 } END { print font " " size}' \ + /\s?font_size\s/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From a1044d728fd0260d66461a8cb357066a7b63b6e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 1 Apr 2018 14:30:06 +1000 Subject: [PATCH 133/300] general: Swap echo to printf --- neofetch | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 8bebbaa6..bd1f2ccf 100755 --- a/neofetch +++ b/neofetch @@ -3263,19 +3263,10 @@ get_bold() { } trim() { - # When a string is passed to "echo" all trailing and leading - # whitespace is removed and inside the string multiple spaces are - # condensed into single spaces. - # - # The "set -f/+f" is here so that "echo" doesn't cause any expansion - # of special characters. - # - # The whitespace trim doesn't work with multiline strings so we use - # "${1//[[:space:]]/ }" to remove newlines before we trim the whitespace. - set -f - # shellcheck disable=2086 - builtin echo -E ${1//[[:space:]]/ } + # shellcheck disable=2048,2086 + set -- $* + printf "%s\\n" "${*//[[:space:]]/ }" set +f } From 3734821eb510a85997f8f623a69b161012f42a83 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 07:42:22 +1000 Subject: [PATCH 134/300] general: Added option to manually specify music player. Closes #934 --- config/config.conf | 39 +++++++++++++++++++++++++++++++++++++++ neofetch | 7 +++++++ 2 files changed, 46 insertions(+) diff --git a/config/config.conf b/config/config.conf index aadbf825..de542872 100644 --- a/config/config.conf +++ b/config/config.conf @@ -348,6 +348,45 @@ disk_subtitle="mount" # Song +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + # Print the Artist and Title on separate lines # # Default: 'off' diff --git a/neofetch b/neofetch index bd1f2ccf..a720ff37 100755 --- a/neofetch +++ b/neofetch @@ -1560,6 +1560,10 @@ get_song() { -e "xmms2d" \ -e "yarock")" + [[ "$music_player" && "$music_player" != "auto" ]] && \ + player="$music_player" + + get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. # This function saves us using the same command throughout the function. @@ -4637,6 +4641,8 @@ INFO: --ip_host url URL to query for public IP --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file --install_time on/off Enable/Disable showing the time in Install Date output. --install_time_format 12h/24h Set time format in Install Date to be 12 hour or 24 hour. @@ -4822,6 +4828,7 @@ get_args() { "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; "--install_time") install_time="$2" ;; "--install_time_format") install_time_format="$2" ;; "--cpu_temp") From 648b5fb75ebe799a95ab77e44213d4062822318b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 07:51:27 +1000 Subject: [PATCH 135/300] cpu: Fixed incorrect name. Closes #926 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a720ff37..585a4b3d 100755 --- a/neofetch +++ b/neofetch @@ -1178,7 +1178,7 @@ get_cpu() { cpu="${cpu//Six-Core}" cpu="${cpu//Eight-Core}" cpu="${cpu//, * Compute Cores}" - cpu="${cpu//Core}" + cpu="${cpu//Core / }" cpu="${cpu//(\"AuthenticAMD\"*)}" cpu="${cpu//with Radeon * Graphics}" cpu="${cpu//, altivec supported}" From 790401c6eafc66f319aab572c94b24802ef8194f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:05:12 +1000 Subject: [PATCH 136/300] OS: Fix ChromeOS detection. --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 585a4b3d..4f27f25f 100755 --- a/neofetch +++ b/neofetch @@ -107,6 +107,12 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" + # Chrome OS doesn't conform to the /etc/*-release standard. + # While the file is a series of variables they can't be sourced + # by the shell since the values aren't quoted. + elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" + elif [[ -f "/etc/os-release" || \ -f "/usr/lib/os-release" || \ -f "/etc/openwrt_release" ]]; then From 380e793c62178d1ef5c36be755d24ee973cdc8ce Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Mon, 2 Apr 2018 01:07:43 +0100 Subject: [PATCH 137/300] Correctly handle XTerm.vt100.faceName --- neofetch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8bebbaa6..a963a16d 100755 --- a/neofetch +++ b/neofetch @@ -2183,12 +2183,25 @@ END ;; "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") - term_font="$(grep -i "${term/d}\**\.*font" < <(xrdb -query))" + xrdb="$(xrdb -query)" + term_font="$(grep -i "${term/d}\**\.*font" <<< "$xrdb")" term_font="${term_font/*"*font:"}" term_font="${term_font/*".font:"}" term_font="${term_font/*"*.font:"}" term_font="$(trim "$term_font")" + if [[ -z "$term_font" && "$term" == "xterm" ]]; then + term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" + term_font="${term_font/*"faceName:"}" + term_font="$(trim "$term_font")" + fi + + # xft: isn't required at the beginning so we prepend it if it's missing + if [[ "${term_font:0:1}" != "-" && \ + "${term_font:0:4}" != "xft:" ]]; then + term_font="xft:$term_font" + fi + # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. case "$term_font" in From 155c1398b94ffd36567c019498fbfbe47ca6a599 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:09:45 +1000 Subject: [PATCH 138/300] cpu: More junk --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index bd13540d..2db6b734 100755 --- a/neofetch +++ b/neofetch @@ -1191,6 +1191,7 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" + cpu="${cpu//Integrated Graphics Controller}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From 564fdaeabf35f57168ad6430892a715b3281d549 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:11:11 +1000 Subject: [PATCH 139/300] cpu: More junk --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 2db6b734..bd13540d 100755 --- a/neofetch +++ b/neofetch @@ -1191,7 +1191,6 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" - cpu="${cpu//Integrated Graphics Controller}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From adbe230f827562847e06fb204d5c2fa96da91eb1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:12:35 +1000 Subject: [PATCH 140/300] gpu: More junk --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index bd13540d..f62ffa9e 100755 --- a/neofetch +++ b/neofetch @@ -1318,6 +1318,7 @@ get_gpu() { gpu="${gpu/'(R)'}" gpu="${gpu/'Corporation'}" gpu="${gpu/ \(*}" + gpu="${gpu/Integrated Graphics Controller}" [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; From 641202155c1b3b7db9f81916257a80f820d51e6e Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Mon, 2 Apr 2018 01:22:03 +0100 Subject: [PATCH 141/300] Remove trim --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index a963a16d..38171a62 100755 --- a/neofetch +++ b/neofetch @@ -2193,7 +2193,6 @@ END if [[ -z "$term_font" && "$term" == "xterm" ]]; then term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" term_font="${term_font/*"faceName:"}" - term_font="$(trim "$term_font")" fi # xft: isn't required at the beginning so we prepend it if it's missing From 286310acc937652d6f9f0748d9fca32310a6987b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 16:21:50 +1000 Subject: [PATCH 142/300] misc: cleanup --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index f62ffa9e..49f8f601 100755 --- a/neofetch +++ b/neofetch @@ -1570,7 +1570,6 @@ get_song() { [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" - get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. # This function saves us using the same command throughout the function. From 9f48d18332e0ecbf339ee8300a00940e8256db69 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 5 Apr 2018 07:54:37 +1000 Subject: [PATCH 143/300] cpu: Fix #939 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f8ec478b..b1450e38 100755 --- a/neofetch +++ b/neofetch @@ -1191,6 +1191,7 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" + cpu="${cpu//Core2/Core 2}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From 2e83e6f775b6ce20fb861fd47c80d8d87f4d9dc0 Mon Sep 17 00:00:00 2001 From: "Khoa D. Cao" Date: Thu, 5 Apr 2018 19:06:38 +0700 Subject: [PATCH 144/300] Fix a typo --- config/config.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.conf b/config/config.conf index de542872..39a8b0e8 100644 --- a/config/config.conf +++ b/config/config.conf @@ -684,7 +684,7 @@ crop_offset="center" # --size image_size="auto" -# Ggap between image and text +# Gap between image and text # # Default: '3' # Values: 'num', '-num' From 519af6c5c53ff74ab2ce51ab1fe0c796a0348889 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:15:30 +1000 Subject: [PATCH 145/300] docs: CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be3bf1a0..911c7cfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - [**@ArmstrongJ**](https://github.com/ArmstrongJ) - [**@robertwolter**](https://github.com/robertwolter) - [**@JadeMatrix**](https://github.com/JadeMatrix) +- [**@MindTooth**](https://github.com/MindTooth) +- [**@aidanharris**](https://github.com/aidanharris) +- [**@khoacao96**](https://github.com/khoacao96) ## OS @@ -37,6 +40,7 @@ - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. +- Fixed ChromeOS detection. ## General @@ -47,11 +51,15 @@ - Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) - Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) - Swapped sequences from `\033` to `\e`. +- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) +- Removed the last `echo` in the script. +- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) ## Ascii - Added color updates for Kubuntu logo. **Maulik Mistry** +- Added new DragonflyBSD log. [**@MitchWeaver**](https://github.com/MitchWeaver) ## Images @@ -114,6 +122,7 @@ **Song** +- Added option to manually specify the player to use. - Added support for Elisa. [**@mstraube**](https://github.com/mstraube) - macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) @@ -136,3 +145,6 @@ **Terminal Font** - Added more paths for Alacritty. +- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) +- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) From b4921092c8767313670df183ea301e21188d2c13 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:33:12 +1000 Subject: [PATCH 146/300] version: bump --- config/config.conf | 2 +- neofetch | 2 +- neofetch.1 | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/config.conf b/config/config.conf index 39a8b0e8..4215642b 100644 --- a/config/config.conf +++ b/config/config.conf @@ -768,4 +768,4 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.3.1-git" +config_version="3.4.0" diff --git a/neofetch b/neofetch index b1450e38..809d4a14 100755 --- a/neofetch +++ b/neofetch @@ -9,7 +9,7 @@ # https://github.com/dylanaraps/ # Neofetch version. -version="3.3.1-git" +version="3.4.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 33958fb1..3dc89b8e 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. -.TH NEOFETCH "1" "December 2017" "Neofetch 3.3.1-git" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -118,6 +118,10 @@ URL to query for public IP \fB\-\-song_shorthand\fR on/off Print the Artist/Title on separate lines .TP +\fB\-\-music_player\fR player\-name +Manually specify a player to use. +Available values are listed in the config file +.TP \fB\-\-install_time\fR on/off Enable/Disable showing the time in Install Date output. .TP From f25b76a0a5ade63a05abbc8bda678e93faf52a16 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:45:23 +1000 Subject: [PATCH 147/300] docs: CHANGELOG --- CHANGELOG.md | 148 --------------------------------------------- config/config.conf | 2 +- neofetch | 2 +- neofetch.1 | 2 +- 4 files changed, 3 insertions(+), 151 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 911c7cfb..e9652019 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,150 +1,2 @@ ## Contributors -- [**@yslgirl**](https://github.com/yslgirl) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@MitchWeaver**](https://github.com/MitchWeaver) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@rage311**](https://github.com/rage311) -- [**@matoro**](https://github.com/matoro) -- [**@szfcbr**](https://github.com/szfcbr) -- [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@JadeMatrix**](https://github.com/JadeMatrix) -- [**@MindTooth**](https://github.com/MindTooth) -- [**@aidanharris**](https://github.com/aidanharris) -- [**@khoacao96**](https://github.com/khoacao96) - - -## OS - -- Added support for ArchMerge. -- Added support for MagpieOS. -- Added support for PostMarketOS. -- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) -- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) -- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) -- Added support for Lunar Linux. -- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) -- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) -- Added suport for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) -- Fixed detection bug with Gentoo. -- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. -- Fixed ChromeOS detection. - - -## General - -- Added more info to verbose mode for debugging. -- Fixed bug in prompt location calculation. -- Fixed prompt bug in OpenBSD. -- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Swapped sequences from `\033` to `\e`. -- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) -- Removed the last `echo` in the script. -- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) - - -## Ascii - -- Added color updates for Kubuntu logo. **Maulik Mistry** -- Added new DragonflyBSD log. [**@MitchWeaver**](https://github.com/MitchWeaver) - - -## Images - -- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. -- Added `pixterm` backend. -- Don't force resolution in `catimg`. - -## Info - -**Desktop Environment** - -- Added GNOME version. -- Added support for TDE. - -**Window Manager** - -- Added support for most (*if not all*) current Wayland compositors/window manager's. -- Added support for some non-EWMH window managers. -- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) - -**Window Manager Theme** - -- Fixed `sawfish` detection. -- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Install Date** - -- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) - -**Theme** - -- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) - -**CPU** - -- [linux] Detect the correct temperature file to use. -- [windows] Removed `$temp` usage as it's an envar. -- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) - -**GPU** - -- [linux] Added driver version to NVIDIA output. -- [linux] Added driver version to Intel output. -- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) - -**Memory** - -- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) - -**Package Manager** - -- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) -- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) - -**Resolution** - -- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) - -**Song** - -- Added option to manually specify the player to use. -- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) -- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Model** - -- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) - -**Disk** - -- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) - -**Battery** - -- Fixed Windows detection. [**@matoro**](https://github.com/matoro) - -**Shell** - -- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) - -**Terminal Font** - -- Added more paths for Alacritty. -- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) -- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) diff --git a/config/config.conf b/config/config.conf index 4215642b..d754e023 100644 --- a/config/config.conf +++ b/config/config.conf @@ -768,4 +768,4 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.4.0" +config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 809d4a14..4e4ae6f6 100755 --- a/neofetch +++ b/neofetch @@ -9,7 +9,7 @@ # https://github.com/dylanaraps/ # Neofetch version. -version="3.4.0" +version="3.4.1-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 3dc89b8e..51d4cec4 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.0" "User Commands" +.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 4083770a6ba4cc1957f0522d3acf016f66ab5446 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 15:11:53 +1000 Subject: [PATCH 148/300] ascii: Strip esc chars when calculating length. Closes #942 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 4e4ae6f6..1b455e56 100755 --- a/neofetch +++ b/neofetch @@ -2653,6 +2653,9 @@ get_ascii() { print+="$line \n" # Calculate size of ascii file in line length / line count. + line="${line//[??;?;??m}" + line="${line//[??;?;???m}" + line="${line//}" line="${line//\$\{??\}}" line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" From 59e0ac82a79ebea29469664424602b7ff0a128f1 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Sun, 8 Apr 2018 18:30:42 +0100 Subject: [PATCH 149/300] Font detection for suckless terminal (st) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 1b455e56..bb5e337d 100755 --- a/neofetch +++ b/neofetch @@ -2178,6 +2178,32 @@ END "${XDG_CONFIG_HOME}/sakura/sakura.conf")" ;; + "st") + if term_font="$(ps -o command= -p $parent | grep -E '\-f\s?.*?:?')"; then + term_font="${term_font/*-f/}" + term_font="${term_font/ -*/}" + else + binary="" + + # On Linux we can get the exact path to the running binary through the procfs + # on other systems we just have to guess and assume `st` is invoked from somewhere + # in the users $PATH + [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" + [[ -z "$binary" ]] && binary="$(command -v st)" + + # Grep the output of strings on the `st` binary for anything that looks vaguely + # like a font definition. NOTE: There is a slight limitation in this approach. + # Technically "Font Name" is a valid font. As it doesn't specify any font options + # though it is hard to match it correctly amongst the rest of the noise. + [[ -n "$binary" ]] && \ + term_font="$(strings "$binary" | \ + grep -E '(pixelsize=|size=|antialias=|autohint=)' | head -1)" + fi + + term_font="${term_font/xft:}" + term_font="${term_font/:*}" + ;; + "terminology") term_font="$(strings "${XDG_CONFIG_HOME}/terminology/config/standard/base.cfg" |\ awk '/^font\.name$/{print a}{a=$0}')" From 9d4a127f72d936f32507ec103d3ef46c7a4cb864 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Sun, 8 Apr 2018 19:09:06 +0100 Subject: [PATCH 150/300] Keep shellcheck happy --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bb5e337d..4b101c49 100755 --- a/neofetch +++ b/neofetch @@ -2179,7 +2179,7 @@ END ;; "st") - if term_font="$(ps -o command= -p $parent | grep -E '\-f\s?.*?:?')"; then + if term_font="$(ps -o command= -p "$parent" | grep -E '\-f\s?.*?:?')"; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" else From ee815f9c6651423ae93f8ead237ebc99e2373c06 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 9 Apr 2018 09:51:23 +1000 Subject: [PATCH 151/300] gpu: Fixed duplicate intel bug. --- neofetch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 1b455e56..40f1de05 100755 --- a/neofetch +++ b/neofetch @@ -1284,13 +1284,21 @@ get_gpu() { {if(!seen[a[i]]++) print a[i]}}')) IFS="$old_ifs" - # Number the GPUs if more than one exists. - ((${#gpus[@]} > 1)) && gpu_num=1 + # Remove duplicate Intel Graphics outputs. + # This fixes cases where the outputs are both + # Intel but not entirely identical. + # + # Checking the first two array elements should + # be safe since there won't be 2 intel outputs if + # there's a dedicated GPU in play. + [[ "${gpus[0]}" == *Intel* && \ + "${gpus[1]}" == *Intel* ]] && \ + unset -v "gpus[0]" for gpu in "${gpus[@]}"; do # GPU shorthand tests. - [[ "$gpu_type" == "dedicated" && "$gpu" =~ (i|I)ntel ]] ||\ - [[ "$gpu_type" == "integrated" && ! "$gpu" =~ (i|I)ntel ]] && \ + [[ "$gpu_type" == "dedicated" && "$gpu" == *Intel* ]] || \ + [[ "$gpu_type" == "integrated" && ! "$gpu" == *Intel* ]] && \ { unset -v gpu; continue; } case "$gpu" in @@ -1336,7 +1344,6 @@ get_gpu() { fi prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu" - ((++gpu_num)) done return From eea18cf68cb6a38dc2ed286d3c6ddce77957702a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 9 Apr 2018 07:04:40 +0700 Subject: [PATCH 152/300] Misc: change all escape sequences from \e to \e --- neofetch | 62 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/neofetch b/neofetch index 40f1de05..d249a5b7 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" shopt -s nocasematch # Reset colors and bold. -reset="\\e[0m" +reset="\e[0m" # DETECT INFORMATION @@ -2540,9 +2540,9 @@ get_cols() { # Generate the string. for ((start; start<=end; start++)); do case "$start" in - [0-6]) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; - 7) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; - *) blocks2+="\\e[38;5;${start}m\\e[48;5;${start}m${block_width}" ;; + [0-6]) blocks+="${reset}\e[3${start}m\e[4${start}m${block_width}" ;; + 7) blocks+="${reset}\e[3${start}m\e[4${start}m${block_width}" ;; + *) blocks2+="\e[38;5;${start}m\e[48;5;${start}m${block_width}" ;; esac done @@ -2555,12 +2555,12 @@ get_cols() { # Add newlines to the string. cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\\e[${text_padding}C${zws}}" + cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. info_height="$((info_height+=block_height+2))" - printf "%b\n" "\\e[${text_padding}C${zws}${cols}" + printf "%b\n" "\e[${text_padding}C${zws}${cols}" fi unset -v blocks blocks2 cols @@ -2568,7 +2568,7 @@ get_cols() { # TosWin2 on FreeMiNT is terrible at this, # so we'll reset colors arbitrarily. [[ "$term" == "TosWin2" ]] && \ - printf "%b\n" "\\e[30;47m" + printf "%b\n" "\e[30;47m" # Tell info() that we printed manually. prin=1 @@ -2622,7 +2622,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "%b" "\\e[${lines:-0}A\\e[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\e[${lines:-0}A\e[9999999D" } get_ascii() { @@ -2816,14 +2816,14 @@ get_term_size() { # so we have to use a slightly different sequence to # get the terminal size. if [[ -n "$TMUX" ]]; then - printf "%b" "\\ePtmux;\\e\\e[14t\\e\\e[c\\e\\" + printf "%b" "\ePtmux;\e\e[14t\e\e[c\e\\" read_flags=(-d c) elif [[ "$image_backend" == "tycat" ]]; then - printf "%b" "\\e}qs\000" + printf "%b" "\e}qs\000" else - printf "%b" "\\e[14t\\e[c" + printf "%b" "\e[14t\e[c" read_flags=(-d c) fi @@ -2842,7 +2842,7 @@ get_term_size() { term_width="${term_size[2]/t*}" fi - # Get terminal width/height if \\e[14t is unsupported. + # Get terminal width/height if \e[14t is unsupported. if [[ -z "$term_width" ]] || (( "$term_width" < 50 )); then if type -p xdotool >/dev/null 2>&1; then current_window="$(xdotool getactivewindow)" @@ -3040,10 +3040,10 @@ display_image() { "iterm2") image="$(base64 < "$image")" - iterm_cmd="\\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" + iterm_cmd="\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" # Tmux requires an additional escape sequence for this to work. - [[ -n "$TMUX" ]] && iterm_cmd="\\ePtmux;\\e${iterm_cmd}\\e\\" + [[ -n "$TMUX" ]] && iterm_cmd="\ePtmux;\e${iterm_cmd}\e\\" printf "%b\a\n" "$iterm_cmd" ;; @@ -3079,7 +3079,7 @@ to_ascii() { get_ascii # Set cursor position next image/ascii. - printf "%b" "\\e[${lines:-0}A\\e[9999999D" + printf "%b" "\e[${lines:-0}A\e[9999999D" } to_off() { @@ -3239,7 +3239,7 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\\e[0m'}")" + string="$(trim "${string//$'\e[0m'}")" # Log length if it doesn't exist. if [[ -z "$length" ]]; then @@ -3252,7 +3252,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${string}${reset} " + printf "%b\n" "${text_padding:+\e[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3264,7 +3264,7 @@ prin() { get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" - printf "%b%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${underline_color}" \ + printf "%b%b\n" "${text_padding:+\e[${text_padding}C}${zws}${underline_color}" \ "${underline// /$underline_char}${reset} " unset -v length fi @@ -3285,12 +3285,12 @@ get_line_break() { get_bold() { case "$ascii_bold" in - "on") ascii_bold="\\e[1m" ;; + "on") ascii_bold="\e[1m" ;; "off") ascii_bold="" ;; esac case "$bold" in - "on") bold="\\e[1m" ;; + "on") bold="\e[1m" ;; "off") bold="" ;; esac } @@ -3310,10 +3310,10 @@ trim_quotes() { } strip_sequences() { - strip="${1//$'\\e['3[0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9][0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9][0-9][0-9]m}" + strip="${1//$'\e['3[0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9][0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9][0-9][0-9]m}" printf "%s\n" "$strip" } @@ -4172,9 +4172,9 @@ set_text_colors() { color() { case "$1" in - [0-6]) printf "%b" "${reset}\\e[3${1}m" ;; - 7 | "fg") printf "%b" "\\e[37m${reset}" ;; - *) printf "%b" "\\e[38;5;${1}m" ;; + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; esac } @@ -4197,7 +4197,7 @@ stdout() { } err() { - err+="$(color 1)[!]\\e[0m $1\n" + err+="$(color 1)[!]\e[0m $1\n" } get_full_path() { @@ -4381,7 +4381,7 @@ dynamic_prompt() { if ((lines > 1)); then case "$kernel_name" in "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\\e[${lines}B" ;; + *) printf "%b" "\e[${lines}B" ;; esac fi } @@ -5034,10 +5034,10 @@ main() { # Minix doesn't support these sequences. if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then # If the script exits for any reason, unhide the cursor. - trap 'printf "\\e[?25h\\e[?7h"' EXIT + trap 'printf "\e[?25h\e[?7h"' EXIT # Hide the cursor and disable line wrap. - printf "\\e[?25l\\e[?7l" + printf "\e[?25l\e[?7l" fi image_backend From 07cf1bd7397830e8d4fb8a4cf7100d5ab329a279 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 9 Apr 2018 09:47:21 +0700 Subject: [PATCH 153/300] Misc: exclude SC1117 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 388082b0..bbef3e9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - time ./neofetch --ascii --config config/travis.conf -v # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1117; fi # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. From 8fc70c980186dfe9ee21072de79263b80d65e1d5 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 10 Apr 2018 02:55:08 +0000 Subject: [PATCH 154/300] Refactor Code --- neofetch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 4b101c49..23af5eeb 100755 --- a/neofetch +++ b/neofetch @@ -2179,17 +2179,15 @@ END ;; "st") - if term_font="$(ps -o command= -p "$parent" | grep -E '\-f\s?.*?:?')"; then + term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" + if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" else - binary="" - # On Linux we can get the exact path to the running binary through the procfs - # on other systems we just have to guess and assume `st` is invoked from somewhere - # in the users $PATH - [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" - [[ -z "$binary" ]] && binary="$(command -v st)" + # (in case `st` is launched from outside of $PATH) on other systems we just + # have to guess and assume `st` is invoked from somewhere in the users $PATH + [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" # Grep the output of strings on the `st` binary for anything that looks vaguely # like a font definition. NOTE: There is a slight limitation in this approach. @@ -2197,7 +2195,7 @@ END # though it is hard to match it correctly amongst the rest of the noise. [[ -n "$binary" ]] && \ term_font="$(strings "$binary" | \ - grep -E '(pixelsize=|size=|antialias=|autohint=)' | head -1)" + grep -F -m 1 -e "pixelsize=" -e "size=" -e "antialias=" -e "autohint=")" fi term_font="${term_font/xft:}" From 7f722a1b0f8ba33b489101246925e1bdafaabd31 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 10 Apr 2018 13:09:02 +0700 Subject: [PATCH 155/300] docs: changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9652019..e419f4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,8 @@ ## Contributors + +## Info + +**Title** + +- Fixed unexpected backslash being inserted on some systems From 0302d8eb9bc070eee2b84a3e8611c3c20cc94b6a Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 10 Apr 2018 08:54:06 +0000 Subject: [PATCH 156/300] Set parent if it's unset --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 23af5eeb..1f948785 100755 --- a/neofetch +++ b/neofetch @@ -2179,6 +2179,8 @@ END ;; "st") + [[ -z "$parent" ]] && parent="$(get_ppid "$PPID")" + term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" From ab76a50739373a10201f83794e13f085de6372ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 12 Apr 2018 08:53:46 +1000 Subject: [PATCH 157/300] theme: Fix issues with gsettings. Closes #949 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 40f1de05..12201e75 100755 --- a/neofetch +++ b/neofetch @@ -23,6 +23,9 @@ export LANG=C # Add more paths to $PATH. export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" +# Fix issues with gsettings. +export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" + # Set no case match. shopt -s nocasematch From c80ace768438699a32804dcae68a96d0a271b819 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 12 Apr 2018 08:56:12 +1000 Subject: [PATCH 158/300] args: Simplify version output. --- neofetch | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index ef57019e..2b2987fd 100755 --- a/neofetch +++ b/neofetch @@ -4803,35 +4803,9 @@ Report bugs to https://github.com/dylanaraps/neofetch/issues exit 1 } -version() { printf "%s" "\ -Neofetch $version - -Copyright (c) 2016-2017 Dylan Araps - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the 'Software'), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Written by Dylan Araps with help from the following people: - -https://github.com/dylanaraps/neofetch/contributors - -" -exit 1 +version() { + printf "%s\\n" "Neofetch $version" + exit 1 } get_args() { From f7cf1073c61e7debd39da48363f87b6c14272056 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:13:36 +1000 Subject: [PATCH 159/300] wallpaper: Add support for pywal. --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2b2987fd..07889814 100755 --- a/neofetch +++ b/neofetch @@ -2757,7 +2757,10 @@ END ;; *) - if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then + if [[ -f "${HOME}/.cache/wal/wal" ]]; then + image="$(< "${HOME}/.cache/wal/wal")" + + elif type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then From 8253bd7e9a320d5a573e90d1d7c2a740ef28c4b8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:18:08 +1000 Subject: [PATCH 160/300] wallpaper: Add support for pywal. --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 07889814..2e89f4f4 100755 --- a/neofetch +++ b/neofetch @@ -2744,6 +2744,11 @@ END # Get DE if user has disabled the function. ((de_run != 1)) && get_de + if type -p wal >/dev/null && [[ -f "${HOME}/.cache/wal/wal" ]]; then + image="$(< "${HOME}/.cache/wal/wal")" + return + fi + case "$de" in "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; "Xfce"*) @@ -2757,10 +2762,7 @@ END ;; *) - if [[ -f "${HOME}/.cache/wal/wal" ]]; then - image="$(< "${HOME}/.cache/wal/wal")" - - elif type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then + if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then From 0bc4a5bd30f747aeb35a837ad9c6799ef6afd1e9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:24:11 +1000 Subject: [PATCH 161/300] travis: Simplify config --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbef3e9c..f96df785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,6 @@ language: bash sudo: required -addons: - apt: - sources: - - debian-sid - packages: - - shellcheck - os: - linux - osx From 67873db7982a644048cb7e93652c6941a71deb25 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:29:56 +1000 Subject: [PATCH 162/300] docs: CHANGELOG --- CHANGELOG.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e419f4b9..f05b191a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,24 @@ ## Contributors +## General + +- Simplified `--version` output. +- Fixed theme issues by setting `GIO_EXTRA_MODULES`. + + +## Images + +- Added `wal`/`pywal` support to get the current wallpaper. + + ## Info **Title** -- Fixed unexpected backslash being inserted on some systems +- Fixed unexpected backslash being inserted on some systems. + +**GPU** + +- Fixed duplicate Intel GPUs. + From 55de3a4201aa16f8febda3bb0cd1fdc812320799 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:40:28 +1000 Subject: [PATCH 163/300] general: cleanup --- neofetch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 4c630b12..d3976574 100755 --- a/neofetch +++ b/neofetch @@ -2189,12 +2189,12 @@ END ;; "st") - [[ -z "$parent" ]] && parent="$(get_ppid "$PPID")" - term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" + if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" + else # On Linux we can get the exact path to the running binary through the procfs # (in case `st` is launched from outside of $PATH) on other systems we just @@ -2206,8 +2206,11 @@ END # Technically "Font Name" is a valid font. As it doesn't specify any font options # though it is hard to match it correctly amongst the rest of the noise. [[ -n "$binary" ]] && \ - term_font="$(strings "$binary" | \ - grep -F -m 1 -e "pixelsize=" -e "size=" -e "antialias=" -e "autohint=")" + term_font="$(strings "$binary" | grep -F -m 1 \ + -e "pixelsize=" \ + -e "size=" \ + -e "antialias=" \ + -e "autohint=")" fi term_font="${term_font/xft:}" From 9d6e8d2c8ca871606c7f1a26623f9d89dcf4ce21 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:41:27 +1000 Subject: [PATCH 164/300] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f05b191a..6ba81d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Contributors +- [**@aidanharris**](https://github.com/aidanharris) + ## General @@ -22,3 +24,6 @@ - Fixed duplicate Intel GPUs. +**Terminal Font** + +- Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) From 16b5157d22b9ba8a969f2362e3935dece154010e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:47:58 +1000 Subject: [PATCH 165/300] docs: CHANGELOG --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 93d37e0b..9a5b2062 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ Packaging status -[![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) From 2e8e69a120020241683bd8d0b777509718b77829 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:32:12 +1000 Subject: [PATCH 166/300] general: Cleanup --- neofetch | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index d3976574..c536d0e9 100755 --- a/neofetch +++ b/neofetch @@ -1281,11 +1281,10 @@ get_gpu() { case "$os" in "Linux") # Read GPUs into array. - IFS=$'\n' - gpus=($(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) - {if(!seen[a[i]]++) print a[i]}}')) - IFS="$old_ifs" + gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ + '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) + {if(!seen[a[i]]++) print a[i]}}')" + IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. # This fixes cases where the outputs are both @@ -2296,10 +2295,8 @@ get_disk() { # Create an array called 'disks' where each element is a separate line from # df's output. We then unset the first element which removes the column titles. - IFS=$'\n' - disks=($(df "${df_flags[@]}" "${disk_show[@]:-/}")) - unset 'disks[0]' - IFS="$old_ifs" + IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" + unset "disks[0]" # Stop here if 'df' fails to print disk info. if [[ -z "${disks[*]}" ]]; then @@ -2309,7 +2306,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. - disk_info=($disk) + IFS=" " read -ra disk_info <<< "$disk" disk_perc="${disk_info[4]/'%'}" case "$df_version" in @@ -4507,7 +4504,7 @@ old_options() { cache_uname() { # Cache the output of uname so we don't # have to spawn it multiple times. - uname=($(uname -sr)) + IFS=" " read -ra uname <<< "$(uname -sr)" kernel_name="${uname[0]}" kernel_version="${uname[1]}" @@ -4837,11 +4834,6 @@ Report bugs to https://github.com/dylanaraps/neofetch/issues exit 1 } -version() { - printf "%s\\n" "Neofetch $version" - exit 1 -} - get_args() { # Check the commandline flags early for '--config'. [[ "$*" != *--config* ]] && get_user_config @@ -5019,7 +5011,10 @@ get_args() { "-v") verbose="on" ;; "-vv") set -x; verbose="on" ;; "--help") usage ;; - "--version") version ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; "--gen-man") help2man -n "A fast, highly customizable system info script" \ -N ./neofetch -o neofetch.1 From e91648ad67cc6323671cab127a097356fea76a48 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:35:28 +1000 Subject: [PATCH 167/300] general: Remove old_ifs. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index c536d0e9..a9c366c8 100755 --- a/neofetch +++ b/neofetch @@ -14,7 +14,6 @@ version="3.4.1-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" -old_ifs="$IFS" # Speed up script by not using unicode. export LC_ALL=C From aa8c6c55f6be1ea1f69b82ca5bb549e445eae519 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:40:44 +1000 Subject: [PATCH 168/300] general: Remove unsafe splitting. --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a9c366c8..4faac552 100755 --- a/neofetch +++ b/neofetch @@ -1510,7 +1510,8 @@ get_memory() { ;; "AIX") - mem_stat=($(svmon -G -O unit=MB)) + IFS=" " read -ra mem_stat <<< "$(svmon -G -O unit=MB)" + mem_total="${mem_stat[11]/.*}" mem_free="${mem_stat[16]/.*}" mem_used="$((mem_total - mem_free))" @@ -1518,7 +1519,9 @@ get_memory() { ;; "IRIX") - mem_stat=($(pmem | head -1)) + IFS=$'\n' read -d "" -ra mem_cmd <<< "$(pmem)" + IFS=" " read -ra mem_stat <<< "${mem_cmd[0]}" + mem_total="$((mem_stat[3] / 1024))" mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" From cef3202ea5572dda15a748116d27a247c620b9e1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:49:12 +1000 Subject: [PATCH 169/300] general: Remove unsafe splitting. --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index a9c366c8..d1184005 100755 --- a/neofetch +++ b/neofetch @@ -2525,7 +2525,7 @@ get_install_date() { install_date="${install_date//-/ }" install_date="${install_date%:*}" - install_date=($install_date) + IFS=" " read -ra install_date <<< "$install_date" install_date="$(convert_time "${install_date[@]}")" } @@ -3189,7 +3189,7 @@ scrot_program() { # falling back to OS specific screenshot tools. if [[ -n "$DISPLAY" ]]; then if [[ "$scrot_cmd" != "auto" ]] && type -p "${scrot_cmd%% *}" >/dev/null; then - scrot_program=($scrot_cmd) + IFS=" " read -ra scrot_program <<< "$scrot_cmd" elif type -p maim >/dev/null; then scrot_program=(maim) @@ -4874,7 +4874,7 @@ get_args() { case "$arg" in "--disk_show") ;; "-"*) break ;; - *) disk_show+=($arg) + *) disk_show+=("$arg") ;; esac done ;; @@ -4898,7 +4898,7 @@ get_args() { for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do case "$arg" in "-"*) break ;; - *) colors+=($arg) + *) colors+=("$arg") ;; esac done colors+=(7 7 7 7 7 7) @@ -4966,7 +4966,7 @@ get_args() { for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do case "$arg" in "-"*) break ;; - *) ascii_colors+=($arg) + *) ascii_colors+=("$arg") esac done ascii_colors+=(7 7 7 7 7 7) From 82cc8ebb6e068030c6c6a2b7bc6edc82359dde77 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 19:54:36 +1000 Subject: [PATCH 170/300] general: Fixed issue on AIX. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4faac552..e78510db 100755 --- a/neofetch +++ b/neofetch @@ -1510,7 +1510,7 @@ get_memory() { ;; "AIX") - IFS=" " read -ra mem_stat <<< "$(svmon -G -O unit=MB)" + IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=MB)" mem_total="${mem_stat[11]/.*}" mem_free="${mem_stat[16]/.*}" From 41fd2df411788895e1f890e86dd387f6e6087016 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:06:33 +1000 Subject: [PATCH 171/300] memory: simplify --- neofetch | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index e78510db..7de76778 100755 --- a/neofetch +++ b/neofetch @@ -1434,18 +1434,10 @@ get_memory() { "Linux" | "Windows") # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - while IFS=":" read -r a b; do - case "$a" in - "MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;; - "Shmem") mem_used="$((mem_used+=${b/kB}))" ;; - "MemFree" | "Buffers" | "Cached" | "SReclaimable") - mem_used="$((mem_used-=${b/kB}))" - ;; - esac - done < /proc/meminfo + IFS=$'\n'"|:|kB" read -d "" -ra mem < /proc/meminfo - mem_used="$((mem_used / 1024))" - mem_total="$((mem_total / 1024))" + mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" + mem_total="$((mem[1] / 1024))" ;; "Mac OS X" | "iPhone OS") From d7172fa89b3b057c14808608d7cc32c747b83dbb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:10:42 +1000 Subject: [PATCH 172/300] memory: simplify --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7de76778..bacdc9ee 100755 --- a/neofetch +++ b/neofetch @@ -1432,10 +1432,10 @@ get_gpu() { get_memory() { case "$os" in "Linux" | "Windows") + IFS=$'\n'":kB" read -d "" -ra mem < /proc/meminfo + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - IFS=$'\n'"|:|kB" read -d "" -ra mem < /proc/meminfo - mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" mem_total="$((mem[1] / 1024))" ;; From 4212e83fe0cbe46be5fa1c17deee64451b26bbc6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:17:01 +1000 Subject: [PATCH 173/300] memory: simplify --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index bacdc9ee..e78510db 100755 --- a/neofetch +++ b/neofetch @@ -1432,12 +1432,20 @@ get_gpu() { get_memory() { case "$os" in "Linux" | "Windows") - IFS=$'\n'":kB" read -d "" -ra mem < /proc/meminfo - # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" - mem_total="$((mem[1] / 1024))" + while IFS=":" read -r a b; do + case "$a" in + "MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;; + "Shmem") mem_used="$((mem_used+=${b/kB}))" ;; + "MemFree" | "Buffers" | "Cached" | "SReclaimable") + mem_used="$((mem_used-=${b/kB}))" + ;; + esac + done < /proc/meminfo + + mem_used="$((mem_used / 1024))" + mem_total="$((mem_total / 1024))" ;; "Mac OS X" | "iPhone OS") From 039a9a81a98384f99ca89f17063a50aad76a619d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:28:01 +1000 Subject: [PATCH 174/300] docs: README --- README.md | 59 ++++++------------------------------------------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 9a5b2062..d6256485 100644 --- a/README.md +++ b/README.md @@ -9,66 +9,23 @@ [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) +Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. -Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using etc. +The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all. -Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. +You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. -Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, `FreeMint`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. +Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. For more information: -**https://github.com/dylanaraps/neofetch/wiki** +[\[Dependencies\](https://github.com/dylanaraps/neofetch/wiki/Dependencies) [\[Installation\](https://github.com/dylanaraps/neofetch/wiki/Installation) [\[Wiki\](https://github.com/dylanaraps/neofetch/wiki) + neofetch neofetch -## Dependencies - -https://github.com/dylanaraps/neofetch/wiki/Dependencies - - -## Installation - -https://github.com/dylanaraps/neofetch/wiki/Installation - - -## Post Install - - -### Using the config file - -Neofetch will by default create a config file at `$HOME/.config/neofetch/config` and this file contains all of the script's options/settings. The config file allows you to keep your customizations between script versions and allows you to easily share your customizations with other people. - -You can launch the script without a config file by using the flag `--config none` and you can specify a custom config location using `--config path/to/config`. - -See this wiki page for the default config: https://github.com/dylanaraps/neofetch/wiki/Config-File - - -### Customizing what info gets displayed - -https://github.com/dylanaraps/neofetch/wiki/Customizing-Info - - -### Customizing the script using a custom alias - -If you don't want to use the config file you can customize almost everything using launch flags. - -Here's an example neofetch alias: - -```sh -alias neofetch2="neofetch \ ---config off \ ---block_range 1 8 \ ---bold off \ ---uptime_shorthand on \ ---gtk_shorthand on \ ---colors 4 1 8 8 8 7 \ -" -``` - - ## Thanks Thanks to: @@ -86,7 +43,6 @@ Thanks to: - Tiny ASCII logos - ## Donate Donations will allow me to spend more time working on `neofetch`. @@ -94,6 +50,3 @@ Donations will allow me to spend more time working on `neofetch`. If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** - - -hey rtexel From 226cbbf0d8c66e71ec8e6c630319a07d1237ca2a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:29:20 +1000 Subject: [PATCH 175/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6256485..c7bab745 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -[\[Dependencies\](https://github.com/dylanaraps/neofetch/wiki/Dependencies) [\[Installation\](https://github.com/dylanaraps/neofetch/wiki/Installation) [\[Wiki\](https://github.com/dylanaraps/neofetch/wiki) +[[Dependencies(https://github.com/dylanaraps/neofetch/wiki/Dependencies)] [[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)] [[Wiki](https://github.com/dylanaraps/neofetch/wiki)] neofetch From 787d272faaf8b16a83b19b9b4c49e41d530960e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:30:18 +1000 Subject: [PATCH 176/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7bab745..db4c46a4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -[[Dependencies(https://github.com/dylanaraps/neofetch/wiki/Dependencies)] [[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)] [[Wiki](https://github.com/dylanaraps/neofetch/wiki)] +\[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From fb5afb1188c47f75ec029714e628bc06de41787a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:31:19 +1000 Subject: [PATCH 177/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db4c46a4..6e212a69 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -\[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] +\[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From 93d4315215415770ae5435e2cc1db1c205702d35 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:31:56 +1000 Subject: [PATCH 178/300] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6e212a69..f86a1545 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +
+ neofetch neofetch From dc4199f96bec2ba5f7f952d097c958de6ecd1198 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:32:29 +1000 Subject: [PATCH 179/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f86a1545..9a979f2b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -
+

neofetch From 6cd5d3c4c4be661006ebb8b9b5fcb3640de6a48b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:33:11 +1000 Subject: [PATCH 180/300] docs: README --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 9a979f2b..676bf733 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. -For more information: - -\[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] - -

- +For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] neofetch neofetch From edeac1c369e3133452a31bbae81efd2f8665ec8d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:34:08 +1000 Subject: [PATCH 181/300] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 676bf733..4451776b 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +

+ neofetch neofetch From 29311f9e23eef17b8eb55a398c36fa7866c43d7b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:38:22 +1000 Subject: [PATCH 182/300] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4451776b..03d5f159 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. +The overall purpose of Neofetch is to be used in screen-shots of your system. Neofetch shows the information other people want to see. There are other tools available for proper system statistic/diagnostics. + The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all. You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. From fed5b870b7bd40b0411e7049ae0fa81fbe804c2d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:38:50 +1000 Subject: [PATCH 183/300] docs: README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 03d5f159..6ca3d9ce 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -

neofetch neofetch From 4dedae1fe4e964ec6fd07838710ddceca60357eb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:45:41 +1000 Subject: [PATCH 184/300] docs: README --- README.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6ca3d9ce..13516ebe 100644 --- a/README.md +++ b/README.md @@ -26,21 +26,28 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc neofetch +## In the press + +- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app +- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released +- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released +- https://linuxconfig.org/how-to-display-system-information-with-neofetch +- https://www.ostechnix.com/neofetch-display-linux-systems-information/ +- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ +- https://www.maketecheasier.com/display-system-information-neofetch-linux/ +- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ +- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ +- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ +- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html +- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ + + ## Thanks -Thanks to: - - [Contributors](https://github.com/dylanaraps/neofetch/contributors) - - Thanks for making Neofetch better, I really appreciate it. - [Packagers](https://github.com/dylanaraps/neofetch/issues/115) - - Thanks for maintaining Neofetch packages. -- Users - - Thanks for using Neofetch! -- [Screenfetch](https://github.com/KittyKatt/screenFetch): - - We've used some snippets as a base for a few functions in this script. - - Some of the ASCII logos. -- [ufetch](https://github.com/jschx/ufetch): - - Tiny ASCII logos +- [Screenfetch](https://github.com/KittyKatt/screenFetch) +- [ufetch](https://github.com/jschx/ufetch) ## Donate From edea757f47e76b97f92d78679b3c98b1c8b28b40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:47:15 +1000 Subject: [PATCH 185/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13516ebe..3a595273 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc neofetch -## In the press +## Articles - https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app - https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released From cbe998b13580f2bfc93530617dda75ce051bdbb2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:47:46 +1000 Subject: [PATCH 186/300] docs: README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 3a595273..d7fc23b7 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,4 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc Donations will allow me to spend more time working on `neofetch`. -If you like `neofetch` and want to give back in some way you can donate here: - -**https://patreon.com/dyla** +If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** From ac06c87de0fbd2405bab3d3670b1c9e9f6c84a88 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:48:09 +1000 Subject: [PATCH 187/300] docs: README --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d7fc23b7..892ab2be 100644 --- a/README.md +++ b/README.md @@ -28,18 +28,18 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc ## Articles -- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app -- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released -- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released -- https://linuxconfig.org/how-to-display-system-information-with-neofetch -- https://www.ostechnix.com/neofetch-display-linux-systems-information/ -- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ -- https://www.maketecheasier.com/display-system-information-neofetch-linux/ -- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ -- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ -- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ -- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html - https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ +- https://linuxconfig.org/how-to-display-system-information-with-neofetch +- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ +- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ +- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html +- https://www.maketecheasier.com/display-system-information-neofetch-linux/ +- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app +- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released +- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released +- https://www.ostechnix.com/neofetch-display-linux-systems-information/ +- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ +- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ ## Thanks From ef0056e57d84d87d4e6cdffc5b50e5e76117bed8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:52:34 +1000 Subject: [PATCH 188/300] general: Cleanup --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 892ab2be..76d88ca8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) @@ -22,8 +22,8 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -neofetch -neofetch +neofetch +neofetch ## Articles From 305d9556ec150f767249a44d7022927863cbc6f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:56:00 +1000 Subject: [PATCH 189/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76d88ca8..b3368888 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. -For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From 3c3e17ad2b82bdb4e87ebcd52e8c6781b8703c8a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:05:14 +1000 Subject: [PATCH 190/300] docs: README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b3368888..6c1d6554 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) +[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 6d1ae8fe233a65308c4685e4924a1d3ee389e5b2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:14:53 +1000 Subject: [PATCH 191/300] docs: README --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6c1d6554..d37eb2c4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) @@ -18,15 +18,13 @@ The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. -Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. +Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] - neofetch neofetch - ## Articles - https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ From 970c4dfc294443c2b77d63272c71ab276a82c4a8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:15:39 +1000 Subject: [PATCH 192/300] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d37eb2c4..966fdb67 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) From 8fcc19c4d4650b4a30f73f63792f2244ebf884da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 13:57:38 +1000 Subject: [PATCH 193/300] wm: Added support for more Wayland Compositors --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f1f4fbed..ba76a594 100755 --- a/neofetch +++ b/neofetch @@ -747,21 +747,28 @@ get_wm() { if [[ "$WAYLAND_DISPLAY" ]]; then wm="$(ps -e | grep -m 1 -o -F \ + -e "arcan" \ -e "asc" \ + -e "clayland" \ -e "fireplace" \ + -e "greenfield" \ -e "grefsen" \ - -e "mazecompositor" \ + -e "lipstick" \ -e "maynard" \ + -e "mazecompositor" \ -e "motorcar" \ - -e "orbment" \ -e "orbital" \ + -e "orbment" \ -e "perceptia" \ -e "rustland" \ -e "sway" \ + -e "ulubis" \ -e "velox" \ -e "wavy" \ - -e "wayhouse" \ -e "way-cooler" \ + -e "wayfire" \ + -e "wayhouse" \ + -e "westeros" \ -e "westford" \ -e "weston")" From 9870c90a98d154dff2e33315853eeecf063f9aed Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 13:58:35 +1000 Subject: [PATCH 194/300] wm: Added support for more Wayland Compositors --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index ba76a594..e77dcc25 100755 --- a/neofetch +++ b/neofetch @@ -750,6 +750,7 @@ get_wm() { -e "arcan" \ -e "asc" \ -e "clayland" \ + -e "dwc" \ -e "fireplace" \ -e "greenfield" \ -e "grefsen" \ From 74cec3b30f1025a9918aea3a691f069478bebfa8 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 18 Apr 2018 20:33:38 +0200 Subject: [PATCH 195/300] Fix packages count for exherbo Installed packages data is stored in /var/db/paludis/installed/data/* and the cross-installed packages data is stored in /var/db/paludis/cross-installed/arch/data/* where arch could be every cpu arch supported by exherbo. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e77dcc25..98761f86 100755 --- a/neofetch +++ b/neofetch @@ -564,7 +564,7 @@ get_packages() { packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then - package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) + package_dir=(/var/db/paludis/repositories/{cross-installed/*,installed}/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi From c32ccb7fcfc5254da4865b1af13a02bf0c4b2824 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:22:54 +1000 Subject: [PATCH 196/300] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ba81d34..5a21ad1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Contributors - [**@aidanharris**](https://github.com/aidanharris) +- [**@DanySpin97**](https://github.com/DanySpin97) ## General @@ -27,3 +28,7 @@ **Terminal Font** - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) + +**Packages** + +- Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) From 745f568a94ff42ac135e3e29460d061bf2a49aa9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:25:37 +1000 Subject: [PATCH 197/300] wm: Added support for dwm --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 98761f86..e97281e7 100755 --- a/neofetch +++ b/neofetch @@ -788,6 +788,7 @@ get_wm() { [[ -z "$wm" ]] && \ wm="$(ps -e | grep -m 1 -o -F \ -e "catwm" \ + -e "dwm" \ -e "monsterwm" \ -e "tinywm")" From 38e929967fcba4f1bd790a77e1d937f7761b7ff3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:27:01 +1000 Subject: [PATCH 198/300] docs: CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a21ad1e..a2a85417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,3 +32,7 @@ **Packages** - Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) + +**Window Manager** + +- Added support for detecting `dwm`. From 2606e4b1d6c431efc2a9bea4f0bec2385ad805f2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 07:48:41 +1000 Subject: [PATCH 199/300] image: Added kitty backend. Closes #953 --- neofetch | 12 +++++++++--- neofetch.1 | 27 +++------------------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/neofetch b/neofetch index e97281e7..c54e99d5 100755 --- a/neofetch +++ b/neofetch @@ -2629,7 +2629,7 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") get_image_source if [[ ! -f "$image" ]]; then @@ -2654,7 +2654,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', + err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii @@ -3066,6 +3066,11 @@ display_image() { to_off "Image: jp2a failed to display the image." ;; + "kitty") + kitty icat --align left --place "${width}x${height}@${xoffset}x${yoffset}" "$image" ||\ + to_off "Image: kitty failed to display the image." + ;; + "pixterm") pixterm -tc "$((width / font_width))" \ -tr "$((height / font_height))" \ @@ -4762,6 +4767,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. @@ -4949,7 +4955,7 @@ get_args() { "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m") + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case "$2" in "-"* | "") ;; diff --git a/neofetch.1 b/neofetch.1 index 51d4cec4..d43db1d8 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -211,6 +211,9 @@ Shortcut to use 'iterm2' backend. \fB\-\-jp2a\fR source Shortcut to use 'jp2a' backend. .TP +\fB\-\-kitty\fR source +Shortcut to use 'kitty' backend. +.TP \fB\-\-pixterm\fR source Shortcut to use 'pixterm' backend. .TP @@ -338,29 +341,5 @@ Display a verbose log for error reporting. .TP \fB\-\-gen\-man\fR Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) -.SH AUTHOR -Written by Dylan Araps with help from the following people: -.PP -https://github.com/dylanaraps/neofetch/contributors .SH "REPORTING BUGS" Report bugs to https://github.com/dylanaraps/neofetch/issues -.SH COPYRIGHT -Copyright \(co 2016\-2017 Dylan Araps -.PP -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the 'Software'), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: -.PP -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -.PP -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 1b7169935358e8c7e2c4263508aaa0fbacbd8573 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 07:49:42 +1000 Subject: [PATCH 200/300] docs: CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2a85417..879f55ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) +- [**@SolitudeSF**](https://github.com/SolitudeSF) ## General @@ -13,6 +14,7 @@ ## Images - Added `wal`/`pywal` support to get the current wallpaper. +- Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) ## Info From 944968cf69aa8a93b78d9c278237b6e1ca4b402b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 08:13:01 +1000 Subject: [PATCH 201/300] wm: Added WM version. --- config/config.conf | 11 +++++++++++ neofetch | 11 +++++++++++ neofetch.1 | 3 +++ 3 files changed, 25 insertions(+) diff --git a/config/config.conf b/config/config.conf index d754e023..65d01d49 100644 --- a/config/config.conf +++ b/config/config.conf @@ -303,6 +303,17 @@ gtk3="on" public_ip_host="http://ident.me" +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + # Disk diff --git a/neofetch b/neofetch index c54e99d5..dc7a01ad 100755 --- a/neofetch +++ b/neofetch @@ -792,6 +792,15 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" + if [[ "$wm_version" == "on" ]]; then + wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/copyright*}" + wmv="${wmv/version }" + wmv="${wmv/©*}" + wmv="${wmv/(c)*}" + wm="$wmv" + fi else case "$os" in "Mac OS X") @@ -4699,6 +4708,7 @@ INFO: NOTE: This only supports Linux. + --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4869,6 +4879,7 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; + "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index d43db1d8..391cb7d6 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -81,6 +81,9 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP +\fB\-\-wm_version\fR on/off +Show/Hide Window Manager version. +.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From aa7ec8b529fc6e298f9fcfe34ec383f335708c59 Mon Sep 17 00:00:00 2001 From: SolitudeSF Date: Fri, 20 Apr 2018 00:47:15 +0300 Subject: [PATCH 202/300] Add 'setroot' wallpaper fetching --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index c54e99d5..66669e01 100755 --- a/neofetch +++ b/neofetch @@ -2802,6 +2802,11 @@ END if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" + elif type -p setroot >/dev/null && \ + [[ -f "${XDG_CONFIG_HOME}/setroot/.setroot-restore" ]]; then + image="$(awk -F\' '/setroot/ {printf $(NF-1)}' \ + "${XDG_CONFIG_HOME}/setroot/.setroot-restore")" + elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ "${XDG_CONFIG_HOME}/nitrogen/bg-saved.cfg")" From 5c5824489753cbdeedd63662473f4cf52936a78a Mon Sep 17 00:00:00 2001 From: Kayant Date: Sat, 21 Apr 2018 12:20:57 +0100 Subject: [PATCH 203/300] cpu_temp: Add support for Zen processors This adds support for Zen based processors(AMD family 17h) like the Ryzen series using the k10temp module. This requires either having a patched kernel with the hwmon updates see - lkml.org/lkml/2017/9/6/684 Or kernel 4.15+ where the patch was merged. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 66669e01..5e60a961 100755 --- a/neofetch +++ b/neofetch @@ -1022,7 +1022,7 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power) ]] && \ + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && \ { temp_dir="${temp_dir}/temp1_input"; break; } done From 1bd9f1759cc5d626f21bc9088c1505ba23dc850f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:01:18 +1000 Subject: [PATCH 204/300] general: Cleanup --- neofetch | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 5e60a961..a6408038 100755 --- a/neofetch +++ b/neofetch @@ -2928,11 +2928,7 @@ get_term_size() { get_image_size() { # This functions determines the size to make # the thumbnail image. - - # Get terminal lines and columns. - term_blocks="$(stty size)" - columns="${term_blocks/* }" - lines="${term_blocks/ *}" + read -r lines columns <<< "$(stty size)" # Calculate font size. font_width="$((term_width / columns))" @@ -2957,9 +2953,7 @@ get_image_size() { "none") # Get image size so that we can do a better crop. - size="$(identify -format "%w %h" "$image")" - width="${size%% *}" - height="${size##* }" + read -r width height <<< "$(identify -format "%w %h" "$image")" crop_mode="none" while (( "$width" >= ("$term_width" / 2) || @@ -2997,14 +2991,8 @@ make_thumbnail() { if [[ ! -f "$thumbnail_dir/$image_name" ]]; then # Get image size so that we can do a better crop. if [[ -z "$size" ]]; then - size="$(identify -format "%w %h" "$image")" - og_width="${size%% *}" - og_height="${size##* }" - - # This checks to see if height is greater than width - # so we can do a better crop of portrait images. - size="$og_height" - ((og_height > og_width)) && size="$og_width" + read -r og_width og_height <<< "$(identify -format "%w %h" "$image")" + ((og_height > og_width)) && size="$og_width" || size="$og_height" fi case "$crop_mode" in From c354ddcd761e2da6efe54598b4c31f062b802aa0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:09:05 +1000 Subject: [PATCH 205/300] Distro: Show release info by default. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a6408038..89fd5708 100755 --- a/neofetch +++ b/neofetch @@ -76,9 +76,9 @@ get_distro() { case "$distro_shorthand" in "on") lsb_flags="-sir" ;; "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sd" ;; + *) lsb_flags="-sdr" ;; esac - distro="$(lsb_release $lsb_flags)" + distro="$(lsb_release "$lsb_flags")" elif [[ -f "/etc/GoboLinuxVersion" ]]; then case "$distro_shorthand" in From f9f4e54c2dc805d7c5f043610ef5da395aeeb701 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:11:57 +1000 Subject: [PATCH 206/300] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 879f55ea..5760b4a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) - [**@SolitudeSF**](https://github.com/SolitudeSF) +- [**@Kayant**](https://github.com/Kayant) ## General @@ -23,6 +24,10 @@ - Fixed unexpected backslash being inserted on some systems. +**CPU** + +- Added temperature support for Zen processors. [**@Kayant**](https://github.com/Kayant) + **GPU** - Fixed duplicate Intel GPUs. From 6901a3ff8ba11b4ae4ad867a9b3f2ce968344be3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 18:12:38 +1000 Subject: [PATCH 207/300] distro: Revert change --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 89fd5708..26247a7a 100755 --- a/neofetch +++ b/neofetch @@ -76,7 +76,7 @@ get_distro() { case "$distro_shorthand" in "on") lsb_flags="-sir" ;; "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sdr" ;; + *) lsb_flags="-sd" ;; esac distro="$(lsb_release "$lsb_flags")" From 3ed7327ef38c1b18dec51d6878dc0c85d8686b72 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 24 Apr 2018 23:43:07 +0200 Subject: [PATCH 208/300] Add files via upload --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 26247a7a..e3fe9188 100755 --- a/neofetch +++ b/neofetch @@ -3428,6 +3428,11 @@ get_distro_colors() { ascii_file="apricity" ;; + "ArcoLinux"*) + set_colors 7 4 + ascii_file="arcolinux" + ;; + "arch_small") set_colors 6 7 1 ascii_file="arch_small" @@ -3729,6 +3734,11 @@ get_distro_colors() { ascii_file="lede" ;; + "Linux Lite"*) + set_colors fg 8 3 + ascii_file="linuxlite" + ;; + "Linux") set_colors fg 8 3 ascii_file="linux" From 46dbd934dd67767687d3edfd45299d995227742a Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 24 Apr 2018 23:43:36 +0200 Subject: [PATCH 209/300] Add files via upload --- ascii/distro/arcolinux | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ascii/distro/arcolinux diff --git a/ascii/distro/arcolinux b/ascii/distro/arcolinux new file mode 100644 index 00000000..0a42c6ad --- /dev/null +++ b/ascii/distro/arcolinux @@ -0,0 +1,20 @@ +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} \ No newline at end of file From 540de7173a57e46ab7200117bb6375676f4648e0 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 25 Apr 2018 00:40:01 +0200 Subject: [PATCH 210/300] Add files via upload --- neofetch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neofetch b/neofetch index e3fe9188..92c17f03 100755 --- a/neofetch +++ b/neofetch @@ -3734,11 +3734,6 @@ get_distro_colors() { ascii_file="lede" ;; - "Linux Lite"*) - set_colors fg 8 3 - ascii_file="linuxlite" - ;; - "Linux") set_colors fg 8 3 ascii_file="linux" From dcd7171c920f45c92f5bfae18e8846c0d3e969e1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 11:32:52 +1000 Subject: [PATCH 211/300] docs: update --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5760b4a0..b623a9da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ ## Contributors + - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) - [**@SolitudeSF**](https://github.com/SolitudeSF) - [**@Kayant**](https://github.com/Kayant) +- [**@robertwolter**](https://github.com/robertwolter) + + +## Operating System + +- Added support for ArcoLinux. ## General @@ -16,6 +23,7 @@ - Added `wal`/`pywal` support to get the current wallpaper. - Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) +- Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) ## Info From b87300d87aaadddd83a977d1d9558df2cd0cf6ad Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 13:23:47 +1000 Subject: [PATCH 212/300] image: [w3m] Fix issue with zws not being applied to get_cols --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 92c17f03..16000a8f 100755 --- a/neofetch +++ b/neofetch @@ -2640,7 +2640,7 @@ image_backend() { get_term_size if [[ "$term_width" ]] && ((term_width >= 1)); then - clear + printf "\e[2J\e[H" else to_ascii "Image: Failed to find terminal window size." err "Image: Check the 'Images in the terminal' wiki page for more info," @@ -2649,6 +2649,9 @@ image_backend() { get_image_size make_thumbnail + + [[ "$image_backend" == *"w3m"* ]] && zws="\xE2\x80\x8B\x20" + display_image ;; @@ -2662,7 +2665,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "%b" "\e[${lines:-0}A\e[9999999D" + [[ "$image_backend" != "off" ]] && printf "\e[${lines:-0}A\e[9999999D" } get_ascii() { @@ -3105,8 +3108,6 @@ display_image() { printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ "${w3m_img_path:-false}" -bg "$background_color" >/dev/null 2>&1 ||\ to_off "Image: w3m-img failed to display the image." - - zws="\xE2\x80\x8B\x20" ;; esac } From 327e639eff7f393ff366faae38b530c814273195 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 27 Apr 2018 11:54:38 +0200 Subject: [PATCH 213/300] de: fix Unity in 18.04 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 16000a8f..d59d64d1 100755 --- a/neofetch +++ b/neofetch @@ -697,6 +697,7 @@ get_de() { if [[ "$XDG_CURRENT_DESKTOP" ]]; then de="${XDG_CURRENT_DESKTOP/'X-'}" de="${de/Budgie:GNOME/Budgie}" + de="${de/:Unity7:ubuntu}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" From 53e557dcd73a41583e937c04c986015a9dd4910e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Apr 2018 22:16:07 +1000 Subject: [PATCH 214/300] general: Fix tests --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 16000a8f..808ba7dd 100755 --- a/neofetch +++ b/neofetch @@ -2665,7 +2665,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "\e[${lines:-0}A\e[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\e[${lines:-0}A\e[9999999D" } get_ascii() { From d92fd6931fbbfecfd47a6f445d93be4d50b4f008 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 15:44:47 -0700 Subject: [PATCH 215/300] Update Android ascii This is so it looks more uniform with the other arts. --- ascii/distro/android | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/ascii/distro/android b/ascii/distro/android index 17e7ff30..cb9d43e8 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,13 +1,20 @@ -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ +${c1} `y` `y` + `h+shdmmdhs+h` + `omMMMMMMMMMMMMmo` + +NMM${c2}os${c1}MMMMMMMM${c2}so${c1}MMN+ + oMMMMmmMMMMMMMMmmMMMM+ + `MMMMMMMMMMMMMMMMMMMMMN` +`+o+``yyyyyyyyyyyyyyyyyyyyyy`.+o+` +mMMMN.MMMMMMMMMMMMMMMMMMMMMM.NMMMm +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +sMMMy`MMMMMMMMMMMMMMMMMMMMMM`yMMMs + .` `MMMMMMMMMMMMMMMMMMMMMM` `. + oNMMMMMMMMMMMMMMMMMMNo + ``yMMMM+``+MMMMy`` + yMMMM/ /MMMMy + yMMMM/ /MMMMy + -dMMh` `hMMd- From 73410969531ea87a0c82863ac72e5e895c767e3c Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 16:04:51 -0700 Subject: [PATCH 216/300] Remove width set --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 808ba7dd..cf46cb3a 100755 --- a/neofetch +++ b/neofetch @@ -3406,7 +3406,6 @@ get_distro_colors() { "Android"*) set_colors 2 7 ascii_file="android" - ascii_length_force=19 ;; "Antergos"*) From 3c26a10bd45ef8103baaf5678d19dfa3601d2562 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 17:34:27 -0700 Subject: [PATCH 217/300] Make art slightly smaller --- ascii/distro/android | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/ascii/distro/android b/ascii/distro/android index cb9d43e8..a838f99a 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,20 +1,18 @@ -${c1} `y` `y` - `h+shdmmdhs+h` - `omMMMMMMMMMMMMmo` - +NMM${c2}os${c1}MMMMMMMM${c2}so${c1}MMN+ - oMMMMmmMMMMMMMMmmMMMM+ - `MMMMMMMMMMMMMMMMMMMMMN` -`+o+``yyyyyyyyyyyyyyyyyyyyyy`.+o+` -mMMMN.MMMMMMMMMMMMMMMMMMMMMM.NMMMm -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -sMMMy`MMMMMMMMMMMMMMMMMMMMMM`yMMMs - .` `MMMMMMMMMMMMMMMMMMMMMM` `. - oNMMMMMMMMMMMMMMMMMMNo - ``yMMMM+``+MMMMy`` - yMMMM/ /MMMMy - yMMMM/ /MMMMy - -dMMh` `hMMd- +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs From 89f6bae27c3b29f6bb67a1364e499580605de890 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 17:49:53 -0700 Subject: [PATCH 218/300] Fix small typo --- ascii/distro/android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ascii/distro/android b/ascii/distro/android index a838f99a..610622dd 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,4 +1,4 @@ -${c1} -o o- +${c1} -o o- +hydNNNNdyh+ +mMMMMMMMMMMMMm+ `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` From 1d5d679ec6031eab3ac93cc6359db4d8f7a74954 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 30 Apr 2018 16:16:08 +1000 Subject: [PATCH 219/300] docs: update --- CHANGELOG.md | 11 +++++++++++ README.md | 1 + 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b623a9da..ef80e2ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - [**@SolitudeSF**](https://github.com/SolitudeSF) - [**@Kayant**](https://github.com/Kayant) - [**@robertwolter**](https://github.com/robertwolter) +- [**@TsundereBug**](https://github.com/TsundereBug) +- [**@dawidd6**](https://github.com/dawidd6) ## Operating System @@ -26,6 +28,11 @@ - Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) +## Ascii + +- Updated Android ascii art to better work on non-unicode terminals. [**@TsundereBug**](https://github.com/TsundereBug) + + ## Info **Title** @@ -48,6 +55,10 @@ - Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) +**Desktop Environment** + +- Fixed Unity output in Ubuntu 18.04. [**@dawidd6**](https://github.com/dawidd6) + **Window Manager** - Added support for detecting `dwm`. diff --git a/README.md b/README.md index 966fdb67..aeaeb73f 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
+ ### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From cdb576479e0f561075737061c07be0af6607d6cb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 30 Apr 2018 16:18:24 +1000 Subject: [PATCH 220/300] macOS: Fix memory bug. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7c7ad804..f793a1e7 100755 --- a/neofetch +++ b/neofetch @@ -1463,6 +1463,7 @@ get_memory() { mem_wired="$(vm_stat | awk '/wired/ { print $4 }')" mem_active="$(vm_stat | awk '/active / { printf $3 }')" mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')" + mem_compressed="${mem_compressed:-0}" mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" ;; From 7dbb157a8085d655b9826ef255f2407bbc4b83b7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:25:19 +1000 Subject: [PATCH 221/300] wm: Show version for KDE and dwm. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dc7a01ad..d35fe625 100755 --- a/neofetch +++ b/neofetch @@ -793,8 +793,12 @@ get_wm() { -e "tinywm")" if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="$wm $("${wm,,}" --version || \ + "${wm,,}" -v || \ + "${wm,,}_x11" -v)" || \ + "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/$wm $wm-/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From ed237bfcbc801ee513f47318beb1a26d25dec1c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:30:18 +1000 Subject: [PATCH 222/300] wm: Added support for aewm --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d35fe625..7284307f 100755 --- a/neofetch +++ b/neofetch @@ -798,7 +798,7 @@ get_wm() { "${wm,,}_x11" -v)" || \ "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm $wm-/$wm}" + wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 2bb8a30a4918dc64e6f73345d196b631c0cf8325 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:41:44 +1000 Subject: [PATCH 223/300] wm: Added support for more window managers. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 7284307f..4749c3cc 100755 --- a/neofetch +++ b/neofetch @@ -792,17 +792,16 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || \ - "${wm,,}" -v || \ - "${wm,,}_x11" -v)" || \ - "${wm,,}_wayland" -v")" + if [[ "$wm_version" == "on" && "$wm" ]]; then + wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" + wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" + wmv="${wmv/$wm ${wm}?/$wm }" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" wmv="${wmv/(c)*}" + wmv="${wmv/ : }" wm="$wmv" fi else From 70b1fe169cdc341865a2a597a669d8cfd35c3e6c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:05:49 +1000 Subject: [PATCH 224/300] config: Inline config file. --- config/config.conf | 782 ------------------------------------------- neofetch | 814 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 790 insertions(+), 806 deletions(-) delete mode 100644 config/config.conf diff --git a/config/config.conf b/config/config.conf deleted file mode 100644 index 65d01d49..00000000 --- a/config/config.conf +++ /dev/null @@ -1,782 +0,0 @@ -# Neofetch config file -# https://github.com/dylanaraps/neofetch - - -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Install Date" install_date - # info "Locale" locale # This only works on glibc systems. - - info line_break - info cols - info line_break -} - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'off', 'tiny' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'off', 'tiny' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' -# tiny: '2d 10h 3m' -uptime_shorthand="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand. -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - - -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -disk_subtitle="mount" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# Google Play -# Spotify -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# elisa -# exaile -# gnome-music -# guayadeque -# iTunes$ -# juk -# lollypop -# mocp -# mopidy -# mpd -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# spotify -# tomahawk -# xmms2d -# yarock -music_player="auto" - -# Print the Artist and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Chelsea Dagger' -song_shorthand="off" - - -# Install Date - - -# Whether to show the time in the output -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --install_time -# -# Example: -# on: 'Thu 14 Apr 2016 11:50 PM' -# off: 'Thu 14 Apr 2016' -install_time="on" - -# Set time format in the output -# -# Default: '24h' -# Values: '12h', '24h' -# Flag: --install_time_format -# -# Example: -# 12h: 'Thu 14 Apr 2016 11:50 PM' -# 24h: 'Thu 14 Apr 2016 23:50' -install_time_format="12h" - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(distro) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '7' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 7) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="auto" - - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="auto" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Scrot Options - - -# Whether or not to always take a screenshot -# You can manually take a screenshot with "--scrot" or "-s" -# -# Default: 'off' -# Values: 'on', 'off' -# Flags: --scrot -# -s -scrot="off" - -# Screenshot Program -# Neofetch will automatically use whatever screenshot tool -# is installed on your system. -# -# If 'neofetch -v' says that it couldn't find a screenshot -# tool or you're using a custom tool then you can change -# the option below to a custom command. -# -# Default: 'auto' -# Values: 'auto' 'cmd -flags' -# Flag: --scrot_cmd -scrot_cmd="auto" - -# Screenshot Filename -# What to name the screenshots -# -# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' -# Values: 'string' -# Flag: --scrot_name -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" - -# Image upload host -# Where to upload the image. -# -# Default: 'teknik' -# Values: 'imgur', 'teknik' -# Flag: --image_host -# -# NOTE: If you'd like another image host to be added to Neofetch. -# Open an issue on github. -image_host="teknik" - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 4749c3cc..30328a8b 100755 --- a/neofetch +++ b/neofetch @@ -31,6 +31,789 @@ shopt -s nocasematch # Reset colors and bold. reset="\e[0m" +# Neofetch default config. +readarray -t config <<'EOM' +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info +print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + + # info "GPU Driver" gpu_driver # Linux/macOS only + # info "CPU Usage" cpu_usage + # info "Disk" disk + # info "Battery" battery + # info "Font" font + # info "Song" song + # info "Local IP" local_ip + # info "Public IP" public_ip + # info "Users" users + # info "Install Date" install_date + # info "Locale" locale # This only works on glibc systems. + + info line_break + info cols + info line_break +} + + +# Kernel + + +# Shorten the output of the kernel function. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --kernel_shorthand +# Supports: Everything except *BSDs (except PacBSD and PC-BSD) +# +# Example: +# on: '4.8.9-1-ARCH' +# off: 'Linux 4.8.9-1-ARCH' +kernel_shorthand="on" + + +# Distro + + +# Shorten the output of the distro function +# +# Default: 'off' +# Values: 'on', 'off', 'tiny' +# Flag: --distro_shorthand +# Supports: Everything except Windows and Haiku +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Show 'x86_64', 'x86' and etc in 'Distro:' output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --os_arch +# +# Example: +# on: 'Arch Linux x86_64' +# off: 'Arch Linux' +os_arch="on" + + +# Uptime + + +# Shorten the output of the uptime function +# +# Default: 'on' +# Values: 'on', 'off', 'tiny' +# Flag: --uptime_shorthand +# +# Example: +# on: '2 days, 10 hours, 3 mins' +# off: '2 days, 10 hours, 3 minutes' +# tiny: '2d 10h 3m' +uptime_shorthand="on" + + +# Shell + + +# Show the path to $SHELL +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --shell_path +# +# Example: +# on: '/bin/bash' +# off: 'bash' +shell_path="off" + +# Show $SHELL version +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --shell_version +# +# Example: +# on: 'bash 4.4.5' +# off: 'bash' +shell_version="on" + + +# CPU + + +# CPU speed type +# +# Default: 'bios_limit' +# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. +# Flag: --speed_type +# Supports: Linux with 'cpufreq' +# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. +speed_type="bios_limit" + +# CPU speed shorthand +# +# Default: 'off' +# Values: 'on', 'off'. +# Flag: --speed_shorthand. +# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz +# +# Example: +# on: 'i7-6500U (4) @ 3.1GHz' +# off: 'i7-6500U (4) @ 3.100GHz' +speed_shorthand="off" + +# Enable/Disable CPU brand in output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_brand +# +# Example: +# on: 'Intel i7-6500U' +# off: 'i7-6500U (4)' +cpu_brand="on" + +# CPU Speed +# Hide/Show CPU speed. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_speed +# +# Example: +# on: 'Intel i7-6500U (4) @ 3.1GHz' +# off: 'Intel i7-6500U (4)' +cpu_speed="on" + +# CPU Cores +# Display CPU cores in output +# +# Default: 'logical' +# Values: 'logical', 'physical', 'off' +# Flag: --cpu_cores +# Support: 'physical' doesn't work on BSD. +# +# Example: +# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) +# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) +# off: 'Intel i7-6500U @ 3.1GHz' +cpu_cores="logical" + +# CPU Temperature +# Hide/Show CPU temperature. +# Note the temperature is added to the regular CPU function. +# +# Default: 'off' +# Values: 'C', 'F', 'off' +# Flag: --cpu_temp +# Supports: Linux, BSD +# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable +# coretemp kernel module. This only supports newer Intel processors. +# +# Example: +# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' +# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' +# off: 'Intel i7-6500U (4) @ 3.1GHz' +cpu_temp="off" + + +# GPU + + +# Enable/Disable GPU Brand +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gpu_brand +# +# Example: +# on: 'AMD HD 7950' +# off: 'HD 7950' +gpu_brand="on" + +# Which GPU to display +# +# Default: 'all' +# Values: 'all', 'dedicated', 'integrated' +# Flag: --gpu_type +# Supports: Linux +# +# Example: +# all: +# GPU1: AMD HD 7950 +# GPU2: Intel Integrated Graphics +# +# dedicated: +# GPU1: AMD HD 7950 +# +# integrated: +# GPU1: Intel Integrated Graphics +gpu_type="all" + + +# Resolution + + +# Display refresh rate next to each monitor +# Default: 'off' +# Values: 'on', 'off' +# Flag: --refresh_rate +# Supports: Doesn't work on Windows. +# +# Example: +# on: '1920x1080 @ 60Hz' +# off: '1920x1080' +refresh_rate="off" + + +# Gtk Theme / Icons / Font + + +# Shorten output of GTK Theme / Icons / Font +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --gtk_shorthand +# +# Example: +# on: 'Numix, Adwaita' +# off: 'Numix [GTK2], Adwaita [GTK3]' +gtk_shorthand="off" + + +# Enable/Disable gtk2 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk2 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Adwaita [GTK3]' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk3 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Numix [GTK2]' +gtk3="on" + + +# IP Address + + +# Website to ping for the public IP +# +# Default: 'http://ident.me' +# Values: 'url' +# Flag: --ip_host +public_ip_host="http://ident.me" + + +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + +# Disk + + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +# NOTE: By default we only show the disk info for '/'. +# +# Default: '/' +# Values: '/', '/dev/sdXX', '/path/to/drive'. +# Flag: --disk_show +# +# Example: +# disk_show=('/' '/dev/sdb1'): +# 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 823G / 893G (93%)' +# +# disk_show=('/'): +# 'Disk (/): 74G / 118G (66%)' +# +disk_show=('/') + +# Disk subtitle. +# What to append to the Disk subtitle. +# +# Default: 'mount' +# Values: 'mount', 'name', 'dir' +# Flag: --disk_subtitle +# +# Example: +# name: 'Disk (/dev/sda1): 74G / 118G (66%)' +# 'Disk (/dev/sdb2): 74G / 118G (66%)' +# +# mount: 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 74G / 118G (66%)' +# +# dir: 'Disk (/): 74G / 118G (66%)' +# 'Disk (Local Disk): 74G / 118G (66%)' +# 'Disk (Videos): 74G / 118G (66%)' +disk_subtitle="mount" + + +# Song + + +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + +# Print the Artist and Title on separate lines +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --song_shorthand +# +# Example: +# on: 'Artist: The Fratellis' +# 'Song: Chelsea Dagger' +# +# off: 'Song: The Fratellis - Chelsea Dagger' +song_shorthand="off" + + +# Install Date + + +# Whether to show the time in the output +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --install_time +# +# Example: +# on: 'Thu 14 Apr 2016 11:50 PM' +# off: 'Thu 14 Apr 2016' +install_time="on" + +# Set time format in the output +# +# Default: '24h' +# Values: '12h', '24h' +# Flag: --install_time_format +# +# Example: +# 12h: 'Thu 14 Apr 2016 11:50 PM' +# 24h: 'Thu 14 Apr 2016 23:50' +install_time_format="12h" + + +# Text Colors + + +# Text Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --colors +# +# Each number represents a different part of the text in +# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' +# +# Example: +# colors=(distro) - Text is colored based on Distro colors. +# colors=(4 6 1 8 8 6) - Text is colored in the order above. +colors=(distro) + + +# Text Options + + +# Toggle bold text +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bold +bold="on" + +# Enable/Disable Underline +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --underline +underline_enabled="on" + +# Underline character +# +# Default: '-' +# Values: 'string' +# Flag: --underline_char +underline_char="-" + + +# Color Blocks + + +# Color block range +# The range of colors to print. +# +# Default: '0', '7' +# Values: 'num' +# Flag: --block_range +# +# Example: +# +# Display colors 0-7 in the blocks. (8 colors) +# neofetch --block_range 0 7 +# +# Display colors 0-15 in the blocks. (16 colors) +# neofetch --block_range 0 15 +block_range=(0 7) + +# Toggle color blocks +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --color_blocks +color_blocks="on" + +# Color block width in spaces +# +# Default: '3' +# Values: 'num' +# Flag: --block_width +block_width=3 + +# Color block height in lines +# +# Default: '1' +# Values: 'num' +# Flag: --block_height +block_height=1 + + +# Progress Bars + + +# Bar characters +# +# Default: '-', '=' +# Values: 'string', 'string' +# Flag: --bar_char +# +# Example: +# neofetch --bar_char 'elapsed' 'total' +# neofetch --bar_char '-' '=' +bar_char_elapsed="-" +bar_char_total="=" + +# Toggle Bar border +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bar_border +bar_border="on" + +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# +# Default: '15' +# Values: 'num' +# Flag: --bar_length +bar_length=15 + +# Progress bar colors +# When set to distro, uses your distro's logo colors. +# +# Default: 'distro', 'distro' +# Values: 'distro', 'num' +# Flag: --bar_colors +# +# Example: +# neofetch --bar_colors 3 4 +# neofetch --bar_colors distro 5 +bar_color_elapsed="distro" +bar_color_total="distro" + + +# Info display +# Display a bar with the info. +# +# Default: 'off' +# Values: 'bar', 'infobar', 'barinfo', 'off' +# Flags: --cpu_display +# --memory_display +# --battery_display +# --disk_display +# +# Example: +# bar: '[---=======]' +# infobar: 'info [---=======]' +# barinfo: '[---=======] info' +# off: 'info' +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" + + +# Backend Settings + + +# Image backend. +# +# Default: 'ascii' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Flag: --backend +image_backend="ascii" + +# Image Source +# +# Which image or ascii file to display. +# +# Default: 'auto' +# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# Flag: --source +# +# NOTE: 'auto' will pick the best image source for whatever image backend is used. +# In ascii mode, distro ascii art will be used and in an image mode, your +# wallpaper will be used. +image_source="auto" + + +# Ascii Options + + +# Ascii distro +# Which distro's ascii art to display. +# +# Default: 'auto' +# Values: 'auto', 'distro_name' +# Flag: --ascii_distro +# +# NOTE: Arch and Ubuntu have 'old' logo variants. +# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: Ubuntu has flavor variants. +# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. +# NOTE: Arch, Crux and Gentoo have a smaller logo variant. +# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +ascii_distro="auto" + +# Ascii Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --ascii_colors +# +# Example: +# ascii_colors=(distro) - Ascii is colored based on Distro colors. +# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. +ascii_colors=(distro) + +# Bold ascii logo +# Whether or not to bold the ascii logo. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --ascii_bold +ascii_bold="on" + + +# Image Options + + +# Image loop +# Setting this to on will make neofetch redraw the image constantly until +# Ctrl+C is pressed. This fixes display issues in some terminal emulators. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --loop +image_loop="off" + +# Thumbnail directory +# +# Default: '~/.cache/thumbnails/neofetch' +# Values: 'dir' +thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" + +# Crop mode +# +# Default: 'normal' +# Values: 'normal', 'fit', 'fill' +# Flag: --crop_mode +# +# See this wiki page to learn about the fit and fill options. +# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F +crop_mode="normal" + +# Crop offset +# Note: Only affects 'normal' crop mode. +# +# Default: 'center' +# Values: 'northwest', 'north', 'northeast', 'west', 'center' +# 'east', 'southwest', 'south', 'southeast' +# Flag: --crop_offset +crop_offset="center" + +# Image size +# The image is half the terminal width by default. +# +# Default: 'auto' +# Values: 'auto', '00px', '00%', 'none' +# Flags: --image_size +# --size +image_size="auto" + +# Gap between image and text +# +# Default: '3' +# Values: 'num', '-num' +# Flag: --gap +gap=3 + +# Image offsets +# Only works with the w3m backend. +# +# Default: '0' +# Values: 'px' +# Flags: --xoffset +# --yoffset +yoffset=0 +xoffset=0 + +# Image background color +# Only works with the w3m backend. +# +# Default: '' +# Values: 'color', 'blue' +# Flag: --bg_color +background_color= + + +# Scrot Options + + +# Whether or not to always take a screenshot +# You can manually take a screenshot with "--scrot" or "-s" +# +# Default: 'off' +# Values: 'on', 'off' +# Flags: --scrot +# -s +scrot="off" + +# Screenshot Program +# Neofetch will automatically use whatever screenshot tool +# is installed on your system. +# +# If 'neofetch -v' says that it couldn't find a screenshot +# tool or you're using a custom tool then you can change +# the option below to a custom command. +# +# Default: 'auto' +# Values: 'auto' 'cmd -flags' +# Flag: --scrot_cmd +scrot_cmd="auto" + +# Screenshot Filename +# What to name the screenshots +# +# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' +# Values: 'string' +# Flag: --scrot_name +scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" + +# Image upload host +# Where to upload the image. +# +# Default: 'teknik' +# Values: 'imgur', 'teknik' +# Flag: --image_host +# +# NOTE: If you'd like another image host to be added to Neofetch. +# Open an issue on github. +image_host="teknik" + + +# Misc Options + +# Stdout mode +# Turn off all colors and disables image backend (ASCII/Image). +# Useful for piping into another command. +# Default: 'off' +# Values: 'on', 'off' +stdout="off" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="3.4.1-git" +EOM + + # DETECT INFORMATION get_os() { @@ -4290,22 +5073,6 @@ get_full_path() { [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" } -get_default_config() { - if [[ -f "CONFDIR/config.conf" ]]; then - default_config="CONFDIR/config.conf" - - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - default_config="${script_dir%/*}/config/config.conf" - fi - - if source "$default_config"; then - err "Config: Sourced default config. (${default_config})" - else - err "Config: Default config not found, continuing..." - fi -} - get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then @@ -4324,15 +5091,11 @@ get_user_config() { elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - elif [[ -f "CONFDIR/config.conf" ]]; then - cp "CONFDIR/config.conf" "${XDG_CONFIG_HOME}/neofetch" - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - - cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "${config[@]}" > "$config_file" fi source "$config_file" @@ -5060,7 +5823,10 @@ get_args() { main() { cache_uname get_os - get_default_config + + # Load default config. + source /dev/stdin < <(printf "%s\\n" "${config[@]}") + get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro From 836ab52e6a44b7c9b77e1562370faa46124afaaa Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:09:58 +1000 Subject: [PATCH 225/300] general: Removed changes from other branch --- neofetch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/neofetch b/neofetch index 30328a8b..36ff242c 100755 --- a/neofetch +++ b/neofetch @@ -334,16 +334,6 @@ gtk3="on" public_ip_host="http://ident.me" -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - # Disk @@ -1575,18 +1565,6 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" && "$wm" ]]; then - wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" - wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" - wmv="${wmv/$wm ${wm}?/$wm }" - wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/copyright*}" - wmv="${wmv/version }" - wmv="${wmv/©*}" - wmv="${wmv/(c)*}" - wmv="${wmv/ : }" - wm="$wmv" - fi else case "$os" in "Mac OS X") @@ -5474,7 +5452,6 @@ INFO: NOTE: This only supports Linux. - --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -5645,7 +5622,6 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; - "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; From 00c9c0e3d8e420e315e2fbb6503918bc2019d1db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:10:50 +1000 Subject: [PATCH 226/300] docs: update --- neofetch.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 391cb7d6..b0bcd8ac 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -81,9 +81,6 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP -\fB\-\-wm_version\fR on/off -Show/Hide Window Manager version. -.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From 28fe414fb6e65b1956cb2bb1e1824730f0d48722 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:32:59 +1000 Subject: [PATCH 227/300] general: Start inlining ascii. --- neofetch | 1023 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 861 insertions(+), 162 deletions(-) diff --git a/neofetch b/neofetch index 36ff242c..07b053bd 100755 --- a/neofetch +++ b/neofetch @@ -3450,19 +3450,6 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." - - if [[ -d "ASCIIDIR" ]]; then - ascii_dir="ASCIIDIR" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - ascii_dir="${script_dir%/*}/ascii/distro" - fi - - image_source="${ascii_dir}/${ascii_file}" - - # Fallback to no ascii mode if distro ascii isn't found. - [[ ! -f "$image_source" ]] && \ - { to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; } fi # Set locale to get correct padding. @@ -3480,7 +3467,7 @@ get_ascii() { line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" ((++lines)) - done < "$image_source" + done <<< "$ascii_data" # Colors. print="${print//'${c1}'/$c1}" @@ -4159,745 +4146,1457 @@ get_distro_colors() { case "$ascii_distro" in "AIX"*) set_colors 2 7 - ascii_file="aix" + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF ;; "alpine_small") set_colors 4 7 - ascii_file="alpine_small" + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF ;; "Alpine"*) set_colors 4 5 7 6 - ascii_file="alpine" + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF ;; "Amazon"*) set_colors 3 7 - ascii_file="amazon" + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF ;; "Anarchy"*) set_colors 7 4 - ascii_file="anarchy" + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF ;; "Android"*) set_colors 2 7 - ascii_file="android" ascii_length_force=19 + read -rd '' ascii_data <<'EOF' +${c1} ╲ ▁▂▂▂▁ ╱ + ▄███████▄ + ▄██${c2} ${c1}███${c2} ${c1}██▄ + ▄███████████▄ +▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ + █████████████ + ███████████ + ██ ██ + ██ ██ +EOF ;; "Antergos"*) set_colors 4 6 - ascii_file="antergos" + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF ;; "antiX"*) set_colors 1 7 3 - ascii_file="antix" + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF ;; "AOSC"*) set_colors 4 7 1 - ascii_file="aosc" + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF ;; "Apricity"*) set_colors 4 7 1 - ascii_file="apricity" + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF ;; "arch_small") set_colors 6 7 1 - ascii_file="arch_small" + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF ;; "arch_old") set_colors 6 7 1 - ascii_file="arch_old" + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF ;; "ArchBox"*) set_colors 2 7 1 - ascii_file="archbox" + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF ;; "ARCHlabs"*) set_colors 6 6 7 1 - ascii_file="archlabs" + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF ;; *"XFerience"*) set_colors 6 6 7 1 - ascii_file="arch_xferience" + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF ;; "ArchMerge"*) set_colors 6 6 7 1 - ascii_file="archmerge" + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF ;; "Arch"*) set_colors 6 6 7 1 - ascii_file="arch" + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF ;; "Artix"*) set_colors 6 4 2 7 - ascii_file="artix" + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF ;; "Arya"*) set_colors 2 1 - ascii_file="arya" + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF ;; "Bitrig"*) set_colors 2 7 - ascii_file="bitrig" + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF ;; "BLAG"*) set_colors 5 7 - ascii_file="blag" + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; "BlankOn"*) set_colors 1 7 3 - ascii_file="blankon" + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; "BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "BunsenLabs"*) set_colors fg 7 - ascii_file="bunsenlabs" + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; "Calculate"*) set_colors 7 3 - ascii_file="calculate" + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; "CentOS"*) set_colors 3 2 4 5 7 - ascii_file="centos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chakra"*) set_colors 4 5 7 6 - ascii_file="chakra" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ChaletOS"*) set_colors 4 7 1 - ascii_file="chaletos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chapeau"*) set_colors 2 7 - ascii_file="chapeau" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chrom"*) set_colors 2 1 3 4 7 - ascii_file="chrome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Clover"*) set_colors 2 6 - ascii_file="cloveros" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 - ascii_file="coreos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "crux_small") set_colors 4 5 7 6 - ascii_file="crux_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "CRUX"*) set_colors 4 5 7 6 - ascii_file="crux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "debian_small") set_colors 1 7 3 - ascii_file="debian_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Debian"*) set_colors 1 7 3 - ascii_file="debian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Deepin"*) set_colors 2 7 - ascii_file="deepin" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DesaOS") set_colors 2 7 - ascii_file="desaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Devuan"*) set_colors 5 7 - ascii_file="devuan" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DracOS"*) set_colors 1 7 3 - ascii_file="dracos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_old"*) set_colors 1 7 3 - ascii_file="dragonflybsd_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_small"*) set_colors 1 7 3 - ascii_file="dragonflybsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DragonFly"*) set_colors 1 7 3 - ascii_file="dragonflybsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Elementary"*) set_colors 4 7 1 - ascii_file="elementary" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Endless"*) set_colors 1 7 - ascii_file="endless" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Exherbo"*) set_colors 4 7 1 - ascii_file="exherbo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 - ascii_file="fedora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "freebsd_small") set_colors 1 7 3 - ascii_file="freebsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeBSD"*) set_colors 1 7 3 - ascii_file="freebsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeMiNT"*) # Don't explicitly set colors since # TosWin2 doesn't reset well. - ascii_file="gem" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Frugalware"*) set_colors 4 7 1 - ascii_file="frugalware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Funtoo"*) set_colors 5 7 - ascii_file="funtoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GalliumOS"*) set_colors 4 7 1 - ascii_file="galliumos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gentoo_small") set_colors 5 7 - ascii_file="gentoo_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Gentoo"*) set_colors 5 7 - ascii_file="gentoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gNewSense"*) set_colors 4 5 7 6 - ascii_file="gnewsense" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GNU") set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GoboLinux"*) set_colors 5 4 6 2 - ascii_file="gobolinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Grombyang"*) set_colors 4 2 1 - ascii_file="grombyang" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 - ascii_file="guixsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Haiku"*) set_colors 2 8 - ascii_file="haiku" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Hyperbola"*) set_colors 8 - ascii_file="hyperbola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kali"*) set_colors 4 8 - ascii_file="kali" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KaOS"*) set_colors 4 7 1 - ascii_file="kaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KDE"*) set_colors 2 7 - ascii_file="kde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kogaion"*) set_colors 4 7 1 - ascii_file="kogaion" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Korora"*) set_colors 4 7 1 - ascii_file="korora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KSLinux"*) set_colors 4 7 1 - ascii_file="kslinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kubuntu"*) set_colors 4 7 1 - ascii_file="kubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LEDE"*) set_colors 4 7 1 - ascii_file="lede" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LMDE"*) set_colors 2 7 - ascii_file="lmde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lubuntu"*) set_colors 4 7 1 - ascii_file="lubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lunar"*) set_colors 4 7 3 - ascii_file="lunar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 - ascii_file="mac_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mageia"*) set_colors 6 7 - ascii_file="mageia" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MagpieOS"*) set_colors 2 1 3 5 - ascii_file="magpieos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Manjaro"*) set_colors 2 7 - ascii_file="manjaro" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Maui"*) set_colors 6 7 - ascii_file="maui" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mer"*) set_colors 4 7 1 - ascii_file="mer" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Minix"*) set_colors 1 7 3 - ascii_file="minix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux Mint"* | "LinuxMint"*) set_colors 2 7 - ascii_file="mint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MX"*) set_colors 4 6 7 - ascii_file="mx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NetBSD"*) set_colors 5 7 - ascii_file="netbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Netrunner"*) set_colors 4 7 1 - ascii_file="netrunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nitrux"*) set_colors 4 - ascii_file="nitrux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "nixos_small") set_colors 4 6 - ascii_file="nixos_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NixOS"*) set_colors 4 6 - ascii_file="nixos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nurunner"*) set_colors 4 - ascii_file="nurunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NuTyX"*) set_colors 4 1 - ascii_file="nutyx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OBRevenge"*) set_colors 1 7 3 - ascii_file="obrevenge" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openbsd_small") set_colors 3 7 6 1 8 - ascii_file="openbsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 - ascii_file="openbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenIndiana"*) set_colors 4 7 1 - ascii_file="openindiana" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenMandriva"*) set_colors 4 3 - ascii_file="openmandriva" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenWrt"*) set_colors 4 7 1 - ascii_file="openwrt" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 - ascii_file="osmc" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Oracle"*) set_colors 1 7 3 - ascii_file="oracle" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PacBSD"*) set_colors 1 7 3 - ascii_file="pacbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parabola"*) set_colors 5 7 - ascii_file="parabola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pardus"*) set_colors 3 7 6 1 8 - ascii_file="pardus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parrot"*) set_colors 6 7 - ascii_file="parrot" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parsix"*) set_colors 3 1 7 8 - ascii_file="parsix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 - ascii_file="trueos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCLinuxOS"*) set_colors 4 7 1 - ascii_file="pclinuxos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Peppermint"*) set_colors 1 7 3 - ascii_file="peppermint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pop!_OS"*) set_colors 6 7 - ascii_file="pop_os" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Porteus"*) set_colors 6 7 - ascii_file="porteus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PostMarketOS"*) set_colors 2 7 - ascii_file="postmarketos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 - ascii_file="puppy" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Qubes"*) set_colors 4 5 7 6 - ascii_file="qubes" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Raspbian"*) set_colors 2 1 - ascii_file="raspbian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 - ascii_file="redstar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 - ascii_file="redhat" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Refracted Devuan"*) set_colors 8 7 - ascii_file="refracta" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Rosa"*) set_colors 4 7 1 - ascii_file="rosa" + read -rd '' ascii_data <<'EOF' + +EOF ;; "sabotage"*) set_colors 4 7 1 - ascii_file="sabotage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sabayon"*) set_colors 4 7 1 - ascii_file="sabayon" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SailfishOS"*) set_colors 4 5 7 6 - ascii_file="sailfishos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SalentOS"*) set_colors 2 1 3 7 - ascii_file="salentos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Scientific"*) set_colors 4 7 1 - ascii_file="scientific" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Siduction"*) set_colors 4 4 - ascii_file="siduction" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Slackware"*) set_colors 4 7 1 - ascii_file="slackware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SliTaz"*) set_colors 3 3 - ascii_file="slitaz" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SmartOS"*) set_colors 6 7 - ascii_file="smartos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Solus"*) set_colors 4 7 1 - ascii_file="solus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Source Mage"*) set_colors 4 7 1 - ascii_file="source_mage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sparky"*) set_colors 1 7 - ascii_file="sparky" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SteamOS"*) set_colors 5 7 - ascii_file="steamos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SunOS" | "Solaris") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 - ascii_file="tumbleweed" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 - ascii_file="suse" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SwagArch"*) set_colors 4 7 1 - ascii_file="swagarch" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Tails"*) set_colors 5 7 - ascii_file="tails" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Trisquel"*) set_colors 4 6 - ascii_file="trisquel" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 - ascii_file="ubuntu-budgie" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 - ascii_file="ubuntu-gnome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-MATE"*) set_colors 2 7 - ascii_file="ubuntu-mate" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ubuntu_old") set_colors 1 7 3 - ascii_file="ubuntu_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Studio") set_colors 6 7 - ascii_file="ubuntu-studio" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu"*) set_colors 1 7 3 - ascii_file="ubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "void_small") set_colors 2 8 - ascii_file="void_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Void"*) set_colors 2 8 - ascii_file="void" + read -rd '' ascii_data <<'EOF' + +EOF ;; *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 - ascii_file="windows10" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Windows"*) set_colors 1 2 4 3 - ascii_file="windows" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Xubuntu"*) set_colors 4 7 1 - ascii_file="xubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Zorin"*) set_colors 4 6 - ascii_file="zorin" + read -rd '' ascii_data <<'EOF' + +EOF ;; *) From 4e0f7ac2918c8fed4e174ceed8a3130d0359c43b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:39:24 +1000 Subject: [PATCH 228/300] general: Start inlining ascii. --- neofetch | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 435 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index 07b053bd..6e721c7d 100755 --- a/neofetch +++ b/neofetch @@ -4739,14 +4739,49 @@ EOF "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; "Chakra"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; @@ -4767,140 +4802,425 @@ EOF "Chrom"*) set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' - +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; "crux_small") set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ EOF ;; "CRUX"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; "Debian"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${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._ + `""" EOF ;; "Deepin"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; "Devuan"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; "DracOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; "DragonFly"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; "FreeBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; @@ -4908,42 +5228,129 @@ EOF # Don't explicitly set colors since # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; "Frugalware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; "Funtoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; "Gentoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${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}.` + `-//////:--. EOF ;; From 15fb8cdc5941cf3973603d4ffff9a893611c8cf9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:43:28 +1000 Subject: [PATCH 229/300] general: Start inlining ascii. --- neofetch | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 432 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index 6e721c7d..cfc29ca4 100755 --- a/neofetch +++ b/neofetch @@ -5357,189 +5357,595 @@ EOF "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF ;; "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' - +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; EOF ;; "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' - +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF ;; "Grombyang"*) set_colors 4 2 1 read -rd '' ascii_data <<'EOF' - +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` EOF ;; "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} EOF ;; "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' - +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W EOF ;; "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' - +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . EOF ;; "KaOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. EOF ;; "KDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` EOF ;; "Kogaion"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; EOF ;; "Korora"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` EOF ;; "KSLinux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A EOF ;; "Kubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` EOF ;; "LEDE"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ EOF ;; "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' - +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### EOF ;; "LMDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` EOF ;; "Lubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` EOF ;; "Lunar"*) set_colors 4 7 3 read -rd '' ascii_data <<'EOF' - +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF ;; "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. EOF ;; "MagpieOS"*) set_colors 2 1 3 5 read -rd '' ascii_data <<'EOF' - +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. EOF ;; "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; "Mer"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs EOF ;; "Minix"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` EOF ;; From 3dd7b0a7d631ead79773851ecd55b430e1ee1fda Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:48:02 +1000 Subject: [PATCH 230/300] general: Start inlining ascii. --- neofetch | 631 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 599 insertions(+), 32 deletions(-) diff --git a/neofetch b/neofetch index cfc29ca4..909bd098 100755 --- a/neofetch +++ b/neofetch @@ -5952,231 +5952,798 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' - +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; "Netrunner"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; "Nitrux"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; "nixos_small") set_colors 4 6 read -rd '' ascii_data <<'EOF' - + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; "NuTyX"*) set_colors 4 1 read -rd '' ascii_data <<'EOF' - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; "OBRevenge"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; "openbsd_small") set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; "OpenMandriva"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' - +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; "Oracle"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; "Pardus"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; "Parrot"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; "Parsix"*) set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' - + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; "Peppermint"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; "Porteus"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; "Qubes"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' - +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; From 21f76463ab291671faf2e4deb5a0a7eabf1a5689 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:52:59 +1000 Subject: [PATCH 231/300] general: Start inlining ascii. --- neofetch | 609 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 579 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 909bd098..0c0a6aaa 100755 --- a/neofetch +++ b/neofetch @@ -6750,203 +6750,684 @@ EOF "Refracted Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' - +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; "sabotage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; "Sabayon"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; "SalentOS"*) set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; "Scientific"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; "Siduction"*) set_colors 4 4 read -rd '' ascii_data <<'EOF' - +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; "SliTaz"*) set_colors 3 3 read -rd '' ascii_data <<'EOF' - +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; "SmartOS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; "Sparky"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; "SteamOS"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' - +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .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:^' EOF ;; "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; "Trisquel"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; "ubuntu_old") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; "Ubuntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .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+/-. EOF ;; "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; "Void"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; @@ -6954,28 +7435,96 @@ EOF "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; "Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' - +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; From 8b41e513ce0b58e8e6c632ff23e67596302c3f0d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:55:34 +1000 Subject: [PATCH 232/300] general: Start inlining ascii. --- neofetch | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0c0a6aaa..77db76a0 100755 --- a/neofetch +++ b/neofetch @@ -7532,32 +7532,131 @@ EOF case "$kernel_name" in *"BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF ;; "GNU"*) set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF ;; "SunOS") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF ;; "IRIX"*) set_colors 4 7 - ascii_file="irix" + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF ;; esac ;; From 6a7fb8121332b5a93b0c279c07ec58d824f6c72a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:59:37 +1000 Subject: [PATCH 233/300] general: Start inlining ascii. --- neofetch | 62 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 77db76a0..128e23bc 100755 --- a/neofetch +++ b/neofetch @@ -4788,20 +4788,6 @@ EOF "ChaletOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' ${c1} `.//+osso+/:`` `/sdNNmhyssssydmNNdo:` :hNmy+-` .-+hNNs- @@ -4825,6 +4811,54 @@ ${c1} `.//+osso+/:`` EOF ;; + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; + + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 0415cd405e93d20da700d2dfa9c68ad894afafca Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:04:15 +1000 Subject: [PATCH 234/300] general: Remove old files --- ascii/distro/aix | 20 ------------ ascii/distro/alpine | 20 ------------ ascii/distro/alpine_small | 6 ---- ascii/distro/amazon | 19 ----------- ascii/distro/anarchy | 28 ---------------- ascii/distro/android | 13 -------- ascii/distro/antergos | 19 ----------- ascii/distro/antix | 13 -------- ascii/distro/aosc | 20 ------------ ascii/distro/apricity | 18 ----------- ascii/distro/arch | 19 ----------- ascii/distro/arch_old | 16 --------- ascii/distro/arch_small | 7 ---- ascii/distro/arch_xferience | 19 ----------- ascii/distro/archbox | 19 ----------- ascii/distro/archlabs | 21 ------------ ascii/distro/archmerge | 20 ------------ ascii/distro/artix | 19 ----------- ascii/distro/arya | 15 --------- ascii/distro/bitrig | 18 ----------- ascii/distro/blag | 17 ---------- ascii/distro/blankon | 17 ---------- ascii/distro/bsd | 19 ----------- ascii/distro/bunsenlabs | 20 ------------ ascii/distro/calculate | 20 ------------ ascii/distro/centos | 19 ----------- ascii/distro/chakra | 18 ----------- ascii/distro/chaletos | 20 ------------ ascii/distro/chapeau | 18 ----------- ascii/distro/chrome | 18 ----------- ascii/distro/cloveros | 20 ------------ ascii/distro/coreos | 20 ------------ ascii/distro/crux | 18 ----------- ascii/distro/crux_small | 7 ---- ascii/distro/debian | 17 ---------- ascii/distro/debian_small | 6 ---- ascii/distro/deepin | 18 ----------- ascii/distro/desaos | 16 --------- ascii/distro/devuan | 15 --------- ascii/distro/dracos | 13 -------- ascii/distro/dragonflybsd | 15 --------- ascii/distro/dragonflybsd_old | 18 ----------- ascii/distro/dragonflybsd_small | 4 --- ascii/distro/elementary | 17 ---------- ascii/distro/endless | 21 ------------ ascii/distro/exherbo | 22 ------------- ascii/distro/fedora | 17 ---------- ascii/distro/freebsd | 15 --------- ascii/distro/freebsd_small | 7 ---- ascii/distro/frugalware | 23 ------------- ascii/distro/funtoo | 11 ------- ascii/distro/galliumos | 19 ----------- ascii/distro/gem | 15 --------- ascii/distro/gentoo | 18 ----------- ascii/distro/gentoo_small | 7 ---- ascii/distro/gnewsense | 12 ------- ascii/distro/gnu | 18 ----------- ascii/distro/gobolinux | 6 ---- ascii/distro/grombyang | 18 ----------- ascii/distro/guixsd | 10 ------ ascii/distro/haiku | 17 ---------- ascii/distro/hyperbola | 16 --------- ascii/distro/irix | 19 ----------- ascii/distro/kali | 21 ------------ ascii/distro/kaos | 16 --------- ascii/distro/kde | 19 ----------- ascii/distro/kogaion | 20 ------------ ascii/distro/korora | 16 --------- ascii/distro/kslinux | 11 ------- ascii/distro/kubuntu | 20 ------------ ascii/distro/lede | 9 ------ ascii/distro/linux | 12 ------- ascii/distro/lmde | 17 ---------- ascii/distro/lubuntu | 20 ------------ ascii/distro/lunar | 13 -------- ascii/distro/mac | 18 ----------- ascii/distro/mac_small | 8 ----- ascii/distro/mageia | 19 ----------- ascii/distro/magpieos | 20 ------------ ascii/distro/manjaro | 14 -------- ascii/distro/maui | 20 ------------ ascii/distro/mer | 27 ---------------- ascii/distro/minix | 17 ---------- ascii/distro/mint | 16 --------- ascii/distro/mx | 17 ---------- ascii/distro/netbsd | 17 ---------- ascii/distro/netrunner | 20 ------------ ascii/distro/nitrux | 18 ----------- ascii/distro/nixos | 19 ----------- ascii/distro/nixos_small | 7 ---- ascii/distro/nurunner | 19 ----------- ascii/distro/nutyx | 23 ------------- ascii/distro/obrevenge | 18 ----------- ascii/distro/openbsd | 23 ------------- ascii/distro/openbsd_small | 7 ---- ascii/distro/openindiana | 16 --------- ascii/distro/openmandriva | 15 --------- ascii/distro/openwrt | 9 ------ ascii/distro/oracle | 12 ------- ascii/distro/osmc | 20 ------------ ascii/distro/pacbsd | 24 -------------- ascii/distro/parabola | 16 --------- ascii/distro/pardus | 18 ----------- ascii/distro/parrot | 24 -------------- ascii/distro/parsix | 21 ------------ ascii/distro/pclinuxos | 19 ----------- ascii/distro/peppermint | 19 ----------- ascii/distro/pop_os | 21 ------------ ascii/distro/porteus | 23 ------------- ascii/distro/postmarketos | 17 ---------- ascii/distro/puppy | 18 ----------- ascii/distro/qubes | 21 ------------ ascii/distro/raspbian | 23 ------------- ascii/distro/redhat | 16 --------- ascii/distro/redstar | 18 ----------- ascii/distro/refracta | 19 ----------- ascii/distro/rosa | 20 ------------ ascii/distro/sabayon | 18 ----------- ascii/distro/sabotage | 12 ------- ascii/distro/sailfishos | 18 ----------- ascii/distro/salentos | 20 ------------ ascii/distro/scientific | 20 ------------ ascii/distro/siduction | 21 ------------ ascii/distro/slackware | 21 ------------ ascii/distro/slitaz | 17 ---------- ascii/distro/smartos | 17 ---------- ascii/distro/solaris | 8 ----- ascii/distro/solus | 20 ------------ ascii/distro/source_mage | 21 ------------ ascii/distro/sparky | 21 ------------ ascii/distro/steamos | 18 ----------- ascii/distro/suse | 18 ----------- ascii/distro/swagarch | 15 --------- ascii/distro/tails | 19 ----------- ascii/distro/trisquel | 18 ----------- ascii/distro/trueos | 27 ---------------- ascii/distro/tumbleweed | 13 -------- ascii/distro/ubuntu | 20 ------------ ascii/distro/ubuntu-budgie | 20 ------------ ascii/distro/ubuntu-gnome | 16 --------- ascii/distro/ubuntu-mate | 20 ------------ ascii/distro/ubuntu-studio | 20 ------------ ascii/distro/ubuntu_old | 19 ----------- ascii/distro/void | 18 ----------- ascii/distro/void_small | 7 ---- ascii/distro/windows | 16 --------- ascii/distro/windows10 | 19 ----------- ascii/distro/xubuntu | 20 ------------ ascii/distro/zorin | 17 ---------- config/travis.conf | 55 ------------------------------- neofetch | 57 +++++++++++++++++++++++++++++++++ 151 files changed, 57 insertions(+), 2609 deletions(-) delete mode 100644 ascii/distro/aix delete mode 100644 ascii/distro/alpine delete mode 100644 ascii/distro/alpine_small delete mode 100644 ascii/distro/amazon delete mode 100644 ascii/distro/anarchy delete mode 100644 ascii/distro/android delete mode 100644 ascii/distro/antergos delete mode 100644 ascii/distro/antix delete mode 100644 ascii/distro/aosc delete mode 100644 ascii/distro/apricity delete mode 100644 ascii/distro/arch delete mode 100644 ascii/distro/arch_old delete mode 100644 ascii/distro/arch_small delete mode 100644 ascii/distro/arch_xferience delete mode 100644 ascii/distro/archbox delete mode 100644 ascii/distro/archlabs delete mode 100644 ascii/distro/archmerge delete mode 100644 ascii/distro/artix delete mode 100644 ascii/distro/arya delete mode 100644 ascii/distro/bitrig delete mode 100644 ascii/distro/blag delete mode 100644 ascii/distro/blankon delete mode 100644 ascii/distro/bsd delete mode 100644 ascii/distro/bunsenlabs delete mode 100644 ascii/distro/calculate delete mode 100644 ascii/distro/centos delete mode 100644 ascii/distro/chakra delete mode 100644 ascii/distro/chaletos delete mode 100644 ascii/distro/chapeau delete mode 100644 ascii/distro/chrome delete mode 100644 ascii/distro/cloveros delete mode 100644 ascii/distro/coreos delete mode 100644 ascii/distro/crux delete mode 100644 ascii/distro/crux_small delete mode 100644 ascii/distro/debian delete mode 100644 ascii/distro/debian_small delete mode 100644 ascii/distro/deepin delete mode 100644 ascii/distro/desaos delete mode 100644 ascii/distro/devuan delete mode 100644 ascii/distro/dracos delete mode 100644 ascii/distro/dragonflybsd delete mode 100644 ascii/distro/dragonflybsd_old delete mode 100644 ascii/distro/dragonflybsd_small delete mode 100644 ascii/distro/elementary delete mode 100644 ascii/distro/endless delete mode 100644 ascii/distro/exherbo delete mode 100644 ascii/distro/fedora delete mode 100644 ascii/distro/freebsd delete mode 100644 ascii/distro/freebsd_small delete mode 100644 ascii/distro/frugalware delete mode 100644 ascii/distro/funtoo delete mode 100644 ascii/distro/galliumos delete mode 100644 ascii/distro/gem delete mode 100644 ascii/distro/gentoo delete mode 100644 ascii/distro/gentoo_small delete mode 100644 ascii/distro/gnewsense delete mode 100644 ascii/distro/gnu delete mode 100644 ascii/distro/gobolinux delete mode 100644 ascii/distro/grombyang delete mode 100644 ascii/distro/guixsd delete mode 100644 ascii/distro/haiku delete mode 100644 ascii/distro/hyperbola delete mode 100644 ascii/distro/irix delete mode 100644 ascii/distro/kali delete mode 100644 ascii/distro/kaos delete mode 100644 ascii/distro/kde delete mode 100644 ascii/distro/kogaion delete mode 100644 ascii/distro/korora delete mode 100644 ascii/distro/kslinux delete mode 100644 ascii/distro/kubuntu delete mode 100644 ascii/distro/lede delete mode 100644 ascii/distro/linux delete mode 100644 ascii/distro/lmde delete mode 100644 ascii/distro/lubuntu delete mode 100644 ascii/distro/lunar delete mode 100644 ascii/distro/mac delete mode 100644 ascii/distro/mac_small delete mode 100644 ascii/distro/mageia delete mode 100644 ascii/distro/magpieos delete mode 100644 ascii/distro/manjaro delete mode 100644 ascii/distro/maui delete mode 100644 ascii/distro/mer delete mode 100644 ascii/distro/minix delete mode 100644 ascii/distro/mint delete mode 100644 ascii/distro/mx delete mode 100644 ascii/distro/netbsd delete mode 100644 ascii/distro/netrunner delete mode 100644 ascii/distro/nitrux delete mode 100644 ascii/distro/nixos delete mode 100644 ascii/distro/nixos_small delete mode 100644 ascii/distro/nurunner delete mode 100644 ascii/distro/nutyx delete mode 100644 ascii/distro/obrevenge delete mode 100644 ascii/distro/openbsd delete mode 100644 ascii/distro/openbsd_small delete mode 100644 ascii/distro/openindiana delete mode 100644 ascii/distro/openmandriva delete mode 100644 ascii/distro/openwrt delete mode 100644 ascii/distro/oracle delete mode 100644 ascii/distro/osmc delete mode 100644 ascii/distro/pacbsd delete mode 100644 ascii/distro/parabola delete mode 100644 ascii/distro/pardus delete mode 100644 ascii/distro/parrot delete mode 100644 ascii/distro/parsix delete mode 100644 ascii/distro/pclinuxos delete mode 100644 ascii/distro/peppermint delete mode 100644 ascii/distro/pop_os delete mode 100644 ascii/distro/porteus delete mode 100644 ascii/distro/postmarketos delete mode 100644 ascii/distro/puppy delete mode 100644 ascii/distro/qubes delete mode 100644 ascii/distro/raspbian delete mode 100644 ascii/distro/redhat delete mode 100644 ascii/distro/redstar delete mode 100644 ascii/distro/refracta delete mode 100644 ascii/distro/rosa delete mode 100644 ascii/distro/sabayon delete mode 100644 ascii/distro/sabotage delete mode 100644 ascii/distro/sailfishos delete mode 100644 ascii/distro/salentos delete mode 100644 ascii/distro/scientific delete mode 100644 ascii/distro/siduction delete mode 100644 ascii/distro/slackware delete mode 100644 ascii/distro/slitaz delete mode 100644 ascii/distro/smartos delete mode 100644 ascii/distro/solaris delete mode 100644 ascii/distro/solus delete mode 100644 ascii/distro/source_mage delete mode 100644 ascii/distro/sparky delete mode 100644 ascii/distro/steamos delete mode 100644 ascii/distro/suse delete mode 100644 ascii/distro/swagarch delete mode 100644 ascii/distro/tails delete mode 100644 ascii/distro/trisquel delete mode 100644 ascii/distro/trueos delete mode 100644 ascii/distro/tumbleweed delete mode 100644 ascii/distro/ubuntu delete mode 100644 ascii/distro/ubuntu-budgie delete mode 100644 ascii/distro/ubuntu-gnome delete mode 100644 ascii/distro/ubuntu-mate delete mode 100644 ascii/distro/ubuntu-studio delete mode 100644 ascii/distro/ubuntu_old delete mode 100644 ascii/distro/void delete mode 100644 ascii/distro/void_small delete mode 100644 ascii/distro/windows delete mode 100644 ascii/distro/windows10 delete mode 100644 ascii/distro/xubuntu delete mode 100644 ascii/distro/zorin delete mode 100644 config/travis.conf diff --git a/ascii/distro/aix b/ascii/distro/aix deleted file mode 100644 index 8526b7c6..00000000 --- a/ascii/distro/aix +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- diff --git a/ascii/distro/alpine b/ascii/distro/alpine deleted file mode 100644 index 8f9b8771..00000000 --- a/ascii/distro/alpine +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. diff --git a/ascii/distro/alpine_small b/ascii/distro/alpine_small deleted file mode 100644 index 9949011c..00000000 --- a/ascii/distro/alpine_small +++ /dev/null @@ -1,6 +0,0 @@ -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ diff --git a/ascii/distro/amazon b/ascii/distro/amazon deleted file mode 100644 index 050c5b3a..00000000 --- a/ascii/distro/amazon +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy deleted file mode 100644 index d0f5a140..00000000 --- a/ascii/distro/anarchy +++ /dev/null @@ -1,28 +0,0 @@ - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/android b/ascii/distro/android deleted file mode 100644 index 17e7ff30..00000000 --- a/ascii/distro/android +++ /dev/null @@ -1,13 +0,0 @@ -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ diff --git a/ascii/distro/antergos b/ascii/distro/antergos deleted file mode 100644 index 023af9bd..00000000 --- a/ascii/distro/antergos +++ /dev/null @@ -1,19 +0,0 @@ -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/antix b/ascii/distro/antix deleted file mode 100644 index c383774e..00000000 --- a/ascii/distro/antix +++ /dev/null @@ -1,13 +0,0 @@ -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' diff --git a/ascii/distro/aosc b/ascii/distro/aosc deleted file mode 100644 index 785ba7d9..00000000 --- a/ascii/distro/aosc +++ /dev/null @@ -1,20 +0,0 @@ -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. diff --git a/ascii/distro/apricity b/ascii/distro/apricity deleted file mode 100644 index eada9d6d..00000000 --- a/ascii/distro/apricity +++ /dev/null @@ -1,18 +0,0 @@ -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` diff --git a/ascii/distro/arch b/ascii/distro/arch deleted file mode 100644 index 3de103bb..00000000 --- a/ascii/distro/arch +++ /dev/null @@ -1,19 +0,0 @@ -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ diff --git a/ascii/distro/arch_old b/ascii/distro/arch_old deleted file mode 100644 index dbd6cefa..00000000 --- a/ascii/distro/arch_old +++ /dev/null @@ -1,16 +0,0 @@ -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! diff --git a/ascii/distro/arch_small b/ascii/distro/arch_small deleted file mode 100644 index 26757617..00000000 --- a/ascii/distro/arch_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ diff --git a/ascii/distro/arch_xferience b/ascii/distro/arch_xferience deleted file mode 100644 index f1757f92..00000000 --- a/ascii/distro/arch_xferience +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` diff --git a/ascii/distro/archbox b/ascii/distro/archbox deleted file mode 100644 index a35a15c6..00000000 --- a/ascii/distro/archbox +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs deleted file mode 100644 index 74f8a026..00000000 --- a/ascii/distro/archlabs +++ /dev/null @@ -1,21 +0,0 @@ -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge deleted file mode 100644 index c849851e..00000000 --- a/ascii/distro/archmerge +++ /dev/null @@ -1,20 +0,0 @@ -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. diff --git a/ascii/distro/artix b/ascii/distro/artix deleted file mode 100644 index 3ac30d3d..00000000 --- a/ascii/distro/artix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... diff --git a/ascii/distro/arya b/ascii/distro/arya deleted file mode 100644 index 7d603e20..00000000 --- a/ascii/distro/arya +++ /dev/null @@ -1,15 +0,0 @@ -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy diff --git a/ascii/distro/bitrig b/ascii/distro/bitrig deleted file mode 100644 index 8daebf5f..00000000 --- a/ascii/distro/bitrig +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms - diff --git a/ascii/distro/blag b/ascii/distro/blag deleted file mode 100644 index 047444cc..00000000 --- a/ascii/distro/blag +++ /dev/null @@ -1,17 +0,0 @@ -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: diff --git a/ascii/distro/blankon b/ascii/distro/blankon deleted file mode 100644 index 43bbd786..00000000 --- a/ascii/distro/blankon +++ /dev/null @@ -1,17 +0,0 @@ -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. diff --git a/ascii/distro/bsd b/ascii/distro/bsd deleted file mode 100644 index 91c9a7ae..00000000 --- a/ascii/distro/bsd +++ /dev/null @@ -1,19 +0,0 @@ -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) diff --git a/ascii/distro/bunsenlabs b/ascii/distro/bunsenlabs deleted file mode 100644 index 93796823..00000000 --- a/ascii/distro/bunsenlabs +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ diff --git a/ascii/distro/calculate b/ascii/distro/calculate deleted file mode 100644 index a6b256c4..00000000 --- a/ascii/distro/calculate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/centos b/ascii/distro/centos deleted file mode 100644 index e56aa5dd..00000000 --- a/ascii/distro/centos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' diff --git a/ascii/distro/chakra b/ascii/distro/chakra deleted file mode 100644 index 28227b92..00000000 --- a/ascii/distro/chakra +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" diff --git a/ascii/distro/chaletos b/ascii/distro/chaletos deleted file mode 100644 index 6473a5cc..00000000 --- a/ascii/distro/chaletos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` diff --git a/ascii/distro/chapeau b/ascii/distro/chapeau deleted file mode 100644 index 6107817c..00000000 --- a/ascii/distro/chapeau +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- diff --git a/ascii/distro/chrome b/ascii/distro/chrome deleted file mode 100644 index 951bf190..00000000 --- a/ascii/distro/chrome +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. diff --git a/ascii/distro/cloveros b/ascii/distro/cloveros deleted file mode 100644 index 9996c77c..00000000 --- a/ascii/distro/cloveros +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` diff --git a/ascii/distro/coreos b/ascii/distro/coreos deleted file mode 100644 index 605d5050..00000000 --- a/ascii/distro/coreos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... diff --git a/ascii/distro/crux b/ascii/distro/crux deleted file mode 100644 index b5af7baa..00000000 --- a/ascii/distro/crux +++ /dev/null @@ -1,18 +0,0 @@ -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo diff --git a/ascii/distro/crux_small b/ascii/distro/crux_small deleted file mode 100644 index 4b64001d..00000000 --- a/ascii/distro/crux_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ diff --git a/ascii/distro/debian b/ascii/distro/debian deleted file mode 100644 index df88d079..00000000 --- a/ascii/distro/debian +++ /dev/null @@ -1,17 +0,0 @@ -${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/ascii/distro/debian_small b/ascii/distro/debian_small deleted file mode 100644 index 64cbb56c..00000000 --- a/ascii/distro/debian_small +++ /dev/null @@ -1,6 +0,0 @@ - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ diff --git a/ascii/distro/deepin b/ascii/distro/deepin deleted file mode 100644 index a44f4dad..00000000 --- a/ascii/distro/deepin +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. diff --git a/ascii/distro/desaos b/ascii/distro/desaos deleted file mode 100644 index 81d8b55e..00000000 --- a/ascii/distro/desaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ diff --git a/ascii/distro/devuan b/ascii/distro/devuan deleted file mode 100644 index 4173782f..00000000 --- a/ascii/distro/devuan +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` diff --git a/ascii/distro/dracos b/ascii/distro/dracos deleted file mode 100644 index 3eb2a70b..00000000 --- a/ascii/distro/dracos +++ /dev/null @@ -1,13 +0,0 @@ -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd deleted file mode 100644 index 7ccc14bc..00000000 --- a/ascii/distro/dragonflybsd +++ /dev/null @@ -1,15 +0,0 @@ -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old deleted file mode 100644 index 3276d4f0..00000000 --- a/ascii/distro/dragonflybsd_old +++ /dev/null @@ -1,18 +0,0 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small deleted file mode 100644 index 3a48a925..00000000 --- a/ascii/distro/dragonflybsd_small +++ /dev/null @@ -1,4 +0,0 @@ -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | diff --git a/ascii/distro/elementary b/ascii/distro/elementary deleted file mode 100644 index 8614c746..00000000 --- a/ascii/distro/elementary +++ /dev/null @@ -1,17 +0,0 @@ -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/endless b/ascii/distro/endless deleted file mode 100644 index fbff54b9..00000000 --- a/ascii/distro/endless +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` - diff --git a/ascii/distro/exherbo b/ascii/distro/exherbo deleted file mode 100644 index edacf81a..00000000 --- a/ascii/distro/exherbo +++ /dev/null @@ -1,22 +0,0 @@ -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' diff --git a/ascii/distro/fedora b/ascii/distro/fedora deleted file mode 100644 index f0ba391b..00000000 --- a/ascii/distro/fedora +++ /dev/null @@ -1,17 +0,0 @@ -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// diff --git a/ascii/distro/freebsd b/ascii/distro/freebsd deleted file mode 100644 index 6ef67782..00000000 --- a/ascii/distro/freebsd +++ /dev/null @@ -1,15 +0,0 @@ - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. diff --git a/ascii/distro/freebsd_small b/ascii/distro/freebsd_small deleted file mode 100644 index 943c147e..00000000 --- a/ascii/distro/freebsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- diff --git a/ascii/distro/frugalware b/ascii/distro/frugalware deleted file mode 100644 index b11961ba..00000000 --- a/ascii/distro/frugalware +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` diff --git a/ascii/distro/funtoo b/ascii/distro/funtoo deleted file mode 100644 index 13079091..00000000 --- a/ascii/distro/funtoo +++ /dev/null @@ -1,11 +0,0 @@ -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ diff --git a/ascii/distro/galliumos b/ascii/distro/galliumos deleted file mode 100644 index ae9681d5..00000000 --- a/ascii/distro/galliumos +++ /dev/null @@ -1,19 +0,0 @@ -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: diff --git a/ascii/distro/gem b/ascii/distro/gem deleted file mode 100644 index 49c8849d..00000000 --- a/ascii/distro/gem +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## diff --git a/ascii/distro/gentoo b/ascii/distro/gentoo deleted file mode 100644 index 3bec6daa..00000000 --- a/ascii/distro/gentoo +++ /dev/null @@ -1,18 +0,0 @@ -${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/ascii/distro/gentoo_small b/ascii/distro/gentoo_small deleted file mode 100644 index a1e7a0ba..00000000 --- a/ascii/distro/gentoo_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- diff --git a/ascii/distro/gnewsense b/ascii/distro/gnewsense deleted file mode 100644 index b98b859b..00000000 --- a/ascii/distro/gnewsense +++ /dev/null @@ -1,12 +0,0 @@ -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' diff --git a/ascii/distro/gnu b/ascii/distro/gnu deleted file mode 100644 index e4b4c017..00000000 --- a/ascii/distro/gnu +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; diff --git a/ascii/distro/gobolinux b/ascii/distro/gobolinux deleted file mode 100644 index 443cfbca..00000000 --- a/ascii/distro/gobolinux +++ /dev/null @@ -1,6 +0,0 @@ -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ diff --git a/ascii/distro/grombyang b/ascii/distro/grombyang deleted file mode 100644 index 6dfbea9b..00000000 --- a/ascii/distro/grombyang +++ /dev/null @@ -1,18 +0,0 @@ -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/guixsd b/ascii/distro/guixsd deleted file mode 100644 index 6d6345ec..00000000 --- a/ascii/distro/guixsd +++ /dev/null @@ -1,10 +0,0 @@ -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` diff --git a/ascii/distro/haiku b/ascii/distro/haiku deleted file mode 100644 index 56a7feb4..00000000 --- a/ascii/distro/haiku +++ /dev/null @@ -1,17 +0,0 @@ -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola deleted file mode 100644 index 5e013359..00000000 --- a/ascii/distro/hyperbola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W diff --git a/ascii/distro/irix b/ascii/distro/irix deleted file mode 100644 index 57ce2121..00000000 --- a/ascii/distro/irix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. diff --git a/ascii/distro/kali b/ascii/distro/kali deleted file mode 100644 index d1e01da6..00000000 --- a/ascii/distro/kali +++ /dev/null @@ -1,21 +0,0 @@ -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . diff --git a/ascii/distro/kaos b/ascii/distro/kaos deleted file mode 100644 index 830835e4..00000000 --- a/ascii/distro/kaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. diff --git a/ascii/distro/kde b/ascii/distro/kde deleted file mode 100644 index 16809700..00000000 --- a/ascii/distro/kde +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` diff --git a/ascii/distro/kogaion b/ascii/distro/kogaion deleted file mode 100644 index 47ed962e..00000000 --- a/ascii/distro/kogaion +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; diff --git a/ascii/distro/korora b/ascii/distro/korora deleted file mode 100644 index 709289af..00000000 --- a/ascii/distro/korora +++ /dev/null @@ -1,16 +0,0 @@ -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` diff --git a/ascii/distro/kslinux b/ascii/distro/kslinux deleted file mode 100644 index 53385bd8..00000000 --- a/ascii/distro/kslinux +++ /dev/null @@ -1,11 +0,0 @@ -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo - -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu deleted file mode 100644 index 6302ff0f..00000000 --- a/ascii/distro/kubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` diff --git a/ascii/distro/lede b/ascii/distro/lede deleted file mode 100644 index b1af9495..00000000 --- a/ascii/distro/lede +++ /dev/null @@ -1,9 +0,0 @@ - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ diff --git a/ascii/distro/linux b/ascii/distro/linux deleted file mode 100644 index f31dd29f..00000000 --- a/ascii/distro/linux +++ /dev/null @@ -1,12 +0,0 @@ -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### diff --git a/ascii/distro/lmde b/ascii/distro/lmde deleted file mode 100644 index 5161881e..00000000 --- a/ascii/distro/lmde +++ /dev/null @@ -1,17 +0,0 @@ - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` diff --git a/ascii/distro/lubuntu b/ascii/distro/lubuntu deleted file mode 100644 index 9731cb3e..00000000 --- a/ascii/distro/lubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` diff --git a/ascii/distro/lunar b/ascii/distro/lunar deleted file mode 100644 index 26bd295c..00000000 --- a/ascii/distro/lunar +++ /dev/null @@ -1,13 +0,0 @@ -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| diff --git a/ascii/distro/mac b/ascii/distro/mac deleted file mode 100644 index 3ca5ea31..00000000 --- a/ascii/distro/mac +++ /dev/null @@ -1,18 +0,0 @@ -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. - diff --git a/ascii/distro/mac_small b/ascii/distro/mac_small deleted file mode 100644 index 24852ff1..00000000 --- a/ascii/distro/mac_small +++ /dev/null @@ -1,8 +0,0 @@ -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' diff --git a/ascii/distro/mageia b/ascii/distro/mageia deleted file mode 100644 index af01caba..00000000 --- a/ascii/distro/mageia +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos deleted file mode 100644 index 6859d96b..00000000 --- a/ascii/distro/magpieos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. diff --git a/ascii/distro/manjaro b/ascii/distro/manjaro deleted file mode 100644 index 89fa7a2f..00000000 --- a/ascii/distro/manjaro +++ /dev/null @@ -1,14 +0,0 @@ -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ diff --git a/ascii/distro/maui b/ascii/distro/maui deleted file mode 100644 index 1ab9c07d..00000000 --- a/ascii/distro/maui +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` diff --git a/ascii/distro/mer b/ascii/distro/mer deleted file mode 100644 index a98f3eb1..00000000 --- a/ascii/distro/mer +++ /dev/null @@ -1,27 +0,0 @@ -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs diff --git a/ascii/distro/minix b/ascii/distro/minix deleted file mode 100644 index a0ff143c..00000000 --- a/ascii/distro/minix +++ /dev/null @@ -1,17 +0,0 @@ -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` diff --git a/ascii/distro/mint b/ascii/distro/mint deleted file mode 100644 index c7e59d99..00000000 --- a/ascii/distro/mint +++ /dev/null @@ -1,16 +0,0 @@ -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/mx b/ascii/distro/mx deleted file mode 100644 index 9fc44075..00000000 --- a/ascii/distro/mx +++ /dev/null @@ -1,17 +0,0 @@ -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/netbsd b/ascii/distro/netbsd deleted file mode 100644 index 6048ee3a..00000000 --- a/ascii/distro/netbsd +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms diff --git a/ascii/distro/netrunner b/ascii/distro/netrunner deleted file mode 100644 index 4230bc09..00000000 --- a/ascii/distro/netrunner +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` diff --git a/ascii/distro/nitrux b/ascii/distro/nitrux deleted file mode 100644 index 2f49d638..00000000 --- a/ascii/distro/nitrux +++ /dev/null @@ -1,18 +0,0 @@ -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- diff --git a/ascii/distro/nixos b/ascii/distro/nixos deleted file mode 100644 index d1a35bd2..00000000 --- a/ascii/distro/nixos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. diff --git a/ascii/distro/nixos_small b/ascii/distro/nixos_small deleted file mode 100644 index 0917ff8e..00000000 --- a/ascii/distro/nixos_small +++ /dev/null @@ -1,7 +0,0 @@ - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ diff --git a/ascii/distro/nurunner b/ascii/distro/nurunner deleted file mode 100644 index e5529673..00000000 --- a/ascii/distro/nurunner +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx deleted file mode 100644 index 84a6cc5a..00000000 --- a/ascii/distro/nutyx +++ /dev/null @@ -1,23 +0,0 @@ -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . \ No newline at end of file diff --git a/ascii/distro/obrevenge b/ascii/distro/obrevenge deleted file mode 100644 index 87b50f40..00000000 --- a/ascii/distro/obrevenge +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll diff --git a/ascii/distro/openbsd b/ascii/distro/openbsd deleted file mode 100644 index d3812019..00000000 --- a/ascii/distro/openbsd +++ /dev/null @@ -1,23 +0,0 @@ - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ diff --git a/ascii/distro/openbsd_small b/ascii/distro/openbsd_small deleted file mode 100644 index bb6e646a..00000000 --- a/ascii/distro/openbsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ diff --git a/ascii/distro/openindiana b/ascii/distro/openindiana deleted file mode 100644 index c76d8f7b..00000000 --- a/ascii/distro/openindiana +++ /dev/null @@ -1,16 +0,0 @@ -${c2} .sy/ - .yh+ - - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` diff --git a/ascii/distro/openmandriva b/ascii/distro/openmandriva deleted file mode 100644 index ef3e8439..00000000 --- a/ascii/distro/openmandriva +++ /dev/null @@ -1,15 +0,0 @@ -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` diff --git a/ascii/distro/openwrt b/ascii/distro/openwrt deleted file mode 100644 index 903068b0..00000000 --- a/ascii/distro/openwrt +++ /dev/null @@ -1,9 +0,0 @@ -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| diff --git a/ascii/distro/oracle b/ascii/distro/oracle deleted file mode 100644 index cdd61c55..00000000 --- a/ascii/distro/oracle +++ /dev/null @@ -1,12 +0,0 @@ -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` diff --git a/ascii/distro/osmc b/ascii/distro/osmc deleted file mode 100644 index f18c2e99..00000000 --- a/ascii/distro/osmc +++ /dev/null @@ -1,20 +0,0 @@ -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd deleted file mode 100644 index 000e93a0..00000000 --- a/ascii/distro/pacbsd +++ /dev/null @@ -1,24 +0,0 @@ -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. diff --git a/ascii/distro/parabola b/ascii/distro/parabola deleted file mode 100644 index 33c38bd5..00000000 --- a/ascii/distro/parabola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. diff --git a/ascii/distro/pardus b/ascii/distro/pardus deleted file mode 100644 index ae817579..00000000 --- a/ascii/distro/pardus +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- diff --git a/ascii/distro/parrot b/ascii/distro/parrot deleted file mode 100644 index af98994d..00000000 --- a/ascii/distro/parrot +++ /dev/null @@ -1,24 +0,0 @@ -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - diff --git a/ascii/distro/parsix b/ascii/distro/parsix deleted file mode 100644 index 2753a461..00000000 --- a/ascii/distro/parsix +++ /dev/null @@ -1,21 +0,0 @@ - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` diff --git a/ascii/distro/pclinuxos b/ascii/distro/pclinuxos deleted file mode 100644 index 963d3929..00000000 --- a/ascii/distro/pclinuxos +++ /dev/null @@ -1,19 +0,0 @@ - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN diff --git a/ascii/distro/peppermint b/ascii/distro/peppermint deleted file mode 100644 index be0a953b..00000000 --- a/ascii/distro/peppermint +++ /dev/null @@ -1,19 +0,0 @@ -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os deleted file mode 100644 index a399f18f..00000000 --- a/ascii/distro/pop_os +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// - diff --git a/ascii/distro/porteus b/ascii/distro/porteus deleted file mode 100644 index 82cc7aa9..00000000 --- a/ascii/distro/porteus +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos deleted file mode 100644 index a2ebc838..00000000 --- a/ascii/distro/postmarketos +++ /dev/null @@ -1,17 +0,0 @@ -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/ascii/distro/puppy b/ascii/distro/puppy deleted file mode 100644 index 7cdc1c2d..00000000 --- a/ascii/distro/puppy +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. diff --git a/ascii/distro/qubes b/ascii/distro/qubes deleted file mode 100644 index 3867fa6f..00000000 --- a/ascii/distro/qubes +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. diff --git a/ascii/distro/raspbian b/ascii/distro/raspbian deleted file mode 100644 index 472b74eb..00000000 --- a/ascii/distro/raspbian +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` diff --git a/ascii/distro/redhat b/ascii/distro/redhat deleted file mode 100644 index 868521f4..00000000 --- a/ascii/distro/redhat +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM diff --git a/ascii/distro/redstar b/ascii/distro/redstar deleted file mode 100644 index 6c15233f..00000000 --- a/ascii/distro/redstar +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... diff --git a/ascii/distro/refracta b/ascii/distro/refracta deleted file mode 100644 index 396474b5..00000000 --- a/ascii/distro/refracta +++ /dev/null @@ -1,19 +0,0 @@ -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ - diff --git a/ascii/distro/rosa b/ascii/distro/rosa deleted file mode 100644 index fcbad876..00000000 --- a/ascii/distro/rosa +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR diff --git a/ascii/distro/sabayon b/ascii/distro/sabayon deleted file mode 100644 index bfd51eed..00000000 --- a/ascii/distro/sabayon +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... diff --git a/ascii/distro/sabotage b/ascii/distro/sabotage deleted file mode 100644 index d4490fc8..00000000 --- a/ascii/distro/sabotage +++ /dev/null @@ -1,12 +0,0 @@ - -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| diff --git a/ascii/distro/sailfishos b/ascii/distro/sailfishos deleted file mode 100644 index a7dd91b4..00000000 --- a/ascii/distro/sailfishos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e diff --git a/ascii/distro/salentos b/ascii/distro/salentos deleted file mode 100644 index f41ee747..00000000 --- a/ascii/distro/salentos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. diff --git a/ascii/distro/scientific b/ascii/distro/scientific deleted file mode 100644 index 82e9553f..00000000 --- a/ascii/distro/scientific +++ /dev/null @@ -1,20 +0,0 @@ -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' diff --git a/ascii/distro/siduction b/ascii/distro/siduction deleted file mode 100644 index c9720a60..00000000 --- a/ascii/distro/siduction +++ /dev/null @@ -1,21 +0,0 @@ -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" - diff --git a/ascii/distro/slackware b/ascii/distro/slackware deleted file mode 100644 index 9ffde3dc..00000000 --- a/ascii/distro/slackware +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: diff --git a/ascii/distro/slitaz b/ascii/distro/slitaz deleted file mode 100644 index 5ee52706..00000000 --- a/ascii/distro/slitaz +++ /dev/null @@ -1,17 +0,0 @@ -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ diff --git a/ascii/distro/smartos b/ascii/distro/smartos deleted file mode 100644 index 59cea693..00000000 --- a/ascii/distro/smartos +++ /dev/null @@ -1,17 +0,0 @@ -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/ascii/distro/solaris b/ascii/distro/solaris deleted file mode 100644 index 95a7f1a1..00000000 --- a/ascii/distro/solaris +++ /dev/null @@ -1,8 +0,0 @@ -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. diff --git a/ascii/distro/solus b/ascii/distro/solus deleted file mode 100644 index 75637543..00000000 --- a/ascii/distro/solus +++ /dev/null @@ -1,20 +0,0 @@ -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` diff --git a/ascii/distro/source_mage b/ascii/distro/source_mage deleted file mode 100644 index 39a440e8..00000000 --- a/ascii/distro/source_mage +++ /dev/null @@ -1,21 +0,0 @@ -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. diff --git a/ascii/distro/sparky b/ascii/distro/sparky deleted file mode 100644 index 82acb5a0..00000000 --- a/ascii/distro/sparky +++ /dev/null @@ -1,21 +0,0 @@ -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` diff --git a/ascii/distro/steamos b/ascii/distro/steamos deleted file mode 100644 index c17b16b6..00000000 --- a/ascii/distro/steamos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' diff --git a/ascii/distro/suse b/ascii/distro/suse deleted file mode 100644 index 6cc0433c..00000000 --- a/ascii/distro/suse +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .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:^' diff --git a/ascii/distro/swagarch b/ascii/distro/swagarch deleted file mode 100644 index e3884f15..00000000 --- a/ascii/distro/swagarch +++ /dev/null @@ -1,15 +0,0 @@ -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' diff --git a/ascii/distro/tails b/ascii/distro/tails deleted file mode 100644 index a0512bc6..00000000 --- a/ascii/distro/tails +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` diff --git a/ascii/distro/trisquel b/ascii/distro/trisquel deleted file mode 100644 index 07634b83..00000000 --- a/ascii/distro/trisquel +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ diff --git a/ascii/distro/trueos b/ascii/distro/trueos deleted file mode 100644 index 84bc618a..00000000 --- a/ascii/distro/trueos +++ /dev/null @@ -1,27 +0,0 @@ -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed deleted file mode 100644 index 37ee33ad..00000000 --- a/ascii/distro/tumbleweed +++ /dev/null @@ -1,13 +0,0 @@ -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, diff --git a/ascii/distro/ubuntu b/ascii/distro/ubuntu deleted file mode 100644 index db5df090..00000000 --- a/ascii/distro/ubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .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+/-. diff --git a/ascii/distro/ubuntu-budgie b/ascii/distro/ubuntu-budgie deleted file mode 100644 index 1faec715..00000000 --- a/ascii/distro/ubuntu-budgie +++ /dev/null @@ -1,20 +0,0 @@ -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. diff --git a/ascii/distro/ubuntu-gnome b/ascii/distro/ubuntu-gnome deleted file mode 100644 index 096dca3d..00000000 --- a/ascii/distro/ubuntu-gnome +++ /dev/null @@ -1,16 +0,0 @@ -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` diff --git a/ascii/distro/ubuntu-mate b/ascii/distro/ubuntu-mate deleted file mode 100644 index 893389fe..00000000 --- a/ascii/distro/ubuntu-mate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` diff --git a/ascii/distro/ubuntu-studio b/ascii/distro/ubuntu-studio deleted file mode 100644 index 2deb270e..00000000 --- a/ascii/distro/ubuntu-studio +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. diff --git a/ascii/distro/ubuntu_old b/ascii/distro/ubuntu_old deleted file mode 100644 index 4e3664b6..00000000 --- a/ascii/distro/ubuntu_old +++ /dev/null @@ -1,19 +0,0 @@ - -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. diff --git a/ascii/distro/void b/ascii/distro/void deleted file mode 100644 index 2a089e63..00000000 --- a/ascii/distro/void +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ diff --git a/ascii/distro/void_small b/ascii/distro/void_small deleted file mode 100644 index adfae49b..00000000 --- a/ascii/distro/void_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ diff --git a/ascii/distro/windows b/ascii/distro/windows deleted file mode 100644 index 31564309..00000000 --- a/ascii/distro/windows +++ /dev/null @@ -1,16 +0,0 @@ -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` diff --git a/ascii/distro/windows10 b/ascii/distro/windows10 deleted file mode 100644 index 62596129..00000000 --- a/ascii/distro/windows10 +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` diff --git a/ascii/distro/xubuntu b/ascii/distro/xubuntu deleted file mode 100644 index b872562b..00000000 --- a/ascii/distro/xubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` diff --git a/ascii/distro/zorin b/ascii/distro/zorin deleted file mode 100644 index bb051669..00000000 --- a/ascii/distro/zorin +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` diff --git a/config/travis.conf b/config/travis.conf deleted file mode 100644 index 0dada093..00000000 --- a/config/travis.conf +++ /dev/null @@ -1,55 +0,0 @@ -# Neofetch config file for travis.ci -# https://github.com/dylanaraps/neofetch - -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk -} - -refresh_rate="on" -shell_version="on" -cpu_display="infobar" -memory_display="infobar" -disk_display="infobar" -cpu_temp="C" diff --git a/neofetch b/neofetch index 128e23bc..98e94d89 100755 --- a/neofetch +++ b/neofetch @@ -3450,6 +3450,8 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." + else + ascii_data="$(< "$image_source")" fi # Set locale to get correct padding. @@ -8551,6 +8553,61 @@ get_args() { -N ./neofetch -o neofetch.1 exit 1 ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; esac shift From d52ba624bfeea254a06ec3aabbf721d8061bd1c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:05:42 +1000 Subject: [PATCH 235/300] general: Adjust makefile --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 99ec43b2..7870d456 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ PREFIX ?= /usr -SYSCONFDIR ?= /etc MANDIR ?= $(PREFIX)/share/man all: @@ -8,22 +7,15 @@ all: install: @echo 'Making directories...' @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro @mkdir -p $(DESTDIR)$(MANDIR)/man1 - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/neofetch @echo 'Installing binaries...' - @sed "s|ASCIIDIR|$(PREFIX)/share/neofetch/ascii/distro|g;s|CONFDIR|$(SYSCONFDIR)/neofetch|g" < neofetch > $(DESTDIR)$(PREFIX)/bin/neofetch @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - @echo 'Installing ASCII files, man page and config file...' - @cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro + @echo 'Installing man page...' @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - @cp -p config/config.conf $(DESTDIR)$(SYSCONFDIR)/neofetch/config.conf uninstall: @echo 'Removing files...' @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* - @rm -rf $(DESTDIR)$(PREFIX)/share/neofetch - @rm -rf $(DESTDIR)$(SYSCONFDIR)/neofetch From 3e9c76a830b449745e72550c6193607d0f10efc3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:12:42 +1000 Subject: [PATCH 236/300] theme: Fixes for bash3 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 98e94d89..c23974f0 100755 --- a/neofetch +++ b/neofetch @@ -32,7 +32,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. -readarray -t config <<'EOM' +read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info print_info() { @@ -801,7 +801,7 @@ stdout="off" # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. config_version="3.4.1-git" -EOM +EOF # DETECT INFORMATION @@ -7836,7 +7836,7 @@ get_user_config() { config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. - printf "%s\n" "${config[@]}" > "$config_file" + printf "%s\n" "$config" > "$config_file" fi source "$config_file" @@ -8619,7 +8619,7 @@ main() { get_os # Load default config. - source /dev/stdin < <(printf "%s\\n" "${config[@]}") + source /dev/stdin < <(printf "%s\n" "$config") get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From a982b0b5099fae0580218a92b26dd026bec00d01 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:17:43 +1000 Subject: [PATCH 237/300] ascii: Update android ascii --- neofetch | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index c23974f0..2f421ae1 100755 --- a/neofetch +++ b/neofetch @@ -4271,21 +4271,25 @@ EOF "Android"*) set_colors 2 7 - ascii_length_force=19 read -rd '' ascii_data <<'EOF' -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; From 7b0d8c2d090dfc94777f8ac49200f21502fea7e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:21:33 +1000 Subject: [PATCH 238/300] travis: Added another exclude. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96df785..af3a372e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - time ./neofetch --ascii --config config/travis.conf -v # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1117; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. From f5a50d52fc76dfe41ac4392ec6426bb1d5cb81a0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:22:25 +1000 Subject: [PATCH 239/300] travis: Remove line limit. Will still be enforced by hand. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index af3a372e..532ca462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,3 @@ script: # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi - # The if statement is here to invert the exit code from grep. - # grep normally errors if no match is found but we want the opposite. - # We invert it so grep fails if a match is found. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi From a796d41fa856cbb29ce30c15649f2d7a1bff76cd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:09:04 +1000 Subject: [PATCH 240/300] General: Move ascii art to the bottom of the script. --- neofetch | 1816 +++++++++++++++++++++++++++--------------------------- 1 file changed, 908 insertions(+), 908 deletions(-) diff --git a/neofetch b/neofetch index 2f421ae1..a2dd2d3d 100755 --- a/neofetch +++ b/neofetch @@ -4140,6 +4140,914 @@ uppercase() { # COLORS +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +color() { + case "$1" in + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" + + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done + + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" + + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} + +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi + + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} + +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} + +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} + +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + ;; + esac +} + +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" + ;; + esac + + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi + + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} + +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi + + get_birthday() { get_install_date; birthday="$install_date"; } +} + +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac + ;; + *) time="$4" ;; + esac + + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" + ;; + + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; + + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + ;; + esac + + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" + ;; + + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" + ;; + + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" + ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + 'sixel', 'tycat', 'w3m' + --source source Which image or ascii file to use. + Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; + + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; + + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; + + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; + + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; + + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done +} + get_distro_colors() { # This function sets the text colors according # to your OS/Distro's logo colors. @@ -7710,914 +8618,6 @@ EOF fi } -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -color() { - case "$1" in - [0-6]) printf "%b" "${reset}\e[3${1}m" ;; - 7 | "fg") printf "%b" "\e[37m${reset}" ;; - *) printf "%b" "\e[38;5;${1}m" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" - - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} - -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" - - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi - - kde_config_dir="${kde_config_dir/$'/:'*}" -} - -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac - - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi - - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" - ;; - - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" - ;; - - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" - ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text - -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks - -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' - --source source Which image or ascii file to use. - Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. - - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print - - NOTE: Arch and Ubuntu have 'old' logo variants. - - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. - - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. - - Possible values: bar, infobar, barinfo, off - -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast - - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. - - NOTE: --gap can take a negative value which will move the text - closer to the left side. - - --clean Delete cached files and thumbnails. - -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. - -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - - -Report bugs to https://github.com/dylanaraps/neofetch/issues - -" -exit 1 -} - -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config - - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; - - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; - - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; - - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; - - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; - - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; - - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; - - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; - - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; - - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; - - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; - - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; - - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; - - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; - - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - - "--travis") - print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk - } - - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac - - shift - done -} - main() { cache_uname get_os From 4ee3eadbaa48f71a304ceaf9ef918496a4dee48d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:22:56 +1000 Subject: [PATCH 241/300] general: In-lined license --- neofetch | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index a2dd2d3d..5fd7a83f 100755 --- a/neofetch +++ b/neofetch @@ -1,12 +1,30 @@ #!/usr/bin/env bash -# set -x # vim: noai:ts=4:sw=4:expandtab # -# Neofetch: Simple system information script. +# Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch # -# Created by Dylan Araps -# https://github.com/dylanaraps/ +# The MIT License (MIT) +# +# Copyright (c) 2016-2017 Dylan Araps +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # Neofetch version. version="3.4.1-git" From 2f5f7f5ab43502fa8f63ac9ab65d72eb8165c50d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 3 May 2018 19:46:14 +0200 Subject: [PATCH 242/300] term_font: add qterminal support --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index f793a1e7..9797133e 100755 --- a/neofetch +++ b/neofetch @@ -2195,6 +2195,11 @@ END term_font="$(trim_quotes "$term_font")" ;; + "qterminal") + term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END{print a " " b}' \ + "${XDG_CONFIG_HOME}/qterminal.org/qterminal.ini")" + ;; + "sakura"*) term_font="$(awk -F '=' '/^font=/ {print $2; exit}' \ "${XDG_CONFIG_HOME}/sakura/sakura.conf")" From ca14085036e6bd3d5aabb45676990e7c2b789889 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:20:40 +1000 Subject: [PATCH 243/300] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef80e2ed..7a385c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - [**@robertwolter**](https://github.com/robertwolter) - [**@TsundereBug**](https://github.com/TsundereBug) - [**@dawidd6**](https://github.com/dawidd6) +- [**@mstraube**](https://github.com/mstraube) ## Operating System @@ -50,6 +51,7 @@ **Terminal Font** - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube) **Packages** From f9fe78898f1742c862401bff6f00f26e33e00995 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:45:41 +1000 Subject: [PATCH 244/300] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index aeaeb73f..621c1146 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, - https://www.ostechnix.com/neofetch-display-linux-systems-information/ - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ +- https://www.youtube.com/watch?v=bgepGW858fc ## Thanks From 698d1ef5cf65c6c438af2e728076741e0367fe4d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:56:18 +1000 Subject: [PATCH 245/300] general: Remove Makefile --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 7870d456..00000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man - -all: - @echo Run \'make install\' to install Neofetch. - -install: - @echo 'Making directories...' - @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(MANDIR)/man1 - - @echo 'Installing binaries...' - @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - - @echo 'Installing man page...' - @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - -uninstall: - @echo 'Removing files...' - @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch - @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From 16b6e79340dc2d0d42cf3629931d564b2e64940c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:33:32 +1000 Subject: [PATCH 246/300] general: Added missing ascii --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 5fd7a83f..7f6969ae 100755 --- a/neofetch +++ b/neofetch @@ -5313,6 +5313,32 @@ dhhyys+/-` EOF ;; + "ArcoLinux"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF + ;; + "arch_small") set_colors 6 7 1 read -rd '' ascii_data <<'EOF' From 0c350594bbc65c656fab0cf9c9f4651f68b8aa15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:49:13 +1000 Subject: [PATCH 247/300] general: Move ascii art back to fix merge conflicts. --- neofetch | 1817 +++++++++++++++++++++++++++--------------------------- 1 file changed, 909 insertions(+), 908 deletions(-) diff --git a/neofetch b/neofetch index 7f6969ae..4c6bba0e 100755 --- a/neofetch +++ b/neofetch @@ -50,6 +50,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. + read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info @@ -4158,914 +4159,6 @@ uppercase() { # COLORS -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -color() { - case "$1" in - [0-6]) printf "%b" "${reset}\e[3${1}m" ;; - 7 | "fg") printf "%b" "\e[37m${reset}" ;; - *) printf "%b" "\e[38;5;${1}m" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" - - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} - -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" - - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi - - kde_config_dir="${kde_config_dir/$'/:'*}" -} - -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac - - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi - - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" - ;; - - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" - ;; - - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" - ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text - -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks - -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' - --source source Which image or ascii file to use. - Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. - - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print - - NOTE: Arch and Ubuntu have 'old' logo variants. - - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. - - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. - - Possible values: bar, infobar, barinfo, off - -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast - - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. - - NOTE: --gap can take a negative value which will move the text - closer to the left side. - - --clean Delete cached files and thumbnails. - -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. - -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - - -Report bugs to https://github.com/dylanaraps/neofetch/issues - -" -exit 1 -} - -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config - - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; - - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; - - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; - - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; - - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; - - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; - - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; - - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; - - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; - - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; - - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; - - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; - - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; - - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; - - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - - "--travis") - print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk - } - - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac - - shift - done -} - get_distro_colors() { # This function sets the text colors according # to your OS/Distro's logo colors. @@ -8662,6 +7755,914 @@ EOF fi } +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +color() { + case "$1" in + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" + + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done + + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" + + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} + +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi + + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} + +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} + +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} + +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + ;; + esac +} + +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" + ;; + esac + + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi + + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} + +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi + + get_birthday() { get_install_date; birthday="$install_date"; } +} + +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac + ;; + *) time="$4" ;; + esac + + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" + ;; + + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; + + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + ;; + esac + + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" + ;; + + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" + ;; + + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" + ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + 'sixel', 'tycat', 'w3m' + --source source Which image or ascii file to use. + Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; + + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; + + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; + + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; + + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; + + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done +} + main() { cache_uname get_os From 9d6d62ece5d360a81b3dd4b2785b97911fa002e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 08:13:01 +1000 Subject: [PATCH 248/300] wm: Added WM version. --- config/config.conf | 11 +++++++++++ neofetch | 11 +++++++++++ neofetch.1 | 3 +++ 3 files changed, 25 insertions(+) diff --git a/config/config.conf b/config/config.conf index d754e023..65d01d49 100644 --- a/config/config.conf +++ b/config/config.conf @@ -303,6 +303,17 @@ gtk3="on" public_ip_host="http://ident.me" +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + # Disk diff --git a/neofetch b/neofetch index 9797133e..3edf034e 100755 --- a/neofetch +++ b/neofetch @@ -793,6 +793,15 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" + if [[ "$wm_version" == "on" ]]; then + wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/copyright*}" + wmv="${wmv/version }" + wmv="${wmv/©*}" + wmv="${wmv/(c)*}" + wm="$wmv" + fi else case "$os" in "Mac OS X") @@ -4704,6 +4713,7 @@ INFO: NOTE: This only supports Linux. + --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4874,6 +4884,7 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; + "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index d43db1d8..391cb7d6 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -81,6 +81,9 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP +\fB\-\-wm_version\fR on/off +Show/Hide Window Manager version. +.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From d239a05782177ef73ca6a5ea14b57cbdddd69ea6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:25:19 +1000 Subject: [PATCH 249/300] wm: Show version for KDE and dwm. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3edf034e..99231fd0 100755 --- a/neofetch +++ b/neofetch @@ -794,8 +794,12 @@ get_wm() { -e "tinywm")" if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="$wm $("${wm,,}" --version || \ + "${wm,,}" -v || \ + "${wm,,}_x11" -v)" || \ + "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/$wm $wm-/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 52c2e871a3f400c1f13a30e45793f50d2bd83339 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:30:18 +1000 Subject: [PATCH 250/300] wm: Added support for aewm --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 99231fd0..f0b47303 100755 --- a/neofetch +++ b/neofetch @@ -799,7 +799,7 @@ get_wm() { "${wm,,}_x11" -v)" || \ "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm $wm-/$wm}" + wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 1ddcc47dd60351ec8a845a86f489fcfc3dd527bf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:41:44 +1000 Subject: [PATCH 251/300] wm: Added support for more window managers. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index f0b47303..15bcffe5 100755 --- a/neofetch +++ b/neofetch @@ -793,17 +793,16 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || \ - "${wm,,}" -v || \ - "${wm,,}_x11" -v)" || \ - "${wm,,}_wayland" -v")" + if [[ "$wm_version" == "on" && "$wm" ]]; then + wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" + wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" + wmv="${wmv/$wm ${wm}?/$wm }" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" wmv="${wmv/(c)*}" + wmv="${wmv/ : }" wm="$wmv" fi else From 9573aaee345c0ca06cd2f746375298744da8ec54 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:05:49 +1000 Subject: [PATCH 252/300] config: Inline config file. --- config/config.conf | 782 ------------------------------------------- neofetch | 814 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 790 insertions(+), 806 deletions(-) delete mode 100644 config/config.conf diff --git a/config/config.conf b/config/config.conf deleted file mode 100644 index 65d01d49..00000000 --- a/config/config.conf +++ /dev/null @@ -1,782 +0,0 @@ -# Neofetch config file -# https://github.com/dylanaraps/neofetch - - -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Install Date" install_date - # info "Locale" locale # This only works on glibc systems. - - info line_break - info cols - info line_break -} - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'off', 'tiny' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'off', 'tiny' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' -# tiny: '2d 10h 3m' -uptime_shorthand="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand. -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - - -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -disk_subtitle="mount" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# Google Play -# Spotify -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# elisa -# exaile -# gnome-music -# guayadeque -# iTunes$ -# juk -# lollypop -# mocp -# mopidy -# mpd -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# spotify -# tomahawk -# xmms2d -# yarock -music_player="auto" - -# Print the Artist and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Chelsea Dagger' -song_shorthand="off" - - -# Install Date - - -# Whether to show the time in the output -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --install_time -# -# Example: -# on: 'Thu 14 Apr 2016 11:50 PM' -# off: 'Thu 14 Apr 2016' -install_time="on" - -# Set time format in the output -# -# Default: '24h' -# Values: '12h', '24h' -# Flag: --install_time_format -# -# Example: -# 12h: 'Thu 14 Apr 2016 11:50 PM' -# 24h: 'Thu 14 Apr 2016 23:50' -install_time_format="12h" - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(distro) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '7' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 7) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="auto" - - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="auto" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Scrot Options - - -# Whether or not to always take a screenshot -# You can manually take a screenshot with "--scrot" or "-s" -# -# Default: 'off' -# Values: 'on', 'off' -# Flags: --scrot -# -s -scrot="off" - -# Screenshot Program -# Neofetch will automatically use whatever screenshot tool -# is installed on your system. -# -# If 'neofetch -v' says that it couldn't find a screenshot -# tool or you're using a custom tool then you can change -# the option below to a custom command. -# -# Default: 'auto' -# Values: 'auto' 'cmd -flags' -# Flag: --scrot_cmd -scrot_cmd="auto" - -# Screenshot Filename -# What to name the screenshots -# -# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' -# Values: 'string' -# Flag: --scrot_name -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" - -# Image upload host -# Where to upload the image. -# -# Default: 'teknik' -# Values: 'imgur', 'teknik' -# Flag: --image_host -# -# NOTE: If you'd like another image host to be added to Neofetch. -# Open an issue on github. -image_host="teknik" - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 15bcffe5..f8d63fab 100755 --- a/neofetch +++ b/neofetch @@ -31,6 +31,789 @@ shopt -s nocasematch # Reset colors and bold. reset="\e[0m" +# Neofetch default config. +readarray -t config <<'EOM' +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info +print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + + # info "GPU Driver" gpu_driver # Linux/macOS only + # info "CPU Usage" cpu_usage + # info "Disk" disk + # info "Battery" battery + # info "Font" font + # info "Song" song + # info "Local IP" local_ip + # info "Public IP" public_ip + # info "Users" users + # info "Install Date" install_date + # info "Locale" locale # This only works on glibc systems. + + info line_break + info cols + info line_break +} + + +# Kernel + + +# Shorten the output of the kernel function. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --kernel_shorthand +# Supports: Everything except *BSDs (except PacBSD and PC-BSD) +# +# Example: +# on: '4.8.9-1-ARCH' +# off: 'Linux 4.8.9-1-ARCH' +kernel_shorthand="on" + + +# Distro + + +# Shorten the output of the distro function +# +# Default: 'off' +# Values: 'on', 'off', 'tiny' +# Flag: --distro_shorthand +# Supports: Everything except Windows and Haiku +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Show 'x86_64', 'x86' and etc in 'Distro:' output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --os_arch +# +# Example: +# on: 'Arch Linux x86_64' +# off: 'Arch Linux' +os_arch="on" + + +# Uptime + + +# Shorten the output of the uptime function +# +# Default: 'on' +# Values: 'on', 'off', 'tiny' +# Flag: --uptime_shorthand +# +# Example: +# on: '2 days, 10 hours, 3 mins' +# off: '2 days, 10 hours, 3 minutes' +# tiny: '2d 10h 3m' +uptime_shorthand="on" + + +# Shell + + +# Show the path to $SHELL +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --shell_path +# +# Example: +# on: '/bin/bash' +# off: 'bash' +shell_path="off" + +# Show $SHELL version +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --shell_version +# +# Example: +# on: 'bash 4.4.5' +# off: 'bash' +shell_version="on" + + +# CPU + + +# CPU speed type +# +# Default: 'bios_limit' +# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. +# Flag: --speed_type +# Supports: Linux with 'cpufreq' +# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. +speed_type="bios_limit" + +# CPU speed shorthand +# +# Default: 'off' +# Values: 'on', 'off'. +# Flag: --speed_shorthand. +# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz +# +# Example: +# on: 'i7-6500U (4) @ 3.1GHz' +# off: 'i7-6500U (4) @ 3.100GHz' +speed_shorthand="off" + +# Enable/Disable CPU brand in output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_brand +# +# Example: +# on: 'Intel i7-6500U' +# off: 'i7-6500U (4)' +cpu_brand="on" + +# CPU Speed +# Hide/Show CPU speed. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_speed +# +# Example: +# on: 'Intel i7-6500U (4) @ 3.1GHz' +# off: 'Intel i7-6500U (4)' +cpu_speed="on" + +# CPU Cores +# Display CPU cores in output +# +# Default: 'logical' +# Values: 'logical', 'physical', 'off' +# Flag: --cpu_cores +# Support: 'physical' doesn't work on BSD. +# +# Example: +# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) +# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) +# off: 'Intel i7-6500U @ 3.1GHz' +cpu_cores="logical" + +# CPU Temperature +# Hide/Show CPU temperature. +# Note the temperature is added to the regular CPU function. +# +# Default: 'off' +# Values: 'C', 'F', 'off' +# Flag: --cpu_temp +# Supports: Linux, BSD +# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable +# coretemp kernel module. This only supports newer Intel processors. +# +# Example: +# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' +# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' +# off: 'Intel i7-6500U (4) @ 3.1GHz' +cpu_temp="off" + + +# GPU + + +# Enable/Disable GPU Brand +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gpu_brand +# +# Example: +# on: 'AMD HD 7950' +# off: 'HD 7950' +gpu_brand="on" + +# Which GPU to display +# +# Default: 'all' +# Values: 'all', 'dedicated', 'integrated' +# Flag: --gpu_type +# Supports: Linux +# +# Example: +# all: +# GPU1: AMD HD 7950 +# GPU2: Intel Integrated Graphics +# +# dedicated: +# GPU1: AMD HD 7950 +# +# integrated: +# GPU1: Intel Integrated Graphics +gpu_type="all" + + +# Resolution + + +# Display refresh rate next to each monitor +# Default: 'off' +# Values: 'on', 'off' +# Flag: --refresh_rate +# Supports: Doesn't work on Windows. +# +# Example: +# on: '1920x1080 @ 60Hz' +# off: '1920x1080' +refresh_rate="off" + + +# Gtk Theme / Icons / Font + + +# Shorten output of GTK Theme / Icons / Font +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --gtk_shorthand +# +# Example: +# on: 'Numix, Adwaita' +# off: 'Numix [GTK2], Adwaita [GTK3]' +gtk_shorthand="off" + + +# Enable/Disable gtk2 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk2 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Adwaita [GTK3]' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk3 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Numix [GTK2]' +gtk3="on" + + +# IP Address + + +# Website to ping for the public IP +# +# Default: 'http://ident.me' +# Values: 'url' +# Flag: --ip_host +public_ip_host="http://ident.me" + + +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + +# Disk + + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +# NOTE: By default we only show the disk info for '/'. +# +# Default: '/' +# Values: '/', '/dev/sdXX', '/path/to/drive'. +# Flag: --disk_show +# +# Example: +# disk_show=('/' '/dev/sdb1'): +# 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 823G / 893G (93%)' +# +# disk_show=('/'): +# 'Disk (/): 74G / 118G (66%)' +# +disk_show=('/') + +# Disk subtitle. +# What to append to the Disk subtitle. +# +# Default: 'mount' +# Values: 'mount', 'name', 'dir' +# Flag: --disk_subtitle +# +# Example: +# name: 'Disk (/dev/sda1): 74G / 118G (66%)' +# 'Disk (/dev/sdb2): 74G / 118G (66%)' +# +# mount: 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 74G / 118G (66%)' +# +# dir: 'Disk (/): 74G / 118G (66%)' +# 'Disk (Local Disk): 74G / 118G (66%)' +# 'Disk (Videos): 74G / 118G (66%)' +disk_subtitle="mount" + + +# Song + + +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + +# Print the Artist and Title on separate lines +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --song_shorthand +# +# Example: +# on: 'Artist: The Fratellis' +# 'Song: Chelsea Dagger' +# +# off: 'Song: The Fratellis - Chelsea Dagger' +song_shorthand="off" + + +# Install Date + + +# Whether to show the time in the output +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --install_time +# +# Example: +# on: 'Thu 14 Apr 2016 11:50 PM' +# off: 'Thu 14 Apr 2016' +install_time="on" + +# Set time format in the output +# +# Default: '24h' +# Values: '12h', '24h' +# Flag: --install_time_format +# +# Example: +# 12h: 'Thu 14 Apr 2016 11:50 PM' +# 24h: 'Thu 14 Apr 2016 23:50' +install_time_format="12h" + + +# Text Colors + + +# Text Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --colors +# +# Each number represents a different part of the text in +# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' +# +# Example: +# colors=(distro) - Text is colored based on Distro colors. +# colors=(4 6 1 8 8 6) - Text is colored in the order above. +colors=(distro) + + +# Text Options + + +# Toggle bold text +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bold +bold="on" + +# Enable/Disable Underline +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --underline +underline_enabled="on" + +# Underline character +# +# Default: '-' +# Values: 'string' +# Flag: --underline_char +underline_char="-" + + +# Color Blocks + + +# Color block range +# The range of colors to print. +# +# Default: '0', '7' +# Values: 'num' +# Flag: --block_range +# +# Example: +# +# Display colors 0-7 in the blocks. (8 colors) +# neofetch --block_range 0 7 +# +# Display colors 0-15 in the blocks. (16 colors) +# neofetch --block_range 0 15 +block_range=(0 7) + +# Toggle color blocks +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --color_blocks +color_blocks="on" + +# Color block width in spaces +# +# Default: '3' +# Values: 'num' +# Flag: --block_width +block_width=3 + +# Color block height in lines +# +# Default: '1' +# Values: 'num' +# Flag: --block_height +block_height=1 + + +# Progress Bars + + +# Bar characters +# +# Default: '-', '=' +# Values: 'string', 'string' +# Flag: --bar_char +# +# Example: +# neofetch --bar_char 'elapsed' 'total' +# neofetch --bar_char '-' '=' +bar_char_elapsed="-" +bar_char_total="=" + +# Toggle Bar border +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bar_border +bar_border="on" + +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# +# Default: '15' +# Values: 'num' +# Flag: --bar_length +bar_length=15 + +# Progress bar colors +# When set to distro, uses your distro's logo colors. +# +# Default: 'distro', 'distro' +# Values: 'distro', 'num' +# Flag: --bar_colors +# +# Example: +# neofetch --bar_colors 3 4 +# neofetch --bar_colors distro 5 +bar_color_elapsed="distro" +bar_color_total="distro" + + +# Info display +# Display a bar with the info. +# +# Default: 'off' +# Values: 'bar', 'infobar', 'barinfo', 'off' +# Flags: --cpu_display +# --memory_display +# --battery_display +# --disk_display +# +# Example: +# bar: '[---=======]' +# infobar: 'info [---=======]' +# barinfo: '[---=======] info' +# off: 'info' +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" + + +# Backend Settings + + +# Image backend. +# +# Default: 'ascii' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Flag: --backend +image_backend="ascii" + +# Image Source +# +# Which image or ascii file to display. +# +# Default: 'auto' +# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# Flag: --source +# +# NOTE: 'auto' will pick the best image source for whatever image backend is used. +# In ascii mode, distro ascii art will be used and in an image mode, your +# wallpaper will be used. +image_source="auto" + + +# Ascii Options + + +# Ascii distro +# Which distro's ascii art to display. +# +# Default: 'auto' +# Values: 'auto', 'distro_name' +# Flag: --ascii_distro +# +# NOTE: Arch and Ubuntu have 'old' logo variants. +# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: Ubuntu has flavor variants. +# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. +# NOTE: Arch, Crux and Gentoo have a smaller logo variant. +# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +ascii_distro="auto" + +# Ascii Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --ascii_colors +# +# Example: +# ascii_colors=(distro) - Ascii is colored based on Distro colors. +# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. +ascii_colors=(distro) + +# Bold ascii logo +# Whether or not to bold the ascii logo. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --ascii_bold +ascii_bold="on" + + +# Image Options + + +# Image loop +# Setting this to on will make neofetch redraw the image constantly until +# Ctrl+C is pressed. This fixes display issues in some terminal emulators. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --loop +image_loop="off" + +# Thumbnail directory +# +# Default: '~/.cache/thumbnails/neofetch' +# Values: 'dir' +thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" + +# Crop mode +# +# Default: 'normal' +# Values: 'normal', 'fit', 'fill' +# Flag: --crop_mode +# +# See this wiki page to learn about the fit and fill options. +# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F +crop_mode="normal" + +# Crop offset +# Note: Only affects 'normal' crop mode. +# +# Default: 'center' +# Values: 'northwest', 'north', 'northeast', 'west', 'center' +# 'east', 'southwest', 'south', 'southeast' +# Flag: --crop_offset +crop_offset="center" + +# Image size +# The image is half the terminal width by default. +# +# Default: 'auto' +# Values: 'auto', '00px', '00%', 'none' +# Flags: --image_size +# --size +image_size="auto" + +# Gap between image and text +# +# Default: '3' +# Values: 'num', '-num' +# Flag: --gap +gap=3 + +# Image offsets +# Only works with the w3m backend. +# +# Default: '0' +# Values: 'px' +# Flags: --xoffset +# --yoffset +yoffset=0 +xoffset=0 + +# Image background color +# Only works with the w3m backend. +# +# Default: '' +# Values: 'color', 'blue' +# Flag: --bg_color +background_color= + + +# Scrot Options + + +# Whether or not to always take a screenshot +# You can manually take a screenshot with "--scrot" or "-s" +# +# Default: 'off' +# Values: 'on', 'off' +# Flags: --scrot +# -s +scrot="off" + +# Screenshot Program +# Neofetch will automatically use whatever screenshot tool +# is installed on your system. +# +# If 'neofetch -v' says that it couldn't find a screenshot +# tool or you're using a custom tool then you can change +# the option below to a custom command. +# +# Default: 'auto' +# Values: 'auto' 'cmd -flags' +# Flag: --scrot_cmd +scrot_cmd="auto" + +# Screenshot Filename +# What to name the screenshots +# +# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' +# Values: 'string' +# Flag: --scrot_name +scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" + +# Image upload host +# Where to upload the image. +# +# Default: 'teknik' +# Values: 'imgur', 'teknik' +# Flag: --image_host +# +# NOTE: If you'd like another image host to be added to Neofetch. +# Open an issue on github. +image_host="teknik" + + +# Misc Options + +# Stdout mode +# Turn off all colors and disables image backend (ASCII/Image). +# Useful for piping into another command. +# Default: 'off' +# Values: 'on', 'off' +stdout="off" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="3.4.1-git" +EOM + + # DETECT INFORMATION get_os() { @@ -4295,22 +5078,6 @@ get_full_path() { [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" } -get_default_config() { - if [[ -f "CONFDIR/config.conf" ]]; then - default_config="CONFDIR/config.conf" - - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - default_config="${script_dir%/*}/config/config.conf" - fi - - if source "$default_config"; then - err "Config: Sourced default config. (${default_config})" - else - err "Config: Default config not found, continuing..." - fi -} - get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then @@ -4329,15 +5096,11 @@ get_user_config() { elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - elif [[ -f "CONFDIR/config.conf" ]]; then - cp "CONFDIR/config.conf" "${XDG_CONFIG_HOME}/neofetch" - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - - cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "${config[@]}" > "$config_file" fi source "$config_file" @@ -5065,7 +5828,10 @@ get_args() { main() { cache_uname get_os - get_default_config + + # Load default config. + source /dev/stdin < <(printf "%s\\n" "${config[@]}") + get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro From c794f7f072b5f066d7986a849f2ea18df86c2c0f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:09:58 +1000 Subject: [PATCH 253/300] general: Removed changes from other branch --- neofetch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/neofetch b/neofetch index f8d63fab..a4b10bfe 100755 --- a/neofetch +++ b/neofetch @@ -334,16 +334,6 @@ gtk3="on" public_ip_host="http://ident.me" -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - # Disk @@ -1576,18 +1566,6 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" && "$wm" ]]; then - wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" - wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" - wmv="${wmv/$wm ${wm}?/$wm }" - wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/copyright*}" - wmv="${wmv/version }" - wmv="${wmv/©*}" - wmv="${wmv/(c)*}" - wmv="${wmv/ : }" - wm="$wmv" - fi else case "$os" in "Mac OS X") @@ -5479,7 +5457,6 @@ INFO: NOTE: This only supports Linux. - --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -5650,7 +5627,6 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; - "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; From 3af0341804fabbac7279fc50af68c1543f05210a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:10:50 +1000 Subject: [PATCH 254/300] docs: update --- neofetch.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 391cb7d6..b0bcd8ac 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -81,9 +81,6 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP -\fB\-\-wm_version\fR on/off -Show/Hide Window Manager version. -.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From 3ee733e982a58a9685638bbd3fde6cd9d77e694f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:32:59 +1000 Subject: [PATCH 255/300] general: Start inlining ascii. --- neofetch | 1024 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 862 insertions(+), 162 deletions(-) diff --git a/neofetch b/neofetch index a4b10bfe..2b89f8e1 100755 --- a/neofetch +++ b/neofetch @@ -3460,19 +3460,6 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." - - if [[ -d "ASCIIDIR" ]]; then - ascii_dir="ASCIIDIR" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - ascii_dir="${script_dir%/*}/ascii/distro" - fi - - image_source="${ascii_dir}/${ascii_file}" - - # Fallback to no ascii mode if distro ascii isn't found. - [[ ! -f "$image_source" ]] && \ - { to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; } fi # Set locale to get correct padding. @@ -3490,7 +3477,7 @@ get_ascii() { line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" ((++lines)) - done < "$image_source" + done <<< "$ascii_data" # Colors. print="${print//'${c1}'/$c1}" @@ -4160,52 +4147,239 @@ get_distro_colors() { case "$ascii_distro" in "AIX"*) set_colors 2 7 - ascii_file="aix" + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF ;; "alpine_small") set_colors 4 7 - ascii_file="alpine_small" + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF ;; "Alpine"*) set_colors 4 5 7 6 - ascii_file="alpine" + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF ;; "Amazon"*) set_colors 3 7 - ascii_file="amazon" + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF ;; "Anarchy"*) set_colors 7 4 - ascii_file="anarchy" + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF ;; "Android"*) set_colors 2 7 - ascii_file="android" + ascii_length_force=19 + read -rd '' ascii_data <<'EOF' +${c1} ╲ ▁▂▂▂▁ ╱ + ▄███████▄ + ▄██${c2} ${c1}███${c2} ${c1}██▄ + ▄███████████▄ +▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ + █████████████ + ███████████ + ██ ██ + ██ ██ +EOF ;; "Antergos"*) set_colors 4 6 - ascii_file="antergos" + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF ;; "antiX"*) set_colors 1 7 3 - ascii_file="antix" + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF ;; "AOSC"*) set_colors 4 7 1 - ascii_file="aosc" + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF ;; "Apricity"*) set_colors 4 7 1 - ascii_file="apricity" + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF ;; "ArcoLinux"*) @@ -4215,694 +4389,1220 @@ get_distro_colors() { "arch_small") set_colors 6 7 1 - ascii_file="arch_small" + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF ;; "arch_old") set_colors 6 7 1 - ascii_file="arch_old" + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF ;; "ArchBox"*) set_colors 2 7 1 - ascii_file="archbox" + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF ;; "ARCHlabs"*) set_colors 6 6 7 1 - ascii_file="archlabs" + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF ;; *"XFerience"*) set_colors 6 6 7 1 - ascii_file="arch_xferience" + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF ;; "ArchMerge"*) set_colors 6 6 7 1 - ascii_file="archmerge" + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF ;; "Arch"*) set_colors 6 6 7 1 - ascii_file="arch" + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF ;; "Artix"*) set_colors 6 4 2 7 - ascii_file="artix" + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF ;; "Arya"*) set_colors 2 1 - ascii_file="arya" + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF ;; "Bitrig"*) set_colors 2 7 - ascii_file="bitrig" + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF ;; "BLAG"*) set_colors 5 7 - ascii_file="blag" + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; "BlankOn"*) set_colors 1 7 3 - ascii_file="blankon" + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; "BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "BunsenLabs"*) set_colors fg 7 - ascii_file="bunsenlabs" + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; "Calculate"*) set_colors 7 3 - ascii_file="calculate" + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; "CentOS"*) set_colors 3 2 4 5 7 - ascii_file="centos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chakra"*) set_colors 4 5 7 6 - ascii_file="chakra" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ChaletOS"*) set_colors 4 7 1 - ascii_file="chaletos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chapeau"*) set_colors 2 7 - ascii_file="chapeau" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chrom"*) set_colors 2 1 3 4 7 - ascii_file="chrome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Clover"*) set_colors 2 6 - ascii_file="cloveros" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 - ascii_file="coreos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "crux_small") set_colors 4 5 7 6 - ascii_file="crux_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "CRUX"*) set_colors 4 5 7 6 - ascii_file="crux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "debian_small") set_colors 1 7 3 - ascii_file="debian_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Debian"*) set_colors 1 7 3 - ascii_file="debian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Deepin"*) set_colors 2 7 - ascii_file="deepin" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DesaOS") set_colors 2 7 - ascii_file="desaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Devuan"*) set_colors 5 7 - ascii_file="devuan" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DracOS"*) set_colors 1 7 3 - ascii_file="dracos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_old"*) set_colors 1 7 3 - ascii_file="dragonflybsd_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_small"*) set_colors 1 7 3 - ascii_file="dragonflybsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DragonFly"*) set_colors 1 7 3 - ascii_file="dragonflybsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Elementary"*) set_colors 4 7 1 - ascii_file="elementary" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Endless"*) set_colors 1 7 - ascii_file="endless" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Exherbo"*) set_colors 4 7 1 - ascii_file="exherbo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 - ascii_file="fedora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "freebsd_small") set_colors 1 7 3 - ascii_file="freebsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeBSD"*) set_colors 1 7 3 - ascii_file="freebsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeMiNT"*) # Don't explicitly set colors since # TosWin2 doesn't reset well. - ascii_file="gem" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Frugalware"*) set_colors 4 7 1 - ascii_file="frugalware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Funtoo"*) set_colors 5 7 - ascii_file="funtoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GalliumOS"*) set_colors 4 7 1 - ascii_file="galliumos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gentoo_small") set_colors 5 7 - ascii_file="gentoo_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Gentoo"*) set_colors 5 7 - ascii_file="gentoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gNewSense"*) set_colors 4 5 7 6 - ascii_file="gnewsense" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GNU") set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GoboLinux"*) set_colors 5 4 6 2 - ascii_file="gobolinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Grombyang"*) set_colors 4 2 1 - ascii_file="grombyang" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 - ascii_file="guixsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Haiku"*) set_colors 2 8 - ascii_file="haiku" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Hyperbola"*) set_colors 8 - ascii_file="hyperbola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kali"*) set_colors 4 8 - ascii_file="kali" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KaOS"*) set_colors 4 7 1 - ascii_file="kaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KDE"*) set_colors 2 7 - ascii_file="kde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kogaion"*) set_colors 4 7 1 - ascii_file="kogaion" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Korora"*) set_colors 4 7 1 - ascii_file="korora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KSLinux"*) set_colors 4 7 1 - ascii_file="kslinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kubuntu"*) set_colors 4 7 1 - ascii_file="kubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LEDE"*) set_colors 4 7 1 - ascii_file="lede" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LMDE"*) set_colors 2 7 - ascii_file="lmde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lubuntu"*) set_colors 4 7 1 - ascii_file="lubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lunar"*) set_colors 4 7 3 - ascii_file="lunar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 - ascii_file="mac_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mageia"*) set_colors 6 7 - ascii_file="mageia" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MagpieOS"*) set_colors 2 1 3 5 - ascii_file="magpieos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Manjaro"*) set_colors 2 7 - ascii_file="manjaro" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Maui"*) set_colors 6 7 - ascii_file="maui" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mer"*) set_colors 4 7 1 - ascii_file="mer" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Minix"*) set_colors 1 7 3 - ascii_file="minix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux Mint"* | "LinuxMint"*) set_colors 2 7 - ascii_file="mint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MX"*) set_colors 4 6 7 - ascii_file="mx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NetBSD"*) set_colors 5 7 - ascii_file="netbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Netrunner"*) set_colors 4 7 1 - ascii_file="netrunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nitrux"*) set_colors 4 - ascii_file="nitrux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "nixos_small") set_colors 4 6 - ascii_file="nixos_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NixOS"*) set_colors 4 6 - ascii_file="nixos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nurunner"*) set_colors 4 - ascii_file="nurunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NuTyX"*) set_colors 4 1 - ascii_file="nutyx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OBRevenge"*) set_colors 1 7 3 - ascii_file="obrevenge" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openbsd_small") set_colors 3 7 6 1 8 - ascii_file="openbsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 - ascii_file="openbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenIndiana"*) set_colors 4 7 1 - ascii_file="openindiana" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenMandriva"*) set_colors 4 3 - ascii_file="openmandriva" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenWrt"*) set_colors 4 7 1 - ascii_file="openwrt" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 - ascii_file="osmc" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Oracle"*) set_colors 1 7 3 - ascii_file="oracle" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PacBSD"*) set_colors 1 7 3 - ascii_file="pacbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parabola"*) set_colors 5 7 - ascii_file="parabola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pardus"*) set_colors 3 7 6 1 8 - ascii_file="pardus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parrot"*) set_colors 6 7 - ascii_file="parrot" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parsix"*) set_colors 3 1 7 8 - ascii_file="parsix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 - ascii_file="trueos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCLinuxOS"*) set_colors 4 7 1 - ascii_file="pclinuxos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Peppermint"*) set_colors 1 7 3 - ascii_file="peppermint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pop!_OS"*) set_colors 6 7 - ascii_file="pop_os" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Porteus"*) set_colors 6 7 - ascii_file="porteus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PostMarketOS"*) set_colors 2 7 - ascii_file="postmarketos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 - ascii_file="puppy" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Qubes"*) set_colors 4 5 7 6 - ascii_file="qubes" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Raspbian"*) set_colors 2 1 - ascii_file="raspbian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 - ascii_file="redstar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 - ascii_file="redhat" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Refracted Devuan"*) set_colors 8 7 - ascii_file="refracta" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Rosa"*) set_colors 4 7 1 - ascii_file="rosa" + read -rd '' ascii_data <<'EOF' + +EOF ;; "sabotage"*) set_colors 4 7 1 - ascii_file="sabotage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sabayon"*) set_colors 4 7 1 - ascii_file="sabayon" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SailfishOS"*) set_colors 4 5 7 6 - ascii_file="sailfishos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SalentOS"*) set_colors 2 1 3 7 - ascii_file="salentos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Scientific"*) set_colors 4 7 1 - ascii_file="scientific" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Siduction"*) set_colors 4 4 - ascii_file="siduction" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Slackware"*) set_colors 4 7 1 - ascii_file="slackware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SliTaz"*) set_colors 3 3 - ascii_file="slitaz" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SmartOS"*) set_colors 6 7 - ascii_file="smartos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Solus"*) set_colors 4 7 1 - ascii_file="solus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Source Mage"*) set_colors 4 7 1 - ascii_file="source_mage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sparky"*) set_colors 1 7 - ascii_file="sparky" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SteamOS"*) set_colors 5 7 - ascii_file="steamos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SunOS" | "Solaris") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 - ascii_file="tumbleweed" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 - ascii_file="suse" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SwagArch"*) set_colors 4 7 1 - ascii_file="swagarch" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Tails"*) set_colors 5 7 - ascii_file="tails" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Trisquel"*) set_colors 4 6 - ascii_file="trisquel" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 - ascii_file="ubuntu-budgie" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 - ascii_file="ubuntu-gnome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-MATE"*) set_colors 2 7 - ascii_file="ubuntu-mate" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ubuntu_old") set_colors 1 7 3 - ascii_file="ubuntu_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Studio") set_colors 6 7 - ascii_file="ubuntu-studio" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu"*) set_colors 1 7 3 - ascii_file="ubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "void_small") set_colors 2 8 - ascii_file="void_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Void"*) set_colors 2 8 - ascii_file="void" + read -rd '' ascii_data <<'EOF' + +EOF ;; *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 - ascii_file="windows10" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Windows"*) set_colors 1 2 4 3 - ascii_file="windows" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Xubuntu"*) set_colors 4 7 1 - ascii_file="xubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Zorin"*) set_colors 4 6 - ascii_file="zorin" + read -rd '' ascii_data <<'EOF' + +EOF ;; *) From f790170578dd541bcbf2bf5f59f8b6267f79ac90 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:39:24 +1000 Subject: [PATCH 256/300] general: Start inlining ascii. --- neofetch | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 435 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index 2b89f8e1..bf6dbc9b 100755 --- a/neofetch +++ b/neofetch @@ -4745,14 +4745,49 @@ EOF "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; "Chakra"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; @@ -4773,140 +4808,425 @@ EOF "Chrom"*) set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' - +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; "crux_small") set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ EOF ;; "CRUX"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; "Debian"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${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._ + `""" EOF ;; "Deepin"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; "Devuan"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; "DracOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; "DragonFly"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; "FreeBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; @@ -4914,42 +5234,129 @@ EOF # Don't explicitly set colors since # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; "Frugalware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; "Funtoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; "Gentoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${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}.` + `-//////:--. EOF ;; From 473a5986e828b1d957210a7b0fe25434ef7aee40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:43:28 +1000 Subject: [PATCH 257/300] general: Start inlining ascii. --- neofetch | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 432 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index bf6dbc9b..a22e1120 100755 --- a/neofetch +++ b/neofetch @@ -5363,189 +5363,595 @@ EOF "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF ;; "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' - +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; EOF ;; "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' - +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF ;; "Grombyang"*) set_colors 4 2 1 read -rd '' ascii_data <<'EOF' - +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` EOF ;; "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} EOF ;; "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' - +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W EOF ;; "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' - +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . EOF ;; "KaOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. EOF ;; "KDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` EOF ;; "Kogaion"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; EOF ;; "Korora"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` EOF ;; "KSLinux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A EOF ;; "Kubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` EOF ;; "LEDE"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ EOF ;; "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' - +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### EOF ;; "LMDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` EOF ;; "Lubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` EOF ;; "Lunar"*) set_colors 4 7 3 read -rd '' ascii_data <<'EOF' - +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF ;; "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. EOF ;; "MagpieOS"*) set_colors 2 1 3 5 read -rd '' ascii_data <<'EOF' - +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. EOF ;; "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; "Mer"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs EOF ;; "Minix"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` EOF ;; From bdad66511a43ab29fd0e7981fbb6b9ba7823b22e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:48:02 +1000 Subject: [PATCH 258/300] general: Start inlining ascii. --- neofetch | 631 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 599 insertions(+), 32 deletions(-) diff --git a/neofetch b/neofetch index a22e1120..8a5eeb91 100755 --- a/neofetch +++ b/neofetch @@ -5958,231 +5958,798 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' - +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; "Netrunner"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; "Nitrux"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; "nixos_small") set_colors 4 6 read -rd '' ascii_data <<'EOF' - + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; "NuTyX"*) set_colors 4 1 read -rd '' ascii_data <<'EOF' - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; "OBRevenge"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; "openbsd_small") set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; "OpenMandriva"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' - +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; "Oracle"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; "Pardus"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; "Parrot"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; "Parsix"*) set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' - + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; "Peppermint"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; "Porteus"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; "Qubes"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' - +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; From e1f478f1d6257435093bb2c17bcab48717ca7c08 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:52:59 +1000 Subject: [PATCH 259/300] general: Start inlining ascii. --- neofetch | 609 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 579 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 8a5eeb91..0098fbc6 100755 --- a/neofetch +++ b/neofetch @@ -6756,203 +6756,684 @@ EOF "Refracted Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' - +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; "sabotage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; "Sabayon"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; "SalentOS"*) set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; "Scientific"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; "Siduction"*) set_colors 4 4 read -rd '' ascii_data <<'EOF' - +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; "SliTaz"*) set_colors 3 3 read -rd '' ascii_data <<'EOF' - +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; "SmartOS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; "Sparky"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; "SteamOS"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' - +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .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:^' EOF ;; "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; "Trisquel"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; "ubuntu_old") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; "Ubuntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .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+/-. EOF ;; "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; "Void"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; @@ -6960,28 +7441,96 @@ EOF "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; "Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' - +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; From 2f50cf2071ea76ad425e43e5d7c17bcdbae823fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:55:34 +1000 Subject: [PATCH 260/300] general: Start inlining ascii. --- neofetch | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0098fbc6..77960085 100755 --- a/neofetch +++ b/neofetch @@ -7538,32 +7538,131 @@ EOF case "$kernel_name" in *"BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF ;; "GNU"*) set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF ;; "SunOS") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF ;; "IRIX"*) set_colors 4 7 - ascii_file="irix" + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF ;; esac ;; From 1d3a4478f6e38b6f8e1854eacd50fdaf7460f194 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:59:37 +1000 Subject: [PATCH 261/300] general: Start inlining ascii. --- neofetch | 62 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 77960085..8ea185e9 100755 --- a/neofetch +++ b/neofetch @@ -4794,20 +4794,6 @@ EOF "ChaletOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' ${c1} `.//+osso+/:`` `/sdNNmhyssssydmNNdo:` :hNmy+-` .-+hNNs- @@ -4831,6 +4817,54 @@ ${c1} `.//+osso+/:`` EOF ;; + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; + + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 64fa49c0f11dc10fc4ce932e64aae29cf55c4633 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:04:15 +1000 Subject: [PATCH 262/300] general: Remove old files --- ascii/distro/aix | 20 ------------ ascii/distro/alpine | 20 ------------ ascii/distro/alpine_small | 6 ---- ascii/distro/amazon | 19 ----------- ascii/distro/anarchy | 28 ---------------- ascii/distro/android | 18 ----------- ascii/distro/antergos | 19 ----------- ascii/distro/antix | 13 -------- ascii/distro/aosc | 20 ------------ ascii/distro/apricity | 18 ----------- ascii/distro/arch | 19 ----------- ascii/distro/arch_old | 16 --------- ascii/distro/arch_small | 7 ---- ascii/distro/arch_xferience | 19 ----------- ascii/distro/archbox | 19 ----------- ascii/distro/archlabs | 21 ------------ ascii/distro/archmerge | 20 ------------ ascii/distro/arcolinux | 20 ------------ ascii/distro/artix | 19 ----------- ascii/distro/arya | 15 --------- ascii/distro/bitrig | 18 ----------- ascii/distro/blag | 17 ---------- ascii/distro/blankon | 17 ---------- ascii/distro/bsd | 19 ----------- ascii/distro/bunsenlabs | 20 ------------ ascii/distro/calculate | 20 ------------ ascii/distro/centos | 19 ----------- ascii/distro/chakra | 18 ----------- ascii/distro/chaletos | 20 ------------ ascii/distro/chapeau | 18 ----------- ascii/distro/chrome | 18 ----------- ascii/distro/cloveros | 20 ------------ ascii/distro/coreos | 20 ------------ ascii/distro/crux | 18 ----------- ascii/distro/crux_small | 7 ---- ascii/distro/debian | 17 ---------- ascii/distro/debian_small | 6 ---- ascii/distro/deepin | 18 ----------- ascii/distro/desaos | 16 --------- ascii/distro/devuan | 15 --------- ascii/distro/dracos | 13 -------- ascii/distro/dragonflybsd | 15 --------- ascii/distro/dragonflybsd_old | 18 ----------- ascii/distro/dragonflybsd_small | 4 --- ascii/distro/elementary | 17 ---------- ascii/distro/endless | 21 ------------ ascii/distro/exherbo | 22 ------------- ascii/distro/fedora | 17 ---------- ascii/distro/freebsd | 15 --------- ascii/distro/freebsd_small | 7 ---- ascii/distro/frugalware | 23 ------------- ascii/distro/funtoo | 11 ------- ascii/distro/galliumos | 19 ----------- ascii/distro/gem | 15 --------- ascii/distro/gentoo | 18 ----------- ascii/distro/gentoo_small | 7 ---- ascii/distro/gnewsense | 12 ------- ascii/distro/gnu | 18 ----------- ascii/distro/gobolinux | 6 ---- ascii/distro/grombyang | 18 ----------- ascii/distro/guixsd | 10 ------ ascii/distro/haiku | 17 ---------- ascii/distro/hyperbola | 16 --------- ascii/distro/irix | 19 ----------- ascii/distro/kali | 21 ------------ ascii/distro/kaos | 16 --------- ascii/distro/kde | 19 ----------- ascii/distro/kogaion | 20 ------------ ascii/distro/korora | 16 --------- ascii/distro/kslinux | 11 ------- ascii/distro/kubuntu | 20 ------------ ascii/distro/lede | 9 ------ ascii/distro/linux | 12 ------- ascii/distro/lmde | 17 ---------- ascii/distro/lubuntu | 20 ------------ ascii/distro/lunar | 13 -------- ascii/distro/mac | 18 ----------- ascii/distro/mac_small | 8 ----- ascii/distro/mageia | 19 ----------- ascii/distro/magpieos | 20 ------------ ascii/distro/manjaro | 14 -------- ascii/distro/maui | 20 ------------ ascii/distro/mer | 27 ---------------- ascii/distro/minix | 17 ---------- ascii/distro/mint | 16 --------- ascii/distro/mx | 17 ---------- ascii/distro/netbsd | 17 ---------- ascii/distro/netrunner | 20 ------------ ascii/distro/nitrux | 18 ----------- ascii/distro/nixos | 19 ----------- ascii/distro/nixos_small | 7 ---- ascii/distro/nurunner | 19 ----------- ascii/distro/nutyx | 23 ------------- ascii/distro/obrevenge | 18 ----------- ascii/distro/openbsd | 23 ------------- ascii/distro/openbsd_small | 7 ---- ascii/distro/openindiana | 16 --------- ascii/distro/openmandriva | 15 --------- ascii/distro/openwrt | 9 ------ ascii/distro/oracle | 12 ------- ascii/distro/osmc | 20 ------------ ascii/distro/pacbsd | 24 -------------- ascii/distro/parabola | 16 --------- ascii/distro/pardus | 18 ----------- ascii/distro/parrot | 24 -------------- ascii/distro/parsix | 21 ------------ ascii/distro/pclinuxos | 19 ----------- ascii/distro/peppermint | 19 ----------- ascii/distro/pop_os | 21 ------------ ascii/distro/porteus | 23 ------------- ascii/distro/postmarketos | 17 ---------- ascii/distro/puppy | 18 ----------- ascii/distro/qubes | 21 ------------ ascii/distro/raspbian | 23 ------------- ascii/distro/redhat | 16 --------- ascii/distro/redstar | 18 ----------- ascii/distro/refracta | 19 ----------- ascii/distro/rosa | 20 ------------ ascii/distro/sabayon | 18 ----------- ascii/distro/sabotage | 12 ------- ascii/distro/sailfishos | 18 ----------- ascii/distro/salentos | 20 ------------ ascii/distro/scientific | 20 ------------ ascii/distro/siduction | 21 ------------ ascii/distro/slackware | 21 ------------ ascii/distro/slitaz | 17 ---------- ascii/distro/smartos | 17 ---------- ascii/distro/solaris | 8 ----- ascii/distro/solus | 20 ------------ ascii/distro/source_mage | 21 ------------ ascii/distro/sparky | 21 ------------ ascii/distro/steamos | 18 ----------- ascii/distro/suse | 18 ----------- ascii/distro/swagarch | 15 --------- ascii/distro/tails | 19 ----------- ascii/distro/trisquel | 18 ----------- ascii/distro/trueos | 27 ---------------- ascii/distro/tumbleweed | 13 -------- ascii/distro/ubuntu | 20 ------------ ascii/distro/ubuntu-budgie | 20 ------------ ascii/distro/ubuntu-gnome | 16 --------- ascii/distro/ubuntu-mate | 20 ------------ ascii/distro/ubuntu-studio | 20 ------------ ascii/distro/ubuntu_old | 19 ----------- ascii/distro/void | 18 ----------- ascii/distro/void_small | 7 ---- ascii/distro/windows | 16 --------- ascii/distro/windows10 | 19 ----------- ascii/distro/xubuntu | 20 ------------ ascii/distro/zorin | 17 ---------- config/travis.conf | 55 ------------------------------- neofetch | 57 +++++++++++++++++++++++++++++++++ 152 files changed, 57 insertions(+), 2634 deletions(-) delete mode 100644 ascii/distro/aix delete mode 100644 ascii/distro/alpine delete mode 100644 ascii/distro/alpine_small delete mode 100644 ascii/distro/amazon delete mode 100644 ascii/distro/anarchy delete mode 100644 ascii/distro/android delete mode 100644 ascii/distro/antergos delete mode 100644 ascii/distro/antix delete mode 100644 ascii/distro/aosc delete mode 100644 ascii/distro/apricity delete mode 100644 ascii/distro/arch delete mode 100644 ascii/distro/arch_old delete mode 100644 ascii/distro/arch_small delete mode 100644 ascii/distro/arch_xferience delete mode 100644 ascii/distro/archbox delete mode 100644 ascii/distro/archlabs delete mode 100644 ascii/distro/archmerge delete mode 100644 ascii/distro/arcolinux delete mode 100644 ascii/distro/artix delete mode 100644 ascii/distro/arya delete mode 100644 ascii/distro/bitrig delete mode 100644 ascii/distro/blag delete mode 100644 ascii/distro/blankon delete mode 100644 ascii/distro/bsd delete mode 100644 ascii/distro/bunsenlabs delete mode 100644 ascii/distro/calculate delete mode 100644 ascii/distro/centos delete mode 100644 ascii/distro/chakra delete mode 100644 ascii/distro/chaletos delete mode 100644 ascii/distro/chapeau delete mode 100644 ascii/distro/chrome delete mode 100644 ascii/distro/cloveros delete mode 100644 ascii/distro/coreos delete mode 100644 ascii/distro/crux delete mode 100644 ascii/distro/crux_small delete mode 100644 ascii/distro/debian delete mode 100644 ascii/distro/debian_small delete mode 100644 ascii/distro/deepin delete mode 100644 ascii/distro/desaos delete mode 100644 ascii/distro/devuan delete mode 100644 ascii/distro/dracos delete mode 100644 ascii/distro/dragonflybsd delete mode 100644 ascii/distro/dragonflybsd_old delete mode 100644 ascii/distro/dragonflybsd_small delete mode 100644 ascii/distro/elementary delete mode 100644 ascii/distro/endless delete mode 100644 ascii/distro/exherbo delete mode 100644 ascii/distro/fedora delete mode 100644 ascii/distro/freebsd delete mode 100644 ascii/distro/freebsd_small delete mode 100644 ascii/distro/frugalware delete mode 100644 ascii/distro/funtoo delete mode 100644 ascii/distro/galliumos delete mode 100644 ascii/distro/gem delete mode 100644 ascii/distro/gentoo delete mode 100644 ascii/distro/gentoo_small delete mode 100644 ascii/distro/gnewsense delete mode 100644 ascii/distro/gnu delete mode 100644 ascii/distro/gobolinux delete mode 100644 ascii/distro/grombyang delete mode 100644 ascii/distro/guixsd delete mode 100644 ascii/distro/haiku delete mode 100644 ascii/distro/hyperbola delete mode 100644 ascii/distro/irix delete mode 100644 ascii/distro/kali delete mode 100644 ascii/distro/kaos delete mode 100644 ascii/distro/kde delete mode 100644 ascii/distro/kogaion delete mode 100644 ascii/distro/korora delete mode 100644 ascii/distro/kslinux delete mode 100644 ascii/distro/kubuntu delete mode 100644 ascii/distro/lede delete mode 100644 ascii/distro/linux delete mode 100644 ascii/distro/lmde delete mode 100644 ascii/distro/lubuntu delete mode 100644 ascii/distro/lunar delete mode 100644 ascii/distro/mac delete mode 100644 ascii/distro/mac_small delete mode 100644 ascii/distro/mageia delete mode 100644 ascii/distro/magpieos delete mode 100644 ascii/distro/manjaro delete mode 100644 ascii/distro/maui delete mode 100644 ascii/distro/mer delete mode 100644 ascii/distro/minix delete mode 100644 ascii/distro/mint delete mode 100644 ascii/distro/mx delete mode 100644 ascii/distro/netbsd delete mode 100644 ascii/distro/netrunner delete mode 100644 ascii/distro/nitrux delete mode 100644 ascii/distro/nixos delete mode 100644 ascii/distro/nixos_small delete mode 100644 ascii/distro/nurunner delete mode 100644 ascii/distro/nutyx delete mode 100644 ascii/distro/obrevenge delete mode 100644 ascii/distro/openbsd delete mode 100644 ascii/distro/openbsd_small delete mode 100644 ascii/distro/openindiana delete mode 100644 ascii/distro/openmandriva delete mode 100644 ascii/distro/openwrt delete mode 100644 ascii/distro/oracle delete mode 100644 ascii/distro/osmc delete mode 100644 ascii/distro/pacbsd delete mode 100644 ascii/distro/parabola delete mode 100644 ascii/distro/pardus delete mode 100644 ascii/distro/parrot delete mode 100644 ascii/distro/parsix delete mode 100644 ascii/distro/pclinuxos delete mode 100644 ascii/distro/peppermint delete mode 100644 ascii/distro/pop_os delete mode 100644 ascii/distro/porteus delete mode 100644 ascii/distro/postmarketos delete mode 100644 ascii/distro/puppy delete mode 100644 ascii/distro/qubes delete mode 100644 ascii/distro/raspbian delete mode 100644 ascii/distro/redhat delete mode 100644 ascii/distro/redstar delete mode 100644 ascii/distro/refracta delete mode 100644 ascii/distro/rosa delete mode 100644 ascii/distro/sabayon delete mode 100644 ascii/distro/sabotage delete mode 100644 ascii/distro/sailfishos delete mode 100644 ascii/distro/salentos delete mode 100644 ascii/distro/scientific delete mode 100644 ascii/distro/siduction delete mode 100644 ascii/distro/slackware delete mode 100644 ascii/distro/slitaz delete mode 100644 ascii/distro/smartos delete mode 100644 ascii/distro/solaris delete mode 100644 ascii/distro/solus delete mode 100644 ascii/distro/source_mage delete mode 100644 ascii/distro/sparky delete mode 100644 ascii/distro/steamos delete mode 100644 ascii/distro/suse delete mode 100644 ascii/distro/swagarch delete mode 100644 ascii/distro/tails delete mode 100644 ascii/distro/trisquel delete mode 100644 ascii/distro/trueos delete mode 100644 ascii/distro/tumbleweed delete mode 100644 ascii/distro/ubuntu delete mode 100644 ascii/distro/ubuntu-budgie delete mode 100644 ascii/distro/ubuntu-gnome delete mode 100644 ascii/distro/ubuntu-mate delete mode 100644 ascii/distro/ubuntu-studio delete mode 100644 ascii/distro/ubuntu_old delete mode 100644 ascii/distro/void delete mode 100644 ascii/distro/void_small delete mode 100644 ascii/distro/windows delete mode 100644 ascii/distro/windows10 delete mode 100644 ascii/distro/xubuntu delete mode 100644 ascii/distro/zorin delete mode 100644 config/travis.conf diff --git a/ascii/distro/aix b/ascii/distro/aix deleted file mode 100644 index 8526b7c6..00000000 --- a/ascii/distro/aix +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- diff --git a/ascii/distro/alpine b/ascii/distro/alpine deleted file mode 100644 index 8f9b8771..00000000 --- a/ascii/distro/alpine +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. diff --git a/ascii/distro/alpine_small b/ascii/distro/alpine_small deleted file mode 100644 index 9949011c..00000000 --- a/ascii/distro/alpine_small +++ /dev/null @@ -1,6 +0,0 @@ -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ diff --git a/ascii/distro/amazon b/ascii/distro/amazon deleted file mode 100644 index 050c5b3a..00000000 --- a/ascii/distro/amazon +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy deleted file mode 100644 index d0f5a140..00000000 --- a/ascii/distro/anarchy +++ /dev/null @@ -1,28 +0,0 @@ - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/android b/ascii/distro/android deleted file mode 100644 index 610622dd..00000000 --- a/ascii/distro/android +++ /dev/null @@ -1,18 +0,0 @@ -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs diff --git a/ascii/distro/antergos b/ascii/distro/antergos deleted file mode 100644 index 023af9bd..00000000 --- a/ascii/distro/antergos +++ /dev/null @@ -1,19 +0,0 @@ -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/antix b/ascii/distro/antix deleted file mode 100644 index c383774e..00000000 --- a/ascii/distro/antix +++ /dev/null @@ -1,13 +0,0 @@ -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' diff --git a/ascii/distro/aosc b/ascii/distro/aosc deleted file mode 100644 index 785ba7d9..00000000 --- a/ascii/distro/aosc +++ /dev/null @@ -1,20 +0,0 @@ -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. diff --git a/ascii/distro/apricity b/ascii/distro/apricity deleted file mode 100644 index eada9d6d..00000000 --- a/ascii/distro/apricity +++ /dev/null @@ -1,18 +0,0 @@ -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` diff --git a/ascii/distro/arch b/ascii/distro/arch deleted file mode 100644 index 3de103bb..00000000 --- a/ascii/distro/arch +++ /dev/null @@ -1,19 +0,0 @@ -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ diff --git a/ascii/distro/arch_old b/ascii/distro/arch_old deleted file mode 100644 index dbd6cefa..00000000 --- a/ascii/distro/arch_old +++ /dev/null @@ -1,16 +0,0 @@ -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! diff --git a/ascii/distro/arch_small b/ascii/distro/arch_small deleted file mode 100644 index 26757617..00000000 --- a/ascii/distro/arch_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ diff --git a/ascii/distro/arch_xferience b/ascii/distro/arch_xferience deleted file mode 100644 index f1757f92..00000000 --- a/ascii/distro/arch_xferience +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` diff --git a/ascii/distro/archbox b/ascii/distro/archbox deleted file mode 100644 index a35a15c6..00000000 --- a/ascii/distro/archbox +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs deleted file mode 100644 index 74f8a026..00000000 --- a/ascii/distro/archlabs +++ /dev/null @@ -1,21 +0,0 @@ -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge deleted file mode 100644 index c849851e..00000000 --- a/ascii/distro/archmerge +++ /dev/null @@ -1,20 +0,0 @@ -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. diff --git a/ascii/distro/arcolinux b/ascii/distro/arcolinux deleted file mode 100644 index 0a42c6ad..00000000 --- a/ascii/distro/arcolinux +++ /dev/null @@ -1,20 +0,0 @@ -${c2} /- - ooo: - yoooo/ - yooooooo - yooooooooo - yooooooooooo - .yooooooooooooo - .oooooooooooooooo - .oooooooarcoooooooo - .ooooooooo-oooooooooo - .ooooooooo- oooooooooo - :ooooooooo. :ooooooooo - :ooooooooo. :ooooooooo - :oooarcooo .oooarcooo - :ooooooooy .ooooooooo - :ooooooooo ${c1}/ooooooooooooooooooo${c2} - :ooooooooo ${c1}.-ooooooooooooooooo.${c2} - ooooooooo- ${c1}-ooooooooooooo.${c2} - ooooooooo- ${c1}.-oooooooooo.${c2} -ooooooooo. ${c1}-ooooooooo${c2} \ No newline at end of file diff --git a/ascii/distro/artix b/ascii/distro/artix deleted file mode 100644 index 3ac30d3d..00000000 --- a/ascii/distro/artix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... diff --git a/ascii/distro/arya b/ascii/distro/arya deleted file mode 100644 index 7d603e20..00000000 --- a/ascii/distro/arya +++ /dev/null @@ -1,15 +0,0 @@ -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy diff --git a/ascii/distro/bitrig b/ascii/distro/bitrig deleted file mode 100644 index 8daebf5f..00000000 --- a/ascii/distro/bitrig +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms - diff --git a/ascii/distro/blag b/ascii/distro/blag deleted file mode 100644 index 047444cc..00000000 --- a/ascii/distro/blag +++ /dev/null @@ -1,17 +0,0 @@ -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: diff --git a/ascii/distro/blankon b/ascii/distro/blankon deleted file mode 100644 index 43bbd786..00000000 --- a/ascii/distro/blankon +++ /dev/null @@ -1,17 +0,0 @@ -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. diff --git a/ascii/distro/bsd b/ascii/distro/bsd deleted file mode 100644 index 91c9a7ae..00000000 --- a/ascii/distro/bsd +++ /dev/null @@ -1,19 +0,0 @@ -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) diff --git a/ascii/distro/bunsenlabs b/ascii/distro/bunsenlabs deleted file mode 100644 index 93796823..00000000 --- a/ascii/distro/bunsenlabs +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ diff --git a/ascii/distro/calculate b/ascii/distro/calculate deleted file mode 100644 index a6b256c4..00000000 --- a/ascii/distro/calculate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/centos b/ascii/distro/centos deleted file mode 100644 index e56aa5dd..00000000 --- a/ascii/distro/centos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' diff --git a/ascii/distro/chakra b/ascii/distro/chakra deleted file mode 100644 index 28227b92..00000000 --- a/ascii/distro/chakra +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" diff --git a/ascii/distro/chaletos b/ascii/distro/chaletos deleted file mode 100644 index 6473a5cc..00000000 --- a/ascii/distro/chaletos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` diff --git a/ascii/distro/chapeau b/ascii/distro/chapeau deleted file mode 100644 index 6107817c..00000000 --- a/ascii/distro/chapeau +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- diff --git a/ascii/distro/chrome b/ascii/distro/chrome deleted file mode 100644 index 951bf190..00000000 --- a/ascii/distro/chrome +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. diff --git a/ascii/distro/cloveros b/ascii/distro/cloveros deleted file mode 100644 index 9996c77c..00000000 --- a/ascii/distro/cloveros +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` diff --git a/ascii/distro/coreos b/ascii/distro/coreos deleted file mode 100644 index 605d5050..00000000 --- a/ascii/distro/coreos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... diff --git a/ascii/distro/crux b/ascii/distro/crux deleted file mode 100644 index b5af7baa..00000000 --- a/ascii/distro/crux +++ /dev/null @@ -1,18 +0,0 @@ -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo diff --git a/ascii/distro/crux_small b/ascii/distro/crux_small deleted file mode 100644 index 4b64001d..00000000 --- a/ascii/distro/crux_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ diff --git a/ascii/distro/debian b/ascii/distro/debian deleted file mode 100644 index df88d079..00000000 --- a/ascii/distro/debian +++ /dev/null @@ -1,17 +0,0 @@ -${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/ascii/distro/debian_small b/ascii/distro/debian_small deleted file mode 100644 index 64cbb56c..00000000 --- a/ascii/distro/debian_small +++ /dev/null @@ -1,6 +0,0 @@ - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ diff --git a/ascii/distro/deepin b/ascii/distro/deepin deleted file mode 100644 index a44f4dad..00000000 --- a/ascii/distro/deepin +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. diff --git a/ascii/distro/desaos b/ascii/distro/desaos deleted file mode 100644 index 81d8b55e..00000000 --- a/ascii/distro/desaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ diff --git a/ascii/distro/devuan b/ascii/distro/devuan deleted file mode 100644 index 4173782f..00000000 --- a/ascii/distro/devuan +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` diff --git a/ascii/distro/dracos b/ascii/distro/dracos deleted file mode 100644 index 3eb2a70b..00000000 --- a/ascii/distro/dracos +++ /dev/null @@ -1,13 +0,0 @@ -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd deleted file mode 100644 index 7ccc14bc..00000000 --- a/ascii/distro/dragonflybsd +++ /dev/null @@ -1,15 +0,0 @@ -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old deleted file mode 100644 index 3276d4f0..00000000 --- a/ascii/distro/dragonflybsd_old +++ /dev/null @@ -1,18 +0,0 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small deleted file mode 100644 index 3a48a925..00000000 --- a/ascii/distro/dragonflybsd_small +++ /dev/null @@ -1,4 +0,0 @@ -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | diff --git a/ascii/distro/elementary b/ascii/distro/elementary deleted file mode 100644 index 8614c746..00000000 --- a/ascii/distro/elementary +++ /dev/null @@ -1,17 +0,0 @@ -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/endless b/ascii/distro/endless deleted file mode 100644 index fbff54b9..00000000 --- a/ascii/distro/endless +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` - diff --git a/ascii/distro/exherbo b/ascii/distro/exherbo deleted file mode 100644 index edacf81a..00000000 --- a/ascii/distro/exherbo +++ /dev/null @@ -1,22 +0,0 @@ -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' diff --git a/ascii/distro/fedora b/ascii/distro/fedora deleted file mode 100644 index f0ba391b..00000000 --- a/ascii/distro/fedora +++ /dev/null @@ -1,17 +0,0 @@ -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// diff --git a/ascii/distro/freebsd b/ascii/distro/freebsd deleted file mode 100644 index 6ef67782..00000000 --- a/ascii/distro/freebsd +++ /dev/null @@ -1,15 +0,0 @@ - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. diff --git a/ascii/distro/freebsd_small b/ascii/distro/freebsd_small deleted file mode 100644 index 943c147e..00000000 --- a/ascii/distro/freebsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- diff --git a/ascii/distro/frugalware b/ascii/distro/frugalware deleted file mode 100644 index b11961ba..00000000 --- a/ascii/distro/frugalware +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` diff --git a/ascii/distro/funtoo b/ascii/distro/funtoo deleted file mode 100644 index 13079091..00000000 --- a/ascii/distro/funtoo +++ /dev/null @@ -1,11 +0,0 @@ -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ diff --git a/ascii/distro/galliumos b/ascii/distro/galliumos deleted file mode 100644 index ae9681d5..00000000 --- a/ascii/distro/galliumos +++ /dev/null @@ -1,19 +0,0 @@ -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: diff --git a/ascii/distro/gem b/ascii/distro/gem deleted file mode 100644 index 49c8849d..00000000 --- a/ascii/distro/gem +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## diff --git a/ascii/distro/gentoo b/ascii/distro/gentoo deleted file mode 100644 index 3bec6daa..00000000 --- a/ascii/distro/gentoo +++ /dev/null @@ -1,18 +0,0 @@ -${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/ascii/distro/gentoo_small b/ascii/distro/gentoo_small deleted file mode 100644 index a1e7a0ba..00000000 --- a/ascii/distro/gentoo_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- diff --git a/ascii/distro/gnewsense b/ascii/distro/gnewsense deleted file mode 100644 index b98b859b..00000000 --- a/ascii/distro/gnewsense +++ /dev/null @@ -1,12 +0,0 @@ -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' diff --git a/ascii/distro/gnu b/ascii/distro/gnu deleted file mode 100644 index e4b4c017..00000000 --- a/ascii/distro/gnu +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; diff --git a/ascii/distro/gobolinux b/ascii/distro/gobolinux deleted file mode 100644 index 443cfbca..00000000 --- a/ascii/distro/gobolinux +++ /dev/null @@ -1,6 +0,0 @@ -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ diff --git a/ascii/distro/grombyang b/ascii/distro/grombyang deleted file mode 100644 index 6dfbea9b..00000000 --- a/ascii/distro/grombyang +++ /dev/null @@ -1,18 +0,0 @@ -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/guixsd b/ascii/distro/guixsd deleted file mode 100644 index 6d6345ec..00000000 --- a/ascii/distro/guixsd +++ /dev/null @@ -1,10 +0,0 @@ -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` diff --git a/ascii/distro/haiku b/ascii/distro/haiku deleted file mode 100644 index 56a7feb4..00000000 --- a/ascii/distro/haiku +++ /dev/null @@ -1,17 +0,0 @@ -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola deleted file mode 100644 index 5e013359..00000000 --- a/ascii/distro/hyperbola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W diff --git a/ascii/distro/irix b/ascii/distro/irix deleted file mode 100644 index 57ce2121..00000000 --- a/ascii/distro/irix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. diff --git a/ascii/distro/kali b/ascii/distro/kali deleted file mode 100644 index d1e01da6..00000000 --- a/ascii/distro/kali +++ /dev/null @@ -1,21 +0,0 @@ -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . diff --git a/ascii/distro/kaos b/ascii/distro/kaos deleted file mode 100644 index 830835e4..00000000 --- a/ascii/distro/kaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. diff --git a/ascii/distro/kde b/ascii/distro/kde deleted file mode 100644 index 16809700..00000000 --- a/ascii/distro/kde +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` diff --git a/ascii/distro/kogaion b/ascii/distro/kogaion deleted file mode 100644 index 47ed962e..00000000 --- a/ascii/distro/kogaion +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; diff --git a/ascii/distro/korora b/ascii/distro/korora deleted file mode 100644 index 709289af..00000000 --- a/ascii/distro/korora +++ /dev/null @@ -1,16 +0,0 @@ -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` diff --git a/ascii/distro/kslinux b/ascii/distro/kslinux deleted file mode 100644 index 53385bd8..00000000 --- a/ascii/distro/kslinux +++ /dev/null @@ -1,11 +0,0 @@ -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo - -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu deleted file mode 100644 index 6302ff0f..00000000 --- a/ascii/distro/kubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` diff --git a/ascii/distro/lede b/ascii/distro/lede deleted file mode 100644 index b1af9495..00000000 --- a/ascii/distro/lede +++ /dev/null @@ -1,9 +0,0 @@ - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ diff --git a/ascii/distro/linux b/ascii/distro/linux deleted file mode 100644 index f31dd29f..00000000 --- a/ascii/distro/linux +++ /dev/null @@ -1,12 +0,0 @@ -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### diff --git a/ascii/distro/lmde b/ascii/distro/lmde deleted file mode 100644 index 5161881e..00000000 --- a/ascii/distro/lmde +++ /dev/null @@ -1,17 +0,0 @@ - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` diff --git a/ascii/distro/lubuntu b/ascii/distro/lubuntu deleted file mode 100644 index 9731cb3e..00000000 --- a/ascii/distro/lubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` diff --git a/ascii/distro/lunar b/ascii/distro/lunar deleted file mode 100644 index 26bd295c..00000000 --- a/ascii/distro/lunar +++ /dev/null @@ -1,13 +0,0 @@ -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| diff --git a/ascii/distro/mac b/ascii/distro/mac deleted file mode 100644 index 3ca5ea31..00000000 --- a/ascii/distro/mac +++ /dev/null @@ -1,18 +0,0 @@ -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. - diff --git a/ascii/distro/mac_small b/ascii/distro/mac_small deleted file mode 100644 index 24852ff1..00000000 --- a/ascii/distro/mac_small +++ /dev/null @@ -1,8 +0,0 @@ -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' diff --git a/ascii/distro/mageia b/ascii/distro/mageia deleted file mode 100644 index af01caba..00000000 --- a/ascii/distro/mageia +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos deleted file mode 100644 index 6859d96b..00000000 --- a/ascii/distro/magpieos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. diff --git a/ascii/distro/manjaro b/ascii/distro/manjaro deleted file mode 100644 index 89fa7a2f..00000000 --- a/ascii/distro/manjaro +++ /dev/null @@ -1,14 +0,0 @@ -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ diff --git a/ascii/distro/maui b/ascii/distro/maui deleted file mode 100644 index 1ab9c07d..00000000 --- a/ascii/distro/maui +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` diff --git a/ascii/distro/mer b/ascii/distro/mer deleted file mode 100644 index a98f3eb1..00000000 --- a/ascii/distro/mer +++ /dev/null @@ -1,27 +0,0 @@ -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs diff --git a/ascii/distro/minix b/ascii/distro/minix deleted file mode 100644 index a0ff143c..00000000 --- a/ascii/distro/minix +++ /dev/null @@ -1,17 +0,0 @@ -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` diff --git a/ascii/distro/mint b/ascii/distro/mint deleted file mode 100644 index c7e59d99..00000000 --- a/ascii/distro/mint +++ /dev/null @@ -1,16 +0,0 @@ -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/mx b/ascii/distro/mx deleted file mode 100644 index 9fc44075..00000000 --- a/ascii/distro/mx +++ /dev/null @@ -1,17 +0,0 @@ -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/netbsd b/ascii/distro/netbsd deleted file mode 100644 index 6048ee3a..00000000 --- a/ascii/distro/netbsd +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms diff --git a/ascii/distro/netrunner b/ascii/distro/netrunner deleted file mode 100644 index 4230bc09..00000000 --- a/ascii/distro/netrunner +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` diff --git a/ascii/distro/nitrux b/ascii/distro/nitrux deleted file mode 100644 index 2f49d638..00000000 --- a/ascii/distro/nitrux +++ /dev/null @@ -1,18 +0,0 @@ -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- diff --git a/ascii/distro/nixos b/ascii/distro/nixos deleted file mode 100644 index d1a35bd2..00000000 --- a/ascii/distro/nixos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. diff --git a/ascii/distro/nixos_small b/ascii/distro/nixos_small deleted file mode 100644 index 0917ff8e..00000000 --- a/ascii/distro/nixos_small +++ /dev/null @@ -1,7 +0,0 @@ - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ diff --git a/ascii/distro/nurunner b/ascii/distro/nurunner deleted file mode 100644 index e5529673..00000000 --- a/ascii/distro/nurunner +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx deleted file mode 100644 index 84a6cc5a..00000000 --- a/ascii/distro/nutyx +++ /dev/null @@ -1,23 +0,0 @@ -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . \ No newline at end of file diff --git a/ascii/distro/obrevenge b/ascii/distro/obrevenge deleted file mode 100644 index 87b50f40..00000000 --- a/ascii/distro/obrevenge +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll diff --git a/ascii/distro/openbsd b/ascii/distro/openbsd deleted file mode 100644 index d3812019..00000000 --- a/ascii/distro/openbsd +++ /dev/null @@ -1,23 +0,0 @@ - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ diff --git a/ascii/distro/openbsd_small b/ascii/distro/openbsd_small deleted file mode 100644 index bb6e646a..00000000 --- a/ascii/distro/openbsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ diff --git a/ascii/distro/openindiana b/ascii/distro/openindiana deleted file mode 100644 index c76d8f7b..00000000 --- a/ascii/distro/openindiana +++ /dev/null @@ -1,16 +0,0 @@ -${c2} .sy/ - .yh+ - - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` diff --git a/ascii/distro/openmandriva b/ascii/distro/openmandriva deleted file mode 100644 index ef3e8439..00000000 --- a/ascii/distro/openmandriva +++ /dev/null @@ -1,15 +0,0 @@ -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` diff --git a/ascii/distro/openwrt b/ascii/distro/openwrt deleted file mode 100644 index 903068b0..00000000 --- a/ascii/distro/openwrt +++ /dev/null @@ -1,9 +0,0 @@ -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| diff --git a/ascii/distro/oracle b/ascii/distro/oracle deleted file mode 100644 index cdd61c55..00000000 --- a/ascii/distro/oracle +++ /dev/null @@ -1,12 +0,0 @@ -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` diff --git a/ascii/distro/osmc b/ascii/distro/osmc deleted file mode 100644 index f18c2e99..00000000 --- a/ascii/distro/osmc +++ /dev/null @@ -1,20 +0,0 @@ -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd deleted file mode 100644 index 000e93a0..00000000 --- a/ascii/distro/pacbsd +++ /dev/null @@ -1,24 +0,0 @@ -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. diff --git a/ascii/distro/parabola b/ascii/distro/parabola deleted file mode 100644 index 33c38bd5..00000000 --- a/ascii/distro/parabola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. diff --git a/ascii/distro/pardus b/ascii/distro/pardus deleted file mode 100644 index ae817579..00000000 --- a/ascii/distro/pardus +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- diff --git a/ascii/distro/parrot b/ascii/distro/parrot deleted file mode 100644 index af98994d..00000000 --- a/ascii/distro/parrot +++ /dev/null @@ -1,24 +0,0 @@ -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - diff --git a/ascii/distro/parsix b/ascii/distro/parsix deleted file mode 100644 index 2753a461..00000000 --- a/ascii/distro/parsix +++ /dev/null @@ -1,21 +0,0 @@ - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` diff --git a/ascii/distro/pclinuxos b/ascii/distro/pclinuxos deleted file mode 100644 index 963d3929..00000000 --- a/ascii/distro/pclinuxos +++ /dev/null @@ -1,19 +0,0 @@ - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN diff --git a/ascii/distro/peppermint b/ascii/distro/peppermint deleted file mode 100644 index be0a953b..00000000 --- a/ascii/distro/peppermint +++ /dev/null @@ -1,19 +0,0 @@ -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os deleted file mode 100644 index a399f18f..00000000 --- a/ascii/distro/pop_os +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// - diff --git a/ascii/distro/porteus b/ascii/distro/porteus deleted file mode 100644 index 82cc7aa9..00000000 --- a/ascii/distro/porteus +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos deleted file mode 100644 index a2ebc838..00000000 --- a/ascii/distro/postmarketos +++ /dev/null @@ -1,17 +0,0 @@ -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/ascii/distro/puppy b/ascii/distro/puppy deleted file mode 100644 index 7cdc1c2d..00000000 --- a/ascii/distro/puppy +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. diff --git a/ascii/distro/qubes b/ascii/distro/qubes deleted file mode 100644 index 3867fa6f..00000000 --- a/ascii/distro/qubes +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. diff --git a/ascii/distro/raspbian b/ascii/distro/raspbian deleted file mode 100644 index 472b74eb..00000000 --- a/ascii/distro/raspbian +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` diff --git a/ascii/distro/redhat b/ascii/distro/redhat deleted file mode 100644 index 868521f4..00000000 --- a/ascii/distro/redhat +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM diff --git a/ascii/distro/redstar b/ascii/distro/redstar deleted file mode 100644 index 6c15233f..00000000 --- a/ascii/distro/redstar +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... diff --git a/ascii/distro/refracta b/ascii/distro/refracta deleted file mode 100644 index 396474b5..00000000 --- a/ascii/distro/refracta +++ /dev/null @@ -1,19 +0,0 @@ -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ - diff --git a/ascii/distro/rosa b/ascii/distro/rosa deleted file mode 100644 index fcbad876..00000000 --- a/ascii/distro/rosa +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR diff --git a/ascii/distro/sabayon b/ascii/distro/sabayon deleted file mode 100644 index bfd51eed..00000000 --- a/ascii/distro/sabayon +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... diff --git a/ascii/distro/sabotage b/ascii/distro/sabotage deleted file mode 100644 index d4490fc8..00000000 --- a/ascii/distro/sabotage +++ /dev/null @@ -1,12 +0,0 @@ - -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| diff --git a/ascii/distro/sailfishos b/ascii/distro/sailfishos deleted file mode 100644 index a7dd91b4..00000000 --- a/ascii/distro/sailfishos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e diff --git a/ascii/distro/salentos b/ascii/distro/salentos deleted file mode 100644 index f41ee747..00000000 --- a/ascii/distro/salentos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. diff --git a/ascii/distro/scientific b/ascii/distro/scientific deleted file mode 100644 index 82e9553f..00000000 --- a/ascii/distro/scientific +++ /dev/null @@ -1,20 +0,0 @@ -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' diff --git a/ascii/distro/siduction b/ascii/distro/siduction deleted file mode 100644 index c9720a60..00000000 --- a/ascii/distro/siduction +++ /dev/null @@ -1,21 +0,0 @@ -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" - diff --git a/ascii/distro/slackware b/ascii/distro/slackware deleted file mode 100644 index 9ffde3dc..00000000 --- a/ascii/distro/slackware +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: diff --git a/ascii/distro/slitaz b/ascii/distro/slitaz deleted file mode 100644 index 5ee52706..00000000 --- a/ascii/distro/slitaz +++ /dev/null @@ -1,17 +0,0 @@ -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ diff --git a/ascii/distro/smartos b/ascii/distro/smartos deleted file mode 100644 index 59cea693..00000000 --- a/ascii/distro/smartos +++ /dev/null @@ -1,17 +0,0 @@ -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/ascii/distro/solaris b/ascii/distro/solaris deleted file mode 100644 index 95a7f1a1..00000000 --- a/ascii/distro/solaris +++ /dev/null @@ -1,8 +0,0 @@ -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. diff --git a/ascii/distro/solus b/ascii/distro/solus deleted file mode 100644 index 75637543..00000000 --- a/ascii/distro/solus +++ /dev/null @@ -1,20 +0,0 @@ -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` diff --git a/ascii/distro/source_mage b/ascii/distro/source_mage deleted file mode 100644 index 39a440e8..00000000 --- a/ascii/distro/source_mage +++ /dev/null @@ -1,21 +0,0 @@ -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. diff --git a/ascii/distro/sparky b/ascii/distro/sparky deleted file mode 100644 index 82acb5a0..00000000 --- a/ascii/distro/sparky +++ /dev/null @@ -1,21 +0,0 @@ -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` diff --git a/ascii/distro/steamos b/ascii/distro/steamos deleted file mode 100644 index c17b16b6..00000000 --- a/ascii/distro/steamos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' diff --git a/ascii/distro/suse b/ascii/distro/suse deleted file mode 100644 index 6cc0433c..00000000 --- a/ascii/distro/suse +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .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:^' diff --git a/ascii/distro/swagarch b/ascii/distro/swagarch deleted file mode 100644 index e3884f15..00000000 --- a/ascii/distro/swagarch +++ /dev/null @@ -1,15 +0,0 @@ -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' diff --git a/ascii/distro/tails b/ascii/distro/tails deleted file mode 100644 index a0512bc6..00000000 --- a/ascii/distro/tails +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` diff --git a/ascii/distro/trisquel b/ascii/distro/trisquel deleted file mode 100644 index 07634b83..00000000 --- a/ascii/distro/trisquel +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ diff --git a/ascii/distro/trueos b/ascii/distro/trueos deleted file mode 100644 index 84bc618a..00000000 --- a/ascii/distro/trueos +++ /dev/null @@ -1,27 +0,0 @@ -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed deleted file mode 100644 index 37ee33ad..00000000 --- a/ascii/distro/tumbleweed +++ /dev/null @@ -1,13 +0,0 @@ -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, diff --git a/ascii/distro/ubuntu b/ascii/distro/ubuntu deleted file mode 100644 index db5df090..00000000 --- a/ascii/distro/ubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .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+/-. diff --git a/ascii/distro/ubuntu-budgie b/ascii/distro/ubuntu-budgie deleted file mode 100644 index 1faec715..00000000 --- a/ascii/distro/ubuntu-budgie +++ /dev/null @@ -1,20 +0,0 @@ -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. diff --git a/ascii/distro/ubuntu-gnome b/ascii/distro/ubuntu-gnome deleted file mode 100644 index 096dca3d..00000000 --- a/ascii/distro/ubuntu-gnome +++ /dev/null @@ -1,16 +0,0 @@ -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` diff --git a/ascii/distro/ubuntu-mate b/ascii/distro/ubuntu-mate deleted file mode 100644 index 893389fe..00000000 --- a/ascii/distro/ubuntu-mate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` diff --git a/ascii/distro/ubuntu-studio b/ascii/distro/ubuntu-studio deleted file mode 100644 index 2deb270e..00000000 --- a/ascii/distro/ubuntu-studio +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. diff --git a/ascii/distro/ubuntu_old b/ascii/distro/ubuntu_old deleted file mode 100644 index 4e3664b6..00000000 --- a/ascii/distro/ubuntu_old +++ /dev/null @@ -1,19 +0,0 @@ - -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. diff --git a/ascii/distro/void b/ascii/distro/void deleted file mode 100644 index 2a089e63..00000000 --- a/ascii/distro/void +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ diff --git a/ascii/distro/void_small b/ascii/distro/void_small deleted file mode 100644 index adfae49b..00000000 --- a/ascii/distro/void_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ diff --git a/ascii/distro/windows b/ascii/distro/windows deleted file mode 100644 index 31564309..00000000 --- a/ascii/distro/windows +++ /dev/null @@ -1,16 +0,0 @@ -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` diff --git a/ascii/distro/windows10 b/ascii/distro/windows10 deleted file mode 100644 index 62596129..00000000 --- a/ascii/distro/windows10 +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` diff --git a/ascii/distro/xubuntu b/ascii/distro/xubuntu deleted file mode 100644 index b872562b..00000000 --- a/ascii/distro/xubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` diff --git a/ascii/distro/zorin b/ascii/distro/zorin deleted file mode 100644 index bb051669..00000000 --- a/ascii/distro/zorin +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` diff --git a/config/travis.conf b/config/travis.conf deleted file mode 100644 index 0dada093..00000000 --- a/config/travis.conf +++ /dev/null @@ -1,55 +0,0 @@ -# Neofetch config file for travis.ci -# https://github.com/dylanaraps/neofetch - -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk -} - -refresh_rate="on" -shell_version="on" -cpu_display="infobar" -memory_display="infobar" -disk_display="infobar" -cpu_temp="C" diff --git a/neofetch b/neofetch index 8ea185e9..195cb6f1 100755 --- a/neofetch +++ b/neofetch @@ -3460,6 +3460,8 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." + else + ascii_data="$(< "$image_source")" fi # Set locale to get correct padding. @@ -8557,6 +8559,61 @@ get_args() { -N ./neofetch -o neofetch.1 exit 1 ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; esac shift From f6d93420f83b39a368584f1360505e87c31d9640 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:05:42 +1000 Subject: [PATCH 263/300] general: Adjust makefile --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 99ec43b2..7870d456 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ PREFIX ?= /usr -SYSCONFDIR ?= /etc MANDIR ?= $(PREFIX)/share/man all: @@ -8,22 +7,15 @@ all: install: @echo 'Making directories...' @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro @mkdir -p $(DESTDIR)$(MANDIR)/man1 - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/neofetch @echo 'Installing binaries...' - @sed "s|ASCIIDIR|$(PREFIX)/share/neofetch/ascii/distro|g;s|CONFDIR|$(SYSCONFDIR)/neofetch|g" < neofetch > $(DESTDIR)$(PREFIX)/bin/neofetch @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - @echo 'Installing ASCII files, man page and config file...' - @cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro + @echo 'Installing man page...' @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - @cp -p config/config.conf $(DESTDIR)$(SYSCONFDIR)/neofetch/config.conf uninstall: @echo 'Removing files...' @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* - @rm -rf $(DESTDIR)$(PREFIX)/share/neofetch - @rm -rf $(DESTDIR)$(SYSCONFDIR)/neofetch From 8793fdbe6b082f71d726c2c0c205334b3c0240c4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:12:42 +1000 Subject: [PATCH 264/300] theme: Fixes for bash3 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 195cb6f1..e3c3d92e 100755 --- a/neofetch +++ b/neofetch @@ -32,7 +32,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. -readarray -t config <<'EOM' +read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info print_info() { @@ -801,7 +801,7 @@ stdout="off" # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. config_version="3.4.1-git" -EOM +EOF # DETECT INFORMATION @@ -7842,7 +7842,7 @@ get_user_config() { config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. - printf "%s\n" "${config[@]}" > "$config_file" + printf "%s\n" "$config" > "$config_file" fi source "$config_file" @@ -8625,7 +8625,7 @@ main() { get_os # Load default config. - source /dev/stdin < <(printf "%s\\n" "${config[@]}") + source /dev/stdin < <(printf "%s\n" "$config") get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From a5a850c3665f58ab6dd7a4539e15b5f682b80ad6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:17:43 +1000 Subject: [PATCH 265/300] ascii: Update android ascii --- neofetch | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index e3c3d92e..3c6f2bea 100755 --- a/neofetch +++ b/neofetch @@ -4272,21 +4272,25 @@ EOF "Android"*) set_colors 2 7 - ascii_length_force=19 read -rd '' ascii_data <<'EOF' -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; From 75807e0711a9e8e41cf1540a72cdaf37d1039de1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:21:33 +1000 Subject: [PATCH 266/300] travis: Added another exclude. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96df785..af3a372e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - time ./neofetch --ascii --config config/travis.conf -v # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1117; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. From b8c2db973dcdd0ca945d3bb9dbfb235a5bfddb66 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:22:25 +1000 Subject: [PATCH 267/300] travis: Remove line limit. Will still be enforced by hand. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index af3a372e..532ca462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,3 @@ script: # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi - # The if statement is here to invert the exit code from grep. - # grep normally errors if no match is found but we want the opposite. - # We invert it so grep fails if a match is found. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi From 97bd3902955d5f15a1febec05f1eea1639126fbb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:09:04 +1000 Subject: [PATCH 268/300] General: Move ascii art to the bottom of the script. --- neofetch | 1816 +++++++++++++++++++++++++++--------------------------- 1 file changed, 908 insertions(+), 908 deletions(-) diff --git a/neofetch b/neofetch index 3c6f2bea..ee0bf708 100755 --- a/neofetch +++ b/neofetch @@ -4141,6 +4141,914 @@ uppercase() { # COLORS +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +color() { + case "$1" in + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" + + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done + + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" + + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} + +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi + + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} + +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} + +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} + +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + ;; + esac +} + +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" + ;; + esac + + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi + + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} + +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi + + get_birthday() { get_install_date; birthday="$install_date"; } +} + +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac + ;; + *) time="$4" ;; + esac + + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" + ;; + + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; + + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + ;; + esac + + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" + ;; + + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" + ;; + + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" + ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + 'sixel', 'tycat', 'w3m' + --source source Which image or ascii file to use. + Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; + + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; + + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; + + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; + + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; + + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done +} + get_distro_colors() { # This function sets the text colors according # to your OS/Distro's logo colors. @@ -7716,914 +8624,6 @@ EOF fi } -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -color() { - case "$1" in - [0-6]) printf "%b" "${reset}\e[3${1}m" ;; - 7 | "fg") printf "%b" "\e[37m${reset}" ;; - *) printf "%b" "\e[38;5;${1}m" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" - - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} - -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" - - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi - - kde_config_dir="${kde_config_dir/$'/:'*}" -} - -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac - - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi - - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" - ;; - - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" - ;; - - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" - ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text - -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks - -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' - --source source Which image or ascii file to use. - Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. - - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print - - NOTE: Arch and Ubuntu have 'old' logo variants. - - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. - - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. - - Possible values: bar, infobar, barinfo, off - -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast - - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. - - NOTE: --gap can take a negative value which will move the text - closer to the left side. - - --clean Delete cached files and thumbnails. - -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. - -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - - -Report bugs to https://github.com/dylanaraps/neofetch/issues - -" -exit 1 -} - -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config - - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; - - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; - - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; - - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; - - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; - - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; - - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; - - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; - - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; - - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; - - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; - - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; - - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; - - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; - - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - - "--travis") - print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk - } - - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac - - shift - done -} - main() { cache_uname get_os From da49581b731907d04cd137f7e230e3e38733e34b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:22:56 +1000 Subject: [PATCH 269/300] general: In-lined license --- neofetch | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ee0bf708..28c516ce 100755 --- a/neofetch +++ b/neofetch @@ -1,12 +1,30 @@ #!/usr/bin/env bash -# set -x # vim: noai:ts=4:sw=4:expandtab # -# Neofetch: Simple system information script. +# Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch # -# Created by Dylan Araps -# https://github.com/dylanaraps/ +# The MIT License (MIT) +# +# Copyright (c) 2016-2017 Dylan Araps +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # Neofetch version. version="3.4.1-git" From c9a4ae4b1a34184cd33e42bd7975213162727ec0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:56:18 +1000 Subject: [PATCH 270/300] general: Remove Makefile --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 7870d456..00000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man - -all: - @echo Run \'make install\' to install Neofetch. - -install: - @echo 'Making directories...' - @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(MANDIR)/man1 - - @echo 'Installing binaries...' - @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - - @echo 'Installing man page...' - @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - -uninstall: - @echo 'Removing files...' - @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch - @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From f31f2a40f006b62395ae91bc8773e66911b62420 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:33:32 +1000 Subject: [PATCH 271/300] general: Added missing ascii --- neofetch | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 28c516ce..f5251548 100755 --- a/neofetch +++ b/neofetch @@ -5316,7 +5316,28 @@ EOF "ArcoLinux"*) set_colors 7 4 - ascii_file="arcolinux" + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF ;; "arch_small") From 2fd328aecaec67e723b9fa95d7aa7e60e81b4481 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:49:13 +1000 Subject: [PATCH 272/300] general: Move ascii art back to fix merge conflicts. --- neofetch | 1817 +++++++++++++++++++++++++++--------------------------- 1 file changed, 909 insertions(+), 908 deletions(-) diff --git a/neofetch b/neofetch index f5251548..a2fb7f87 100755 --- a/neofetch +++ b/neofetch @@ -50,6 +50,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. + read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info @@ -4159,914 +4160,6 @@ uppercase() { # COLORS -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -color() { - case "$1" in - [0-6]) printf "%b" "${reset}\e[3${1}m" ;; - 7 | "fg") printf "%b" "\e[37m${reset}" ;; - *) printf "%b" "\e[38;5;${1}m" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" - - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} - -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" - - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi - - kde_config_dir="${kde_config_dir/$'/:'*}" -} - -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac - - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi - - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" - ;; - - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" - ;; - - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" - ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text - -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks - -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' - --source source Which image or ascii file to use. - Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. - - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print - - NOTE: Arch and Ubuntu have 'old' logo variants. - - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. - - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. - - Possible values: bar, infobar, barinfo, off - -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast - - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. - - NOTE: --gap can take a negative value which will move the text - closer to the left side. - - --clean Delete cached files and thumbnails. - -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. - -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - - -Report bugs to https://github.com/dylanaraps/neofetch/issues - -" -exit 1 -} - -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config - - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; - - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; - - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; - - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; - - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; - - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; - - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; - - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; - - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; - - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; - - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; - - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; - - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; - - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; - - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - - "--travis") - print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk - } - - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac - - shift - done -} - get_distro_colors() { # This function sets the text colors according # to your OS/Distro's logo colors. @@ -8663,6 +7756,914 @@ EOF fi } +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +color() { + case "$1" in + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" + + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done + + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" + + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} + +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi + + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} + +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} + +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} + +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + ;; + esac +} + +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" + ;; + esac + + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi + + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} + +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi + + get_birthday() { get_install_date; birthday="$install_date"; } +} + +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac + ;; + *) time="$4" ;; + esac + + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" + ;; + + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; + + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + ;; + esac + + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" + ;; + + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" + ;; + + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" + ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + 'sixel', 'tycat', 'w3m' + --source source Which image or ascii file to use. + Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; + + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; + + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; + + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; + + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; + + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done +} + main() { cache_uname get_os From b3af154dc5638a605c9fa8c7735fb434ae4f3a13 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:11:22 +1000 Subject: [PATCH 273/300] general: Move ascii art back to the bottom. --- neofetch | 1816 +++++++++++++++++++++++++++--------------------------- 1 file changed, 908 insertions(+), 908 deletions(-) diff --git a/neofetch b/neofetch index a2fb7f87..e7f01190 100755 --- a/neofetch +++ b/neofetch @@ -4160,6 +4160,914 @@ uppercase() { # COLORS +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +color() { + case "$1" in + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" + + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done + + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" + + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} + +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi + + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} + +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} + +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} + +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + ;; + esac +} + +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" + ;; + esac + + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi + + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} + +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi + + get_birthday() { get_install_date; birthday="$install_date"; } +} + +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac + ;; + *) time="$4" ;; + esac + + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" + ;; + + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; + + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + ;; + esac + + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" + ;; + + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" + ;; + + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" + ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + 'sixel', 'tycat', 'w3m' + --source source Which image or ascii file to use. + Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; + + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; + + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; + + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; + + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; + + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done +} + get_distro_colors() { # This function sets the text colors according # to your OS/Distro's logo colors. @@ -7756,914 +8664,6 @@ EOF fi } -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -color() { - case "$1" in - [0-6]) printf "%b" "${reset}\e[3${1}m" ;; - 7 | "fg") printf "%b" "\e[37m${reset}" ;; - *) printf "%b" "\e[38;5;${1}m" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" - - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} - -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" - - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi - - kde_config_dir="${kde_config_dir/$'/:'*}" -} - -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac - - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi - - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" - ;; - - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" - ;; - - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" - ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text - -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks - -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' - --source source Which image or ascii file to use. - Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. - - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' - -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print - - NOTE: Arch and Ubuntu have 'old' logo variants. - - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. - - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. - - Possible values: bar, infobar, barinfo, off - -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast - - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. - - NOTE: --gap can take a negative value which will move the text - closer to the left side. - - --clean Delete cached files and thumbnails. - -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. - -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - - -Report bugs to https://github.com/dylanaraps/neofetch/issues - -" -exit 1 -} - -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config - - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; - - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; - - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; - - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; - - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; - - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; - - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; - - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; - - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; - - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; - - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; - - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; - - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; - - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; - - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - - "--travis") - print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk - } - - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac - - shift - done -} - main() { cache_uname get_os From 5a8b2405f5a90a51271de2b9c31c464deec0a405 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:18:52 +1000 Subject: [PATCH 274/300] misc: whitespace --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index e7f01190..f5251548 100755 --- a/neofetch +++ b/neofetch @@ -50,7 +50,6 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. - read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info From d49e6ca7d78cd40026276257cd5064f93cae28c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:35:28 +1000 Subject: [PATCH 275/300] travis: Fix command. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 532ca462..8b675592 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi script: - - time ./neofetch --ascii --config config/travis.conf -v + - time ./neofetch --travis -v # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi From 2384e6f7b996946e43fedaf5ee1ea3ff9ba4f945 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 11:46:55 +1000 Subject: [PATCH 276/300] docs: update --- neofetch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f5251548..d1fe6b58 100755 --- a/neofetch +++ b/neofetch @@ -5067,9 +5067,8 @@ get_args() { done } -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. +get_distro_ascii() { + # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. case "$ascii_distro" in @@ -8674,7 +8673,7 @@ main() { [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro get_bold - get_distro_colors + get_distro_ascii [[ "$stdout" == "on" ]] && stdout # Minix doesn't support these sequences. From a4b39b5b6981af69956ceb29d83d564218196ca4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 12:01:55 +1000 Subject: [PATCH 277/300] travis: Add back line length enforcement. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b675592..aac1b2fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,9 @@ script: # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi + # The if statement is here to invert the exit code from grep. + # grep normally errors if no match is found but we want the opposite. + # We invert it so grep fails if a match is found. + # Check for lines longer than 100 chars. + # There are 3 lines that must be longer than 100 chars. + - if (("$(grep '.\{101\}' neofetch | wc -l)" > 3)); then (exit 1); else (exit 0); fi From 48402232e952e6edd54d005e1c89b627bdd9e1b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 15:58:48 +1000 Subject: [PATCH 278/300] misc: whitespace. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d1fe6b58..c271356e 100755 --- a/neofetch +++ b/neofetch @@ -821,7 +821,6 @@ stdout="off" config_version="3.4.1-git" EOF - # DETECT INFORMATION get_os() { From 881ae1f226f759c33a69bf2f221fd370b42e9dd8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:19:14 +1000 Subject: [PATCH 279/300] docs: CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a385c7d..a6f3f61e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +This release bumps the version number up to `4.0.0` as it contains major +changes to how Neofetch is packaged and installed. + +The entirety of Neofetch is now contained within a single executable. +Everything has been in-lined. Installing Neofetch is now as easy as +downloading the script and running it. + +Packaging Neofetch is now easier as well. We were using `sed` in the +`Makefile` to replace specific paths and we have had to work around +different system hierarchies. None of this is necessary anymore. + +Those using distributions with an outdated Neofetch version in their repos +can now easily install the latest version. + + ## Contributors @@ -18,6 +33,7 @@ ## General +- Neofetch is now a single executable. - Simplified `--version` output. - Fixed theme issues by setting `GIO_EXTRA_MODULES`. From 7d57ba02470b5c7f182c3b46973b61d6197d5447 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:22:05 +1000 Subject: [PATCH 280/300] docs: CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f3f61e..2fe537ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ different system hierarchies. None of this is necessary anymore. Those using distributions with an outdated Neofetch version in their repos can now easily install the latest version. +Thanks to those who contributed this time around and thanks to those who +discussed proposed changes in the bug tracker. I appreciate it. :+1: + ## Contributors From 881094f1d620983048b8896fbdeb7e47bc3f7c29 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:25:05 +1000 Subject: [PATCH 281/300] misc: whitespace --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c271356e..1254ba20 100755 --- a/neofetch +++ b/neofetch @@ -4270,7 +4270,7 @@ get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then source "$config_file" - err "Config: Sourced user config. (${config_file})" + err "Config: Sourced user config. (${config_file})" old_options return fi From 4f4f2373953df00696f91eba744449200a00a560 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:36:01 +1000 Subject: [PATCH 282/300] version: bump --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1254ba20..dc65de71 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="3.4.1-git" +version="4.0.0-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -818,7 +818,7 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.4.1-git" +config_version="4.0.0-git" EOF # DETECT INFORMATION From 736b45a9ed2dd901e1b1f945f21d57872eb1e879 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:59:21 +1000 Subject: [PATCH 283/300] docs: Initial CONTRIBUTING.md --- CONTRIBUTING.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..8952749d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,80 @@ +# How to Contribute + + +## ShellCheck + +For your contribution to be accepted, your changes need to pass +ShellCheck. + +Run ShellCheck with the following command: + +```sh +# Why do we exclude numerous tests? +# See: https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions +shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117 +``` + +**Note**: If you have trouble installing ShellCheck. You can open a pull +request on the repo and our Travis.ci hook will run ShellCheck for you. + + +## Coding Conventions + +- Indent 4 spaces. +- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function + and variable names. +- Keep lines below `100` characters long. +- Use `[[ ]]` for tests. + + +## No no's + +- Don’t use `bc`. +- Don’t use `sed`. + - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). +- Don’t use `cat`. + - Use `bash`'s built-in syntax (`file="$(< /path/to/file.txt)")`). +- Don’t use `grep "pattern" | awk '{ printf }'`. + - Use `awk '/pattern/ { printf }'` + + +## If Statements + +If the test only has one command inside of it; use the compact `if` +syntax. Otherwise the normal `if`/`fi` is just fine. + +```sh +# Bad +if [[ "$var" ]]; then + echo "$var" +fi + +# Good +[[ "$var" ]] && echo "$var" + +# Also good (Use this for longer lines. +[[ "$var" ]] && \ + echo "$var" +``` + + +## Case Statements + +Case statements need to be formatted in a specific way. + +```sh +# Good example (Notice the indentation). +case "$var" in + 1) echo 1 ;; + 2) + echo 1 + echo 2 + ;; + + *) + echo 1 + echo 2 + echo 3 + ;; +esac +``` From ffd711a4ea581c747363f5ceb90b14fe172d0c32 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:02:31 +1000 Subject: [PATCH 284/300] docs: update --- CONTRIBUTING.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8952749d..08e5a934 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,18 @@ # How to Contribute +## Table of Contents + + +* [ShellCheck](#shellcheck) +* [Coding Conventions](#coding-conventions) +* [No no's](#no-nos) +* [If Statements](#if-statements) +* [Case Statements](#case-statements) + + + + ## ShellCheck For your contribution to be accepted, your changes need to pass @@ -52,7 +64,7 @@ fi # Good [[ "$var" ]] && echo "$var" -# Also good (Use this for longer lines. +# Also good (Use this for longer lines). [[ "$var" ]] && \ echo "$var" ``` From 1a3c8638e1b09a691cf92279e08a69e63b1d6d90 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:05:13 +1000 Subject: [PATCH 285/300] docs: update --- CONTRIBUTING.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 08e5a934..5858df73 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,6 +41,8 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ## No no's +- Don’t use `echo`. + - Use `printf "%s\n"` - Don’t use `bc`. - Don’t use `sed`. - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). @@ -52,21 +54,21 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ## If Statements -If the test only has one command inside of it; use the compact `if` +If the test only has one command inside of it; use the compact test syntax. Otherwise the normal `if`/`fi` is just fine. ```sh # Bad if [[ "$var" ]]; then - echo "$var" + printf "%s\n" "$var" fi # Good -[[ "$var" ]] && echo "$var" +[[ "$var" ]] && printf "%s\n" "$var" # Also good (Use this for longer lines). [[ "$var" ]] && \ - echo "$var" + printf "%s\n" "$var" ``` @@ -77,16 +79,16 @@ Case statements need to be formatted in a specific way. ```sh # Good example (Notice the indentation). case "$var" in - 1) echo 1 ;; + 1) printf "%s\n" 1 ;; 2) - echo 1 - echo 2 + printf "%s\n" "1" + printf "%s\n" "2" ;; *) - echo 1 - echo 2 - echo 3 + printf "%s\n" "1" + printf "%s\n" "2" + printf "%s\n" "3" ;; esac ``` From ac5bc01f6ab3be42352dfa0fcf4b2d276b6807c3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:29:06 +1000 Subject: [PATCH 286/300] docs: update --- CONTRIBUTING.md | 87 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5858df73..d39bb14f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,16 +4,26 @@ ## Table of Contents -* [ShellCheck](#shellcheck) * [Coding Conventions](#coding-conventions) -* [No no's](#no-nos) -* [If Statements](#if-statements) -* [Case Statements](#case-statements) + * [ShellCheck](#shellcheck) + * [No no's](#no-nos) + * [If Statements](#if-statements) + * [Case Statements](#case-statements) +* [Making changes to Neofetch](#making-changes-to-neofetch) + * [Adding support for a new Operating System / Distribution.](#adding-support-for-a-new-operating-system--distribution) -## ShellCheck +## Coding Conventions + +- Indent 4 spaces. +- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function + and variable names. +- Keep lines below `100` characters long. +- Use `[[ ]]` for tests. + +### ShellCheck For your contribution to be accepted, your changes need to pass ShellCheck. @@ -30,16 +40,7 @@ shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,S request on the repo and our Travis.ci hook will run ShellCheck for you. -## Coding Conventions - -- Indent 4 spaces. -- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function - and variable names. -- Keep lines below `100` characters long. -- Use `[[ ]]` for tests. - - -## No no's +### No no's - Don’t use `echo`. - Use `printf "%s\n"` @@ -52,7 +53,7 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. - Use `awk '/pattern/ { printf }'` -## If Statements +### If Statements If the test only has one command inside of it; use the compact test syntax. Otherwise the normal `if`/`fi` is just fine. @@ -72,7 +73,7 @@ fi ``` -## Case Statements +### Case Statements Case statements need to be formatted in a specific way. @@ -92,3 +93,55 @@ case "$var" in ;; esac ``` + +## Making changes to Neofetch + +### Adding support for a new Operating System / Distribution. + +Adding support for a new OS/Distro requires adding the Name, Logo and +Colors of the OS/Distro to the `get_distro_ascii()` function. + +The function is located right at the bottom of the script, one function +above `main()`. Inside this function you’ll find an alphabetical list of +each OS/Distro. + +Find the spot in the list your new OS/Distro fits into and start +implementing your changes. + +If your OS/Distro requires changes to the actual information gathering +functions then you can make these changes in the `get_*` functions. + +**Syntax**: + +- You have to escape back-slashes (`\`). (eg `\\`) +- You can use `${c1}` to `${c6}`to color the ascii. + - These are evaluated *after* we read the file. + + +**Example**: + +```sh + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +EOF + ;; +``` From c57da4cf72a5da32d4c91e89ff436be72fc5304d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:29:52 +1000 Subject: [PATCH 287/300] docs: update --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d39bb14f..89d413ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,5 @@ # How to Contribute - -## Table of Contents * [Coding Conventions](#coding-conventions) From 5bad6ea5d98e7c5a5f858946ea5668b5087f1949 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:40:33 +1000 Subject: [PATCH 288/300] docs: update --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 89d413ba..cf35decc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,6 +20,8 @@ and variable names. - Keep lines below `100` characters long. - Use `[[ ]]` for tests. +- Double Quote **EVERYTHING**. +- Don’t use single quotes, except for special cases. ### ShellCheck From 22a43204fc2b52be6312b10b8154ac415439e629 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:51:53 +1000 Subject: [PATCH 289/300] docs: update --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf35decc..5d3aaf56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,9 @@ ## Coding Conventions +- Use `bash` built-ins wherever possible. +- Try not to pipe (`|`) at all. +- Limit usage of external commands `$(cmd)`. - Indent 4 spaces. - Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function and variable names. @@ -42,6 +45,10 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ### No no's +- Don’t use GNU conventions in commands. + - Use POSIX arguments and flags. +- Don’t use `cut`. + - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). - Don’t use `echo`. - Use `printf "%s\n"` - Don’t use `bc`. From a46e43a8169eeb02e0ca87428699c94454b25709 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 18:23:33 +1000 Subject: [PATCH 290/300] docs: Keep full changelog in repo. --- CHANGELOG.md | 2579 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2579 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fe537ba..e794d894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [Unreleased] + This release bumps the version number up to `4.0.0` as it contains major changes to how Neofetch is packaged and installed. @@ -83,3 +92,2573 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1: **Window Manager** - Added support for detecting `dwm`. + + +## [3.4.0] - 2018-04-05 + +This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. + +I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! + +## Contributors + +- [**@yslgirl**](https://github.com/yslgirl) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- [**@dawidd6**](https://github.com/dawidd6) +- [**@MitchWeaver**](https://github.com/MitchWeaver) +- [**@StarryTony**](https://github.com/StarryTony) +- [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- [**@robertwolter**](https://github.com/robertwolter) +- [**@JadeMatrix**](https://github.com/JadeMatrix) +- [**@MindTooth**](https://github.com/MindTooth) +- [**@aidanharris**](https://github.com/aidanharris) +- [**@khoacao96**](https://github.com/khoacao96) + + +## OS + +- Added support for ArchMerge. +- Added support for MagpieOS. +- Added support for PostMarketOS. +- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) +- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) +- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) +- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) +- Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) +- Added support for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. +- Fixed ChromeOS detection. + + +## General + +- Added more info to verbose mode for debugging. +- Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Swapped sequences from `\033` to `\e`. +- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) +- Removed the last `echo` in the script. +- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) + + +## Ascii + +- Added color updates for Kubuntu logo. **Maulik Mistry** +- Added new DragonflyBSD logo. [**@MitchWeaver**](https://github.com/MitchWeaver) + + +## Images + +- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) +- Fixed bug with getting wallpaper from feh. +- Added `pixterm` backend. +- Don't force resolution in `catimg`. + +## Info + +**Desktop Environment** + +- Added GNOME version. +- Added support for TDE. + +**Window Manager** + +- Added support for most (*if not all*) current Wayland compositors/window manager's. +- Added support for some non-EWMH window managers. +- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) + +**Window Manager Theme** + +- Fixed `sawfish` detection. +- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) + +**Install Date** + +- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) + +**Theme** + +- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) + +**CPU** + +- [linux] Detect the correct temperature file to use. +- [windows] Removed `$temp` usage as it's an envar. +- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) + +**GPU** + +- [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. +- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) + +**Memory** + +- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) + +**Package Manager** + +- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) +- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) + +**Resolution** + +- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) + +**Song** + +- Added option to manually specify the player to use. +- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) +- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) + +**Model** + +- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) + +**Disk** + +- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) + +**Terminal Font** + +- Added more paths for Alacritty. +- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) +- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) + + +## [3.3.0] - 2017-09-14 + +Thanks to everyone who contributed this release, I appreciate ya! + +## Contributors + +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@dominiklohmann](https://github.com/dominiklohmann)** +- **[@ybden](https://github.com/ybden)** +- **[@lexruee](https://github.com/lexruee)** +- **[@AMDmi3](https://github.com/AMDmi3)** +- **[@deadda7a](https://github.com/deadda7a)** +- **[@winneon](https://github.com/winneon)** +- **[@DamnWidget](https://github.com/DamnWidget)** + + +## General + +- Config file now has a `.conf` suffix. +- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. +- `stdout` mode is now reimplemented. + - This mode prints the information in plain text. + - You can use it with `--stdout`. + - Example: https://gist.github.com/dylanaraps/151c205322cf3acae62661b76464a3f7 +- Fixed prompt location if color blocks are disabled. +- Make makefile more portable. **[@AMDmi3](https://github.com/AMDmi3)** + + +## Operating System + +- Added support for AryaLinux. **[@mstraube](https://github.com/mstraube)** +- Added support for Amazon Linux AMI. +- Added support for Artix Linux. **[@DamnWidget](https://github.com/DamnWidget)** +- Added support for Endless OS. +- Added support for Sabotage Linux. +- Added support for Siduction. **[@lexruee](https://github.com/lexruee)** +- Added support for Source Mage. +- Added support for Parsix GNU/Linux. **[@mstraube](https://github.com/mstraube)** +- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)** +- Fixed Raspbian being detected as ChromeOS. + + +## Images + +- [w3m] Fixed w3m-img not found on NixOS. +- Added support for using all image types as input. + - Neofetch now supports `svg`, `tiff` etc. + + +## ASCII + +- Added small Debian. +- Added small FreeBSD. +- Added small macOS. +- Added small NixOS. + + +## Info + +**GPU Driver** + +- [Linux] Added a new info function (*off by default*) to display the GPU Driver currently in use. +- Add `info "GPU Driver" gpu_driver` to your config to use it. + +**CPU** + +- [Linux] Fixed inaccurate output on ARM SoC devices. +- [Linux] Fixed CPU speed not appearing on PowerPC systems. +- [NetBSD] Added support for CPU temperature. (NOTE: This only supports newer Intel processors) +- Fixed inaccurate speed output in systems with CPU speed less than 1 GHz. +- Deprecated `cpu_shorthand` in favor of `cpu_brand`. + +**GPU** + +- [Linux] Filter out duplicate entries. + +**Model** + +- Added support for QEMU/KVM. +- Renamed subtitle to `Host:`. + +**Uptime** + +- [AIX/IRIX] Fixed Neofetch crashing when calculating uptime. + +**Terminal** + +- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells. + +**Terminal Font** + +- Added support for LXTerminal. **[@mstraube](https://github.com/mstraube)** +- Added support for GNUStep Terminal. **[@mstraube](https://github.com/mstraube)** +- Fixed Xfce4-terminal font output when system-wide font is used. **[@mstraube](https://github.com/mstraube)** +- Fixed MATE-Terminal issue. **[@mstraube](https://github.com/mstraube)** +- Fixed URxvt font detection failing if `.` is used. **[@winneon](https://github.com/winneon)** + +**Theme** + +- [Qt/KDE] Fixed inaccurate theme naming. **[@mstraube](https://github.com/mstraube)** +- [Qt/KDE] GTK theme is now shows as well. + +**Window Manager** + +- [macOS] Added support for `chunkwm`. **[@dominiklohmann](https://github.com/dominiklohmann)** +- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)** + +**Song** + +- Added support for Pogo. **[@mstraube](https://github.com/mstraube)** +- Fixed bug with players not being found. + +**Battery** + +- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)** + + +## Images + +- Fixed division by 0 error in XTerm. + +## Screenshot + +- Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** +- Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** + + +## [3.2.0] - 2017-06-21 + +This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. + + +Thanks once again to everyone that contributed! + + +## Contributors + +- **[@MatthewCox](https://github.com/MatthewCox)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@erikdubois](https://github.com/erikdubois)** +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@Artoriuz](https://github.com/Artoriuz)** +- **[@WilsonRU](https://github.com/WilsonRU)** +- **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@LER0ever](https://github.com/LER0ever)** + + +## Operating System + +- Added support for IRIX. +- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)** +- Added support for CloverOS. +- Added support for Maui. **[@mstraube](https://github.com/mstraube)** +- Added support for KS Linux. **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** + + +## General + +- Minimum required BASH version is now 3.2. + - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.) +- Fixed config file not being created on first install. + + +## Images + +- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second. + - This is a workaround to the images disappearing on resize and workspace switch. + - Use Ctrl+C to exit. +- [w3m] Fixed w3m-img not found on FreeBSD 12. **[@Artoriuz](https://github.com/Artoriuz)** + + +## Ascii + +- Added Ubuntu-MATE ascii art. +- Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)** +- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)** +- Fixed `--ascii_distro windows10` not working. + + +## Info + +**Distro** + +- [Solaris, AIX, Haiku] The machine architecture will now be shown properly instead of machine ID. + +**Terminal Emulator** + +- Added support for Neovim terminal emulator. **[@LER0ever](https://github.com/LER0ever)** +- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)** +- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)** +- Use `$SSH_TTY` for terminal detection if machine is connected via SSH. +- Break from loop if PPID can't be accessed/not found. + +**GPU** + +- [Linux] Fixed GPU sort. + +**Song** + +- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)** + +**Model** + +- Specify when running on a Hackintosh. **[@LER0ever](https://github.com/LER0ever)** + + +**Memory** + +- [FreeBSD]: Fix inaccurate free memory calculation. + + +## [3.1.0] - 2017-04-25 + +Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) + +Though I haven't worked on Neofetch as much as I'd have liked, most of the changes this time round come from some familiar faces as well as some new contributors! Thanks to everyone for contributing, I appreciate it. + + +## Contributors + +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@ikeydoherty](https://github.com/ikeydoherty)** +- **[@eliezio](https://github.com/eliezio)** +- **[@nilesr](https://github.com/nilesr)** +- **[@dritter](https://github.com/dritter)** +- **[@HebaruSan](https://github.com/HebaruSan)** +- **[@LER0ever](https://github.com/LER0ever)** +- **[@obrevenge](https://github.com/obrevenge)** +- **[@ajjames31](https://github.com/ajjames31)** +- Eliezio Oliveira + + +## Operating System + +- Added Chrome OS Crouton support. **[@LER0ever](https://github.com/LER0ever)** +- Added support for SliTaz. **[@nilesr](https://github.com/nilesr)** +- Added support for Nitrux. **[@mstraube](https://github.com/mstraube)** +- Added support for DesaOS. +- Added support for MinGW. +- Added support for OBRevenge. **[@obrevenge](https://github.com/obrevenge)** +- Added support for ArchLabs. **[@obrevenge](https://github.com/obrevenge)** + + +## Screenshot + +The screenshot feature no longer requires any configuration before working. We no longer hardcode `${HOME}/Pictures/neofetch` as the screenshot location. Here's how the `-s` and `-su` flags now function: + +- `neofetch -s` will save a file in the current directory named: `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` +- `neofetch -s test.png` will save a file in the current directory called `test.png` +- `neofetch -s ~/` will save a file in `~` called `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` +- `neofetch -s ~/test.png` will save a file in `~` called `test.png`. + + +## ASCII + +- Arch ASCII art now uses lighter colors. +- Fixed Ubuntu-Studio ASCII setting. **[@@HebaruSan](https://github.com/HebaruSan)** +- Updated Parabola logo. **[@mstraube](https://github.com/mstraube)** +- Updated Raspbian ASCII art. + + +## Images + +- Added `libsixel` backend. +- Added `termpix` backend. +- Only use a zero width space in the `w3m` backend. +- Fixed bug causing terminal size to not be found. +- [iTerm2] Fixed images not appearing inside `tmux`. + + +## Info + +**Locale** + +- Added a new function to display system locale. (Disabled by default) + +**CPU** + +- Added option to show decimals in CPU speed. + +**Terminal Font** + +- Added \*experimental\* font detection for iTerm2. **[@dritter](https://github.com/dritter)** + +**Window Manager** + +- [MacOS] Added support for Kwm. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- [MacOS] Added support for Spectacle. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- [MacOS] Added support for Amethyst. **[@jorgegonzalez](https://github.com/jorgegonzalez)** + +**Battery** + +- Added battery support for Bay Trail devices. **[@mstraube](https://github.com/mstraube)** + +**Disk** + +- Added new option to only show dir name in subtitle. + +**Song** + +- Added support for Deepin Music. **[@mstraube](https://github.com/mstraube)** +- Added support for Tomahawk. **[@mstraube](https://github.com/mstraube)** +- Fixed Audacious song output when `dbus-send` fails. **[@mstraube](https://github.com/mstraube)** + +**Local IP** + +- [Linux] Fixed UID showing instead of Local IP on several versions/configs of iproute2. + +**Packages** + +- [eopkg] Use a faster detection method. **[@ikeydoherty](https://github.com/ikeydoherty)** + +**Resolution** + +- [macOS] Fixed `screenresolution` not appearing at all on newer versions. **[@eliezio](https://github.com/eliezio)** +- [Linux] Show decimals. + +**GPU** + +- [Linux] Hide duplicate GPU lines (Only display 1). + + +## [3.0.1] - 2017-01-30 + +This minor release fixes all of the bugs that were found in the 3.0 release. + +Thanks for all of the bug reports and contributions. :) + +## Contributors +- **[@SomaUlte](https://github.com/SomaUlte)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@mstraube](https://github.com/mstraube)** +- **[@YellowApple](https://github.com/YellowApple)** +- **[@siiptuo](https://github.com/siiptuo)** +- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** +- **[@konimex](https://github.com/konimex)** + +## Operating System +- Added support for ArchBox Linux. + +## General +- Fixed output if subtitles are disabled and `prin` is used in an info function. +- Fixed underlines not working when used with `prin`. +- Fixed HAIKU install path. **[@YellowApple](https://github.com/YellowApple)** + +## Config +- Fixed default config not found. +- Don't set locale in config file. + +## Info + +**Memory**
+- Changed memory label to `MiB` on OS that output memory in Mebibytes. + +**Shell**
+- Fixed a crash when the user has `bash 3` installed. + +**Packages**
+- Added support for Chromebrew. + +**GPU**
+- [Linux] Display detailed information about Intel GPUs. **[@SomaUlte](https://github.com/SomaUlte)** + +**Color Blocks**
+- Fixed issue with `color_blocks="off"` adding an extra newline to the output. + +**Song**
+- Don't print `$song` if it's empty and `song_shorthand` is on. **[@mstraube](https://github.com/mstraube)** +- Fixed `mpd` detection when `mpd` is on a different host. **[@dawidd6](https://github.com/dawidd6)** +- Use `get_song_dbus` for Audacious. **[@mstraube](https://github.com/mstraube)** + +**Terminal Font**
+- [Alacritty] Fixed font detection. **[@siiptuo](https://github.com/siiptuo)** + +## Images +- [iTerm2] Fixed issue with line-breaks printing spaces over the image. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- Fixed issue with images not working in Terminology. +- Fixed issue when `image_source` was set to `wall`. +- [w3m-img] Fixed issues with `w3m-img` and `tmux`. + +## Ascii +- [Windows 10] Fixed `ascii_distro` not working. +- Fixed a bug where the backend is `ascii` but the image_source is an image file. +- Fixed custom ascii files not working. +- Removed extra backslashes from OpenBSD ascii art. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + +## Scrot +- Added message to let users know that a screenshot was taken. + + +## [3.0] - 2017-01-23 + +This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. + +The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. + +Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends + +Thanks to everyone who contributed this release, there were a lot of new faces this time around. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@z33ky](https://github.com/z33ky)** +- **[@mstraube](https://github.com/mstraube)** +- **[@gavinhungry](https://github.com/gavinhungry)** + +## IRC + +Neofetch now has an IRC channel at `#neofetch` on Freenode. If you have any questions, issues or ideas feel free to join the IRC channel and I'll be happy to assist you. I know that we've already got the Gitter chat but hopefully this makes things easier for those without a GitHub account. :) + +[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch) + +## Collaborators + +I have given collaborator access to both **[@konimex](https://github.com/konimex)** and **[@iandrewt](https://github.com/iandrewt)**. In short this allows them to push directly to the master branch of the repo, manage the issue tracker and also merge pull requests. They've been a huge help the past year so this made sense to me. + +## OS +- Added support for AIX. +- Added support for AntiX. +- Added support for GNU/kFreeBSD. +- Added support for Gentoo FreeBSD. +- Added support for GrombyangOS. +- Added support for Joyent SmartOS. +- Added support for Mer. +- Added support for MINIX. +- Added support for MX. +- Added support for Open Source Media Center (OSMC). +- Added support for SalentOS. +- Added support for TrueOS. +- Added support for Windows (MSYS2). + +## General +- The default config file is now installed to `/etc/neofetch/config` and acts as a system-wide config file for Neofetch. Editing this file will make the changes available to all users on the system. Those packaging Neofetch **without** using the Makefile will need to make changes to support this. +- The Makefile was rewritten to remove GNU-isms. +- Removed executable permission from config files. BASH can source them even if they're un-executable. +- Travis now runs [shellcheck](https://github.com/koalaman/shellcheck) on every commit and pull request. + - We've had to exclude around 10 lint errors, see this wiki page for why we did this: + - https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions +- Neofetch now supports relative path values when specifying the location to images, ascii files and config files. + - For example, `neofetch --w3m Pictures/Wallpapers/10.jpg` and `neofetch --w3m 10.jpg` now work. +- Optimize usage of `get_de()`, `get_wm()` and `get_term(). + - We were calling these multiple times, we now only run them once and check to see if they were run previously. +- Optimize info caching, only check for cache files in functions that use caching. +- The manpage is now generated using `help2man`. `help2man` parses the output of `--help` and `--version` to create a manpage. This ensures that our manpage stays 1:1 with the script documentation. We actually found a lot of outdated info in the old manpage thanks to this. + - A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory. +- Delete most of `info()` and instead call `prin()`. + - This removes a lot of duplicate code between `info()` and `prin()`. +- Remove `printf` subshells and instead use `printf -v` to declare the variables. +- Fixed artifacts when using line-breaks in TTYs. +- All errors are now sent to `stderr`. +- Renamed `XFCE` --> `Xfce`. **[@gavinhungry](https://github.com/gavinhungry)** +- Cleanup `main()`. +- Renamed `old_flags()` --> `old_options()`. + +## Info + +**Shell**
+- [Fish] Fixed memory leak caused by Fish. +- Added support for `xonsh`. +- Fixed version output on `ksh`. +- Rewrote the function to remove duplicate code. + +**Uptime**
+- Moved duplicate code to a function. +- Changed `$uptime_shorthand` to `on` by default. + +**Desktop Environment**
+- Fixed issues where MATE wouldn't be detected properly. +- Added fallback to `$DESKTOP_SESSION`, `$MATE_DESKTOP_SESSION_ID` and `$GNOME_DESKTOP_SESSION_ID`. +- Hide Desktop Environment if it matches Window Manager. + +**CPU**
+- [Linux] Don't simplify `cpufreq` speed option names for no reason. +- [Linux] Fixed issues with CPU name detection for architectures other than x86/amd64/ARM. +- [NetBSD] Remove case statement in favor of 1 line test. +- Simplify check for low CPU speeds. +- Expanded `cpu_temp` to take the values `C` and `F`. This means you can now display the CPU temperature as Fahrenheit. + +**CPU Usage**
+- Added Haiku cores command. +- Updated Linux and macOS commands to the match the commands in the `get_cpu()` function. + +**GPU**
+- [Linux] Each GPU is now printed on a separate line. +- [Linux] Added `--gpu_type` / `$gpu_type` which lets you display `all`, `dedicated` or `integrated` GPUs. + +**Memory**
+- [Solaris] Fixed inaccurate used memory size. + +**Resolution**
+- [Windows] Declare variables locally to fix conflicts in other functions. + +**~~Birthday~~ Install Date**
+- Renamed `get_birthday()` -- > `get_install_date()` +- Removed all `date` command usage from `get_install_date()`. +- Added a new function called `convert_time()` which takes the time stamped `ls` output and converts it to a pretty format. The function only uses bash so its much faster than calling `date`. This makes things simple and keeps the output consistent across all Operating Systems. Example: `2016-12-06 16:58:58.000000000` --> `Tue 06 Dec 2016 4:58 PM` +- Added an option so users can choose between using 24-hour and 12-hour time format +- `get_install_date()` will detect which `ls` program is being used instead of hardcoding them per OS. + +**Disk**
+- Rewrote function from scratch. + - The function is `40` lines smaller than before and works on all [1] versions of `df` we tested on [2]. +- Added the option/flag `disk_show` which allows you to specify which disks, mount points or directories to show the disk info of. (One per line) +- Added the option/flag `disk_subtitle` which allows you to specify how we label each disk. (Mount point or Disk name) +- Removed all percentage calculation since `df` already provides us with the percentage. +- Warn the user if `df` isn't installed. +- Fixed broken output if `df` wasn't installed but the function was enabled. + +[1] The function doesn't work on Haiku since their `df` is wildly non-standard. (The output format and flags are 100% different from all of the other `df` versions floating around.) + +[2] Tested on `GNU`, `Busybox`, `BSD`, `Solaris` and `macOS` `df` versions. + +**Theme**
+- [KDE] Don't display GTK Themes if KDE is detected. +- [KDE] If `kde[0-9]-config` isn't found, try and look for `$HOME/.kde`. + +**Window Manager Theme**
+- Fixed WM Theme not detected on MATE. **[@mstraube](https://github.com/mstraube)** +- Fixed WM Theme detection on KDE. **[@mstraube](https://github.com/mstraube)** + +**Song**
+- Added support for xmms2. **[@z33ky](https://github.com/z33ky)** +- Added support for Exaile music player. **[@mstraube](https://github.com/mstraube)** +- Added support for JuK .**[@mstraube](https://github.com/mstraube)** +- Added support for Bluemindo. **[@mstraube](https://github.com/mstraube)** +- Added support for Guayadeque Player. **[@mstraube](https://github.com/mstraube)** +- Added support for Yarock. **[@mstraube](https://github.com/mstraube)** +- Added support for Qmmp. **[@mstraube](https://github.com/mstraube)** +- Added support for QuodLibet. **[@mstraube](https://github.com/mstraube)** +- Added support for Mopidy. **[@d3rrial](https://github.com/d3rrial)** +- [cmus] Simplify block and fix `artistsort` bug. +- Removed `state` detection. +- Removed duplicate `dbus-send` commands. **[@mstraube](https://github.com/mstraube)** +- Hide output if no song is playing. +- Enforce order `artist - title` in `get_song_dbus()`. **[@mstraube](https://github.com/mstraube)** + +**Terminal Font**
+- Added support for Alacritty. +- Added support for Konsole. **[@mstraube](https://github.com/mstraube)** +- Added support for Sakura Terminal. **[@mstraube](https://github.com/mstraube)** +- Added support for Pantheon Terminal. **[@mstraube](https://github.com/mstraube)** +- Added support for deepin-terminal. **[@mstraube](https://github.com/mstraube)** +- [Termite] Fixed incorrect font chosen. **[@mstraube](https://github.com/mstraube)** +- [Termite] Also look at default config. **[@mstraube](https://github.com/mstraube)** + +**Battery**
+- [MacOS] Fixed issue where battery always appears as charging. **[@jorgegonzalez](https://github.com/jorgegonzalez)** + +**Local IP**
+- [BSD and Solaris] Merged the detection to Linux. +- [Windows] Support multiple interfaces. + +**Color Blocks**
+- Use `start++` instead of adding it manually after case. **[@konimex](https://github.com/konimex)** +- Fixed bug where color blocks wouldn't respect width in TTYs. +- Cursor positioning now takes `$block_height` into account. +- Fixed all artifacts in virtual consoles. +- Merged `$start` and `$end` into an array called `block_range`. + - This makes the config option match the command-line flag `--block_range`. + +## Images +- [iTerm2] Fixed blank images. +- Fixed bug where image mode would attempt to run in a TTY. +- All of the image/ascii backend handling was rewritten. Backend and Image/File/Directory selection is universal now and should make usage easier. + - Added `catimg` backend. + - Added `caca` backend. + - Added `jp2a` backend. + - `--image` has been replaced with `--backend`. + - `--backend` takes `ascii`, `caca`, `catimg`, `jp2a`, `iterm2`, `off`, `tycat`, `w3m`. + - Shortcut flags were added for easy picking of backends. + - Each flag can take a file, image or directory as an argument. + - For example: `neofetch --w3m /path/to/img.jpg` `neofetch --ascii /path/to/file` + - `--w3m` + - `--iterm2` + - `--tycat` + - `--ascii` + - `--off` + - `--catimg` + - `--caca` + - `--jp2a` + - All image and ascii file selection has been replaced with the universal `--source`. + - The value of `--source` can be any of the following: + - `auto`, `ascii`, `wallpaper`, `/path/to/img`, `/path/to/ascii`, `/path/to/dir/`. +- Fixed bugs with image shuffle mode. + +## Wallpaper +- Decode URI filenames. + +## Ascii +- Simplified ascii file handling. + - Removed a call to `tr` for those using `bash 3`. + - Fixed distro detection issues. + - Removed the assumption that `first word in distro --> ascii file name` +- Added Ubuntu-Studio. **[@konimex](https://github.com/konimex)** +- Fixed bug causing macOS ascii art to be used on other Operating Systems. +- Display warning about 'ascii' being the new default mode. +- Removed `ascii_logo_size` in favor of `ascii_distro='{arch,crux,gentoo}_small'`. +- [PCBSD] Use TrueOS ascii art. +- Added Void Linux (small) and Alpine Linux (small). + +## Screenshot +- Use arrays for `$scrot_program` + +## Args +- Fixed bug where `neofetch --config` sourced the user config twice. +- Cleaned up config arg handling. + + +## [2.0.2] - 2016-12-07 + +This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. + +These issues were fixed by reverting the GPU caching and Packages optimizations. These issues occurred because not enough testing was done before these were implemented in master. In the future I'll take more care with testing these larger changes before they hit the master branch and I apologize for there being yet another release in one week. + +I also want to apologize to those packaging Neofetch for this unexpected release. + +## Info + +**Packages**
+- Fixed issue where package output was off by one. + +**GPU**
+- Fixed bug with `--gpu_brand` not working. + +**Theme**
+- [Cinnamon] Fixed incorrect information. + + +## [2.0.1] - 2016-12-06 + +This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. + +This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine. + +See the screenshot section below for more info. + +The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output. + +Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function. + +Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out. + +Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** + +## General +- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)** + +## Info + +**Distro**
+- Added support for Apricity OS. +- Added support for GoboLinux. **[@konimex](https://github.com/konimex)** +- Added support for SwagArch. +- Added support for AOSC OS. +- Added support for Parrot Security. +- Fixed bug that caused Linux Mint systems to be identified as Ubuntu. +- Fixed bug that caused CentOS systems to not be detected. + +**Memory**
+- [BSD] Fixed high memory output. + +**GPU**
+- [Linux] Fixed bug where sound card was detected as GPU. + +**Packages**
+- Only call `wc -l` once at the end of the function instead of calling it once per package manager. + +**Desktop Environment**
+- Show Cinnamon version. + +## Image +- Changed default image mode to `ascii`. + - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode) + +## Wallpaper +- Rewrote wallpaper function. +- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`. +- Added support for XFCE's wallpaper setter. +- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)** + +## Ascii + +![ubuntu](https://u.teknik.io/zILeY.png) +
Old Ubuntu Logo vs New Ubuntu Logo +- Updated Ubuntu logo to the latest version. + - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file. +- `--ascii_colors` no longer changes text colors. +- Added ascii art for Ubuntu-Budgie. + - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file. +- Fixed bug causing RFRemix to use the incorrect ascii art. + +## Screenshots + +Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use. + +On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`. + +The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots. +- Automatically use whatever screenshot tool is available. +- Added screenshot support to macOS +- Added screenshot support to Haiku + +## Screenshot Upload +- [teknik.io] Fixed images not uploading with the right filetype. +- Changed default image upload host to `teknik.io`. + - teknik doesn't compress images whereas imgur does. + - You can change this back to imgur by using `--image_host imgur` or by editing your config file. + + +## [2.0] - 2016-12-02 + +This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. + +Since this version of Neofetch differs so much from the previous versions expect a 2.0.1 release a few days later to fix any bugs that are found after release. + +The ascii file handling was rewritten, ascii art is now stored/read as plain text! All `eval` usage was removed from Neofetch, vim fold markers/comments are no longer enforced and we now run on GNU Hurd, Haiku and more. + +When I was rewriting parts of the script I thought to myself; Neofetch is using the bash shebang and does depend on bash so why not take full advantage of the features bash has to offer? All tests were changed from `[` to `[[`, arithmetic tests now use `(())` and C style for loops are used where possible. + +All of the config file documentation was rewritten and multiple wiki pages were created to hopefully make using/configuring Neofetch easier than ever before. You can see the wiki here: [Neofetch Wiki](https://github.com/dylanaraps/neofetch/wiki) + +Some of the config options/arguments were renamed/changed and Neofetch will warn you on run if you're using deprecated options (`neofetch -v`). For this release Neofetch **will** include backwards compatibility with the old config file but I'd like to remove this stuff in ~~2.1~~ 3.0. I recommend using this release with a fresh config file so that you can make use of the new documentation. + +I say this every release; This changelog is incomplete, for a full list of changes take a look through the commit history. Neofetch now has an unspoken commit style so reading the commit history won't hurt as much as it used to. + +Thanks to all of the contributors this time around, you guys are a big help and I really appreciate your work towards making Neofetch better and better each release. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@TonCherAmi](https://github.com/TonCherAmi)** +- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@iwamatsu](https://github.com/iwamatsu)** +- **[@Brottweiler](https://github.com/Brottweiler)** + +## Packages +- Neofetch is now in Debian's official repos. +- Neofetch is now in Ubuntu's official repos. + +## General +- All functions/variables now follow the same naming scheme. `example_func_name` +- Call `uname` once and cache the output instead of calling `uname` 4-5 times. +- Cleaned up and rewrote large chunks of the script. +- Convert math tests to correct syntax. +- Fixed `--disable` and capitalized arguments. +- Fixed issue where `bold=off` wouldn't work. +- Fixed issue where info wasn't detected properly but the subtitle was still displayed. +- Fixed issue where using `--disable func func` broke other args. +- Removed all traces of `eval` from Neofetch. +- Removed all vim fold markers and stopped enforcing folding for vim users. + - See [#431](https://github.com/dylanaraps/neofetch/pull/431) +- Rewrote all of config file documentation. +- Swap all tests from `[` to `[[`. + +## Operating System +- Added support for ChaletOS. +- Added support for DracOS. +- Added support for GNU Hurd. **[@konimex](https://github.com/konimex)** +- Added support for Haiku. **[@konimex](https://github.com/konimex)** +- Added support for Korora. **[@konimex](https://github.com/konimex)** +- Added support for Netrunner. **[@konimex](https://github.com/konimex)** +- Added support for Pardus. +- Added support for iPhone 7 and 7 Plus. + +## Ascii +- Ascii art is no longer read as a script and is now read as plain text. + - See this wiki page about the new ascii art format. + - https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format +- Neofetch now displays your OS's ascii logo if your distro's logo isn't found. **[@konimex](https://github.com/konimex)** + - Example: [Linux] Tux is displayed if there's no distro ascii. +- `neofetch --ascii_distro x` now sets the mode to ascii for you. You no longer have to use a combination of `--ascii` and `--ascii_distro`. +- [Arch Linux] Changed default ascii colors. +- [Bunsenlabs] Changed default ascii colors. +- Fixed issue with Solarized and certain ascii art. +- Remove all duplicates from `get_distro_colors()`. +- Remove execution permission flag from ascii art files. **[@iwamatsu](https://github.com/iwamatsu)** +- Rename `colors()` to `get_distro_colors()`. +- Rename `setcolors()` to `set_colors()`. +- Update Netrunner ascii art. +- Added old arch ascii logo. **[@Brottweiler](https://github.com/Brottweiler)** + - Useable by using `--ascii_distro arch_old` or by editing the config. + +## Images +- Fixed images not appearing in st. +- Added `to_ascii()` and `to_off()`. + - These functions are used when falling back to different image modes. +- Renamed `check_old_flags()` to `old_flags()` to match `old_functions()`. +- Split `get_image()` into `get_term_size()`, `get_image_size()`, `get_image_program()` and `make_thumbnail()`. +- Use `$XDG_CACHE_HOME` as the thumbnail dir if available. + +## Wallpaper +- Added support for Cinnamon. + +## Bars +- Rename all `progress_` variables to `bar_` to match the function name. + +## Info + +**Distro**
+- [Linux] Source `/etc/*-release` files instead of having a dozen separate `awk` commands. + - We source `/etc/os-release` before falling back to `/etc/*-release`. +- Remove lsb_release detection. + - This change was made since lsb_release prints innacurate results on some distros. +- Added fallback when distro isn't found. **[@konimex](https://github.com/konimex)** + - Example: `Linux (Unknown)` + +**Packages**
+- [Solus] If `pisi` is unavailable, use `eopkg`. +- Added package detection for Lunar Linux. **[@konimex](https://github.com/konimex)** +- Added package detection for TinyCore. **[@konimex](https://github.com/konimex)** +- Remove `/usr/games` from `$PATH` to fix issues with pacman game. + +**GPU**
+- GPU is now cached till reboot. +- [Linux] Prefer dedicated GPU over integrated GPU. + +**Terminal**
+- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + +**Terminal Font**
+- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + +**CPU**
+- [BSD] Added cpu_temp support. **[@konimex](https://github.com/konimex)** + +**CPU Usage**
+- [iOS] Fixed CPU usage. + +**Shell**
+- [bash] Simplify bash version. + +**Song**
+- Added support for Clementine. **[@konimex](https://github.com/konimex)** +- Added support for GNOME Music. **[@konimex](https://github.com/konimex)** +- Added support for Lollypop. **[@konimex](https://github.com/konimex)** +- Added support for Pragha. **[@konimex](https://github.com/konimex)** + +**Public IP**
+- Cache the output of the command. **[@konimex](https://github.com/konimex)** +- [dig] Fixed connection timed out with public_ip. **[@iandrewt](https://github.com/iandrewt)** + +**Resolution**
+- [MacOS] If refresh rate is empty don't append Hz. + + +## [1.9.1] - 2016-11-04 + +This is a small release which fixes various issues found in 1.9. + +Note: Those packaging neofetch can ignore the new file: `config/travis` + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@fornwall](https://github.com/fornwall)** +- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + +## Packages +- Neofetch is now in Termux`s repos. + +## General +- [Cursor Position] Fix cursor position in URxvt when using terminal padding. +- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)** +- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)** +- If a function fails to detect info, let the user know in verbose mode. (`-v`) +- Removed `--test` in favor of a separate config file. Travis.ci now uses `neofetch --config travis` instead of a hacked together arg. + +## Operating System +- Added support for BlankOn Linux. + +## Images +- Fix division by 0 error. + +## Ascii +- [Tails] Update ascii art. +- [OpenBSD] Made ascii art thinner + +## Info + +**Prin**
+- Fix color breakage. +- Fix bold not working. + +**Terminal**
+- Fix whitespace error. + +**Terminal Font**
+- [Termite] Fix incorrect Termite font chosen. +- [Termite] Simplify `awk` command. +- [xfce4-terminal] Simplify `awk` command. + +**Theme**
+- [Budgie] Fix incorrect GTK Theme/Icons + +**Window Manager Theme**
+- [Budgie (Mutter)] Don't print WM Theme. + +**Memory**
+- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + + +## [1.9] - 2016-11-01 + +This change log won't cover everything that's changed. Have a look through the commit +history for more info. + +There were a lot of major changes made to how things work in this release so I'm expecting +bugs/things not working for people. Expect a 1.9.X release. + +I'm also looking for neofetch screenshots for the Readme, see this issue: [#405](https://github.com/dylanaraps/neofetch/issues/405) + +Thanks to everyone below who contributed, it's nice to see some new faces too. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@coypoop](https://github.com/coypoop)** +- **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- **[@koreacomputercenter](https://github.com/koreacomputercenter)** + +## General +- Added new function called `checkoldflags` which informs users about deprecated config options. +- Change all `OS X` references to `macOS`. **[@iandrewt](https://github.com/iandrewt)** +- Fix corrupted text when long lines are cut-off. +- Don't dynamically place prompt in `image=off` mode. +- Cursor Position: Fix issues when using URxvt+Padding + +## Operating System + +![android](https://u.teknik.io/4XdJy.png) +- Added support for Android. + - Dependencies: + - Required: `bash` and `busybox` + - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully + working Linux environment, doesn't require root acess and includes all dependencies. + - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** + - PR [#351](https://github.com/termux/termux-packages/pull/531) +- Added support for Bitrig. **[@konimex](https://github.com/konimex)** +- Added support for Sparky Linux. +- Added support for Porteus. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Added support for Red Star OS. **[@koreacomputercenter](https://github.com/koreacomputercenter)** + +## Packages +- Neofetch is now in Gentoo's official repos. + +## Images + +**Fixed rendering issues in URxvt when using an XFT font.** + +![scrot](https://i.sli.mg/6qp9Cg.png) + +This was first thought to be an issue between URxvt and W3m-img and I apologize for immediately closing bug reports and dismissing comments about this. + +I spent yesterday trying to fix this issue and found out that launching neofetch with `--bold off` +reduced the rendering problems. I did more digging and found out that removing all text formatting fixes the issue entirely. I later found out that adding a single unformatted character before the formatted text fixed the issue while keeping the formatting the same. + +I opened up this PR https://github.com/dylanaraps/neofetch/pull/358 which added options to enable a border between the image and the text to fix the issue. **[@konimex](https://github.com/konimex)** later commented informing me that we could just use a `zero-width space` to fix the issue and that we didn't need a new function/args/ugly border. doh + +The final fix was as simple as adding a zero-width space before the info, here's the commit. + +https://github.com/dylanaraps/neofetch/commit/3e9c3d648cb4c6f0d5fe5f0b96f9e29429af39d9 + +**Removed hard dependency on `\033[14t`** + +Neofetch no longer requires a terminal emulator that supports `\033[14t` this means that neofetch now works in Konsole. Instead of using the escape sequence users now have three options for getting the terminal size in pixels. +- `xdotool` +- `xwininfo` + `xprop` +- `xwininfo` + `xdpyinfo` + +Neofetch will detect whatever combination you have insalled and use these programs. + +Note: `\033[14t` is still supported, if images already work for you then you don't have to install anything else. +- [w3m-img] Draw the image twice to fix rendering issues in Konsole. +- [w3m-img] Fix cursor position when using `yoffset`. +- [w3m-img] Add `-bg` support with the new option `--bg_color`. + - `neofetch --bg_color blue` will make the background behind the image blue. + - Note: The background color is only visible behind transparent parts of the image. +- If the terminal width is found as `0`, fallback to ascii mode. + +## Ascii +- Bold ascii art by default. +- Fixed incorrect prompt location when using `ascii_logo_size small`. +- Fixed incorrect colors used on light terminals. +- Update Void Linux ascii art. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Update Solus ascii art. + +## Info + +**Distro**
+- Expanded `distro_shorthand` to macOS, BSD and Solaris. **[@konimex](https://github.com/konimex)** +- Removed `osx_buildversion` and `osx_codename` in favour of `distro_shorthand`. **[@konimex](https://github.com/konimex)** + +**Desktop Environment**
+- [Windows] Added support for showing DE. + - Windows 8 and above: `Modern UI/Metro` + - Windows 7 and below: `Aero` + +**Window Manager**
+- [Windows] Added support for custom WMs/Shells. + - Neofetch now detects `blackbox`, `bugn`, `Windawesome`, `emerge` and `litestep`. + +**Window Manager Theme**
+- [Windows] Added support for Blackbox themes. + +**CPU**
+- Added `cpu_speed` which lets you hide/show the speed in the output. +- Expanded `cpu_cores` option by adding two new values, `logical` and `physical`. + - `logical`: Show all virtual cores (hyperthreaded). + - `physical`: Only show physical cores. +- [Linux] Added support for showing CPU temperature. + - Added new option called `cpu_temp`. + - Note: This is disabled by default and can be enabled by changing the value of `cpu_temp` in your config to `on`. +- [macOS] Print physical cores instead of hyper-threaded cores. **[@iandrewt](https://github.com/iandrewt)** +- [iOS] Rewrite CPU function. + +**GPU** +- [iOS] Rewrite GPU function. +- [Linux] Rewrite GPU function. + - Neofetch also caches the info until reboot. + +**Uptime**
+- Rewrote uptime function to use seconds since boot instead of the `uptime` command. + - Every OS/Distro now has the pretty `uptime -p` output! +- Remove `up` from output. + +**Resolution**
+- [macOS] Add @2x label for retina resolutions. **[@iandrewt](https://github.com/iandrewt)** + +**Memory**
+- [Linux] Correctly calculate used memory. + - The output should now match `conky`, `htop` and etc. + - Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 +- [NetBSD] Fix memory output for sizes over 4GB. **[@coypoop](https://github.com/coypoop)** + +**Shell**
+- Hide shell path by default. +- Show shell version by default. + +**Battery**
+- [Linux] Rewrote and simplified battery function. +- Removed `battery_shorthand` +- Removed `battery_num` + +**Theme Font**
+- [XFCE] Fixed incorrect font output. + +**Color Blocks**
+- Fixed `block_width` not working. +- Fixed `% s` appearing in color blocks when neofetch is run from `tty` +- Fixed `block_width` being off by one. A value of `2` made the blocks `3` wide instead of `2` wide. + +**Terminal and Terminal Font**
+- [Linux] Use `/proc/$PPID/comm` instead of parsing `ps`. +- Uppercase first letter of `termfont` output. +- Don't print broken output of busybox's `ps`. +- Remove path from output. + +**Song**
+- [macOS] Fix iTunes automatically opening. **[@iandrewt](https://github.com/iandrewt)** +- Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Rewrote song function, it's now much faster/cleaner. + + +## [1.8.1] - 2016-10-04 + +This release fixes various bugs found in 1.8. + +**General**
+- Fixed issues with single args (`-s` `-su`) being treated as values for other args. + +## Info + +**GPU**
+- Added `gpu_brand` to enable/disable showing GPU brand in output. (AMD/NVIDIA/Intel) + +**DE**
+- Added Cinnamon version number to output. + +**WM Theme**
+- Fix GNOME showing wrong WM Theme. + +**Battery**
+- Fixed battery not appearing when set to `all`. + +**Terminal Font**
+- [Termite] Ignore lines starting with `;`. + +**Progress Bars**
+- Fixed progress bars displaying incorrectly in image mode. + +## Screenshot +- Added support for uploading screenshots to Imgur and Teknik. + - Adds two new identical flags `--upload` and `-su`. +- Changed default screenshot name so that it works on Windows. + +## Images + +**General**
+- Added a tiny delay before running w3m-img which suprisingly fixed all flickering issues in VTE based terminals. See [#349](https://github.com/dylanaraps/neofetch/pull/349) + +**Wallpaper**
+- Fix wallpapers with spaces in the filename from not showing up. + +## Ascii +- Added logo mode which only displays the ascii art. + - Adds two new identical flags `--logo` and `-L`. + + +## [1.8] - 2016-10-02 + +This version of neofetch is vastly different from the previous versions and this +changelog won't cover everything that's changed. Have a look through the commit +history for more info. + +There were a lot of major changes to how things work in this release so I'm expecting +bugs/things not working for people. Depending on what comes up we my release a few 1.8.X +versions. + +This changelog is a bit of a mess this time around and I apologize but it should at least +get the message across. + +Android support didn't make it into this release as it requires testing on more devices. +If you've got a device running android and would like to help test out the branch, check +out the open PR here: [#322](https://github.com/dylanaraps/neofetch/pull/322) + +This release also saw a lot more contributors which makes me really happy. Thanks to those +below for helping out. :) + +### Contributors +- **[@hashhar](https://github.com/hashhar)** +- **[@williamkray](https://github.com/williamkray)** +- **[@dar-irl](https://github.com/dar-irl)** +- **[@gabe565](https://github.com/gabe565)** +- **[@maddcoder](https://github.com/maddcoder)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@aranega](https://github.com/aranega)** +- **[@vendion](https://github.com/vendion)** +- **[@konimex](https://github.com/konimex)** +- **[@undrskr](https://github.com/undrskr)** + +### General +- Added `--version` to print the neofetch version. +- Fix issue when title and background were both color `7`. +- Fix issue with incorrect text color when `barinfo` is set. +- Fixed various Travis.ci bugs. +- Fix lint errors. +- Moved all whitespace trimming to a dedicated function. + - Neofetch will no longer have any whitespace issues in the output. + - See [trim()](https://github.com/dylanaraps/neofetch/commit/d3c87cdaacf1ea9fbf245146c910dc53b49dba08#diff-e863270127ca6116fd30e708cdc582fcR2789) +- Quote all variable/command substitutions. +- Removed `line_wrap` as having it set to `on` broke the output. +- Removed `stdout` mode since it's been broken for a while now and I don't see the + point in fixing it. +- Removed in-script config in favor of sourcing the default user config. +- Remove all instances of `! -z` since they're pointless. +- Remove all `bc` usage by simplifying math. +- Suppress `getconfig` and `getscriptdir` errors. +- Suppress `xprop` errors since it's now an optional dependency. +- The prompt is now dynamically set in image mode instead of being anchored to the
+ bottom of the window. See [#279](https://github.com/dylanaraps/neofetch/pull/279) and [#299](https://github.com/dylanaraps/neofetch/pull/299) for examples. +- The title at the top is now much more colorful. +- Moved commands near the bottom of the script to a new function called `main`. +- Use `read -s` instead of `stty -echo` and `stty +echo`. +- Use faster `$(())` syntax for index variables. +- `-v` now shows where the config files were sourced from. +- Cleanup +- Neofetch no longer clears the screen when run in ascii or image=off modes. + - You can use the old behavior by aliasing `clear && neofetch` to `neofetch`. + +### OS +- Added support for Windows 10 Linux subsystem. **[@konimex](https://github.com/konimex)** +- Added support for GuixSD. **[@konimex](https://github.com/konimex)** +- Added support for Devuan Linux. +- Added support for GalliumOS. +- Added support for Openwrt. +- Added support for PacBSD. **[@vendion](https://github.com/vendion)** +- Added support for Rosa. +- Added support for Solaris (Oracle / OpenIndiana). **[@konimex](https://github.com/konimex)** +- Added support for macOS Sierra. **[@iandrewt](https://github.com/iandrewt)** +- Fixed various iOS related issues. + +### Packages +- Added Cydia package for iOS. + - See https://github.com/dylanaraps/neofetch#ios-1 + +### Info + +**Terminal and Terminal Font**
+ +![img](https://ipfs.pics/ipfs/QmR39ScLi56Yt73pA3YWri9ayatN6mpwSTEmM8RVdeRsB1) +- Added `term` function to display current terminal emulator. [1] +- Added `termfont` function to display current terminal font. [2] + +[1] Both of these functions are enabled by default. +[2] See this wiki page for more info about the functions: [Link](https://github.com/dylanaraps/neofetch/wiki/Terminal-and-Terminal-Font-detection) + +**Model**
+- Added `model` a new function which displays your device's product vendor/name. + +![Mode](https://ipfs.pics/ipfs/Qmcy2o5xZCELxroNLHAhY96ZsrwBFR86NGDCu5e2UPVn4b) + +**Distro**
+- Added `distro_shorthand` **[@konimex](https://github.com/konimex)** + +**Title**
+- Added additional fallback which gets the current username from `$HOME`. + +**Color Blocks**
+- Added `--block_height` / `$block_height` to change the number of lines high each
+ block will be. + +![Big Blocks](https://ipfs.pics/ipfs/QmZpR8ukZNfGXkhXjTwAy3eWVRCeHdrurhgAdV5CSiTVvR) + +**Resolution**
+- [Windows] Fix resolution on Windows 10. **[@dar-irl](https://github.com/dar-irl)** +- [Mac OS X] Hide refresh rate if `0`. **[@iandrewt](https://github.com/iandrewt)** +- Fixed `xrandr` output on systems not using gawk. +- [Linux / BSD] Shortened refresh rate output. + +**Shell**
+- Show `fish` shell version. **[@maddcoder](https://github.com/maddcoder)** + +**Song**
+- Added support for Deadbeef. **[@konimex](https://github.com/konimex)** +- Added support for Amarok. **[@konimex](https://github.com/konimex)** +- Added support for Banshee. **[@konimex](https://github.com/konimex)** +- Added support for Rhythmbox. **[@konimex](https://github.com/konimex)** +- [Cmus] Prevent `tag artistsort` from showing up in song title. **[@williamkray](https://github.com/williamkray)** +- [Cmus] Fix order of music tags. **[@iandrewt](https://github.com/iandrewt)** +- [Cmus] The function now works on both OS X and Linux. +- [iTunes] Fix song not displaying. **[@iandrewt](https://github.com/iandrewt)** + +**CPU**
+- Simplify CPU Core command. + +**CPU Usage**
+- Fixed broken CPU usage output on BSD and Windows. +- Fixed misleading output on Linux / Mac OS X. +- Moved CPU Usage to its own dedicated function. + +### Image + +![terminology](https://ipfs.pics/ipfs/QmbVEUREBg4hMG22WrQ2bkt2sZZzyTEP5EEXmHRw7MHD6A) +- Added image support for terminology with `tycat`. **[@aranega](https://github.com/aranega)** [1] +- Fixed issues with lines getting drawn through images. See [#296](https://github.com/dylanaraps/neofetch/pull/296) +- Added `--crop_mode none` / `crop_mode=none` to disable cropping the images. +- Added `--size none` / `size=none` to disable resizing / cropping the images. +- Removed `image_position` +- `--image off` now behaves like the other image modes. + +[1] `tycat` is a terminology builtin that works similarly to w3m-img. Those using terminology
+now have working image support. + +##### Shuffle mode +- Fixed directory going out of bounds causing a fallback to ascii mode. **[@gabe565](https://github.com/gabe565)** +- Simplified shuffle function. +- Path no longer requires a `/` at the end. **[@aranega](https://github.com/aranega)** + +### Ascii +- Add `ascii_bold` which allows you to bold the ascii art. +- Added `--ascii_distro mac` as a shorter way of using the OS X ascii. +- Added missing `$ascii_distro` config option. +- Better `Ubuntu-GNOME` ascii art. **[@hashhar](https://github.com/hashhar)** +- Custom ascii files (`--ascii path/to/ascii_file`) now follow the same format as the + distro ascii files. See this wiki page that explains the syntax. [Link](https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format) +- Fix a color issue with Debian's ascii logo. +- Fix an error with an unescaped char in Windows' ascii art. +- Use a pure bash solution to getting ascii size. +- Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** + + +## [1.7] - 2016-05-14 + +Hello, sorry this release took so long. I've been extremely busy with uni and +haven't had as much time to work on neofetch. + +As always, check the `Following HEAD` wiki page for all breaking changes +this release. + +I'm also looking for some new Readme screenshots, see this github issue: **https://github.com/dylanaraps/neofetch/issues/245** + +### Contributers + +Thanks to the following people for contributing this release. +- **[@dawidd6](https://github.com/dawidd6)** +- **[@tudurom](https://github.com/tudurom)** +- **[@iandrewt](https://github.com/iandrewt)** + +### General +- Made it easier to get verbose logs. +- Added issue template for github. +- New repo for Crux. **[@tudurom](https://github.com/tudurom)** +- Added release badge to readme. **[@dawidd6](https://github.com/dawidd6)** +- Updated man page and usage with newest flags. +- Font is now enabled by default to match Screenfetch's default config. +- Fixed `bold` option not working. + +### OS / Distro Support +- Added support for Kogaion Linux. +- Added support for Apple iOS. **[@iandrewt](https://github.com/iandrewt)** + - Neofetch should now work on your iPhone, iPod and iPad. +- Added support for DragonflyBSD. +- Added support for PCBSD. + +![iOS screenshot](https://ipfs.pics/ipfs/QmYmPhwpFrxwySW2phdxH1TyQ6tCgCnxtYtbEEe3RY5TwZ) + +### Error Messages + +Neofetch now supports displaying error messages and saving a verbose log for +troubleshooting. + +![log](https://ipfs.pics/ipfs/QmeTWGKozY79zcxbrgXueyTRfQcTUe7ZmDqLv4ASgJB4G4) +- Added `-v` to print error messages to stdout. +- Added `-vv` to print a verbose log to stdout. [1] + +[1] Use `neofetch -vv 2> file` to save a verbose log for bug reporting. + +### Info +- Rewrote most BSD info functions, they're now much smaller and work on more + BSD distros. + +**prin** +- Format changes to fix issues with colons in string. This change also makes + `prin` use the same args as `info`. + +``` sh +# OLD Format +prin "Subtitle: Text goes here" + +# NEW Format +prin "Subtitle" "Text goes here" +``` + +**Title** +- Made title faster by using `$HOSTNAME` when available. + +**Underline** +- Fixed bug with `--underline on/off` not working. +- Underlining is no longer hardcoded to title length meaning you can now + underline any part of the output and the length will match. +- `$underline` was renamed to `$underline_enabled`. + +``` sh +# OLD Variable +underline="on" + +# NEW Variable +underline_enabled="on" +``` + +**Distro** +- Fix arch issues with ARM cpus. +- We now use `uname -m` to get the arch instead of hardcoding `x86`. +- Moved distro detection to a function called `getdistro`. +- Fixed issue with `ascii_distro` not working. + +**CPU** +- Fixed issues when cpu speed was < 1Ghz +- Cleanup of CPU function. +- Don't print `Dual-Core` or `Quad-Core` in CPU output. + +**GPU** +- [Linux] More GPU substitutions for AMD cards. +- Added BSD support using `glxinfo`. + +**Memory** +- [Linux / Windows] Use `memavail` if available for a more accurate output. + +**Packages** +- Package count now works when the user has multiple package managers installed. + For example, if the user has both `dpkg` and `pacman` installed the function will + add up the packages from both package managers to get a grand total. (`dpkg pkgs` + `pacman pkgs`) + +**Uptime** +- Fixed various issues with OS X and BSD. + +**Desktop Environment** +- [ Linux ] Fallback to using `xprop` if `$XDG_CURRENT_DESKTOP` is empty. +- Use `$de` instead of `$XDG_CURRENT_DESKTOP` for wallpaper and theme detection. +- Fixed xprop bug with DE detection when X wasn't running. +- Don't assume that user is using MATE if marco wm is detected. + +**Window Manager Theme** +- Fixed bug when `$de` was unset. + +**Color Blocks** +- Fixed bug when the blocks wrap a line causing a large white strip to appear. + +### Ascii +- Added KDE neon ascii art. +- Added small OpenBSD ascii art. + - Credit goes to ufetch. +- Reduced the size of NetBSD's ascii art. +- [Windows 8/8.1] Use modern windows ascii art. + +### Colors +- Fixed bug with `--colors` not working with all 256 terminal colors. +- `--colors 7` now uses the color white. [1] +- `--colors fg` now uses the foreground color. [1] + +[1] Neofetch tried to be smart before by assuming that the foreground color +would be white or black. This caused issues for those setting the foreground +color to red or etc. This change adds a new value for `--colors` and `colors=()` +called `fg` which will set the color to your foreground color. + +### Progress Bars +- The default progress bar look was changed to `[=====-----]` instead of `━━━━━━━━━━` + fix issues with older systems. +- You can now enable/disable a border around the progress bars with `progress_border`. + +``` sh +# $progress_border on +[=====-----] + +# $progress_border off +=====----- +``` +- You can now individually set the progress bar characters by using + `progress_char_elapsed` and `progress_char_total`. This means that you can + have a seperate character for the elapsed and total portions of the bar. + +``` sh +# Examples with $progress_border on + +# Elapsed: = +# Total: - +[=====-----] + +# Elapsed: . +# Total: " " +[..... ] + +# Elapsed: / +# Total: " " +[///// ] +``` + + +## [1.6] - 2016-04-01 + +# Neofetch 1.6 + +Another ~~week~~ another release of Neofetch. + +This release focused on cleanup, bug fixes and optimization. Neofetch +is now much much faster than last release and more bug free than ever +before! + +This release surprisingly didn't break much at all, see the latest entry in +the wiki page `Following HEAD`. + +https://github.com/dylanaraps/neofetch/wiki/Following-HEAD + +![scrot](https://ipfs.pics/ipfs/QmTD6cRmYfLdrvvyLfGdUfBDCzE5uYNsRpLUx7vLUFkYxM) + +### Contributors + +Thanks to the following people for contributing this release. +- **[@iandrewt](https://github.com/iandrewt)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@onodera-punpun](https://github.com/onodera-punpun)** +- **[@onespaceman](https://github.com/onespaceman)** +- **[@firstEncounter](https://github.com/firstEncounter)** +- **[@konimex](https://github.com/konimex)** + +### General +- Added Travis CI support. +- Added `--test` which is meant for testing and prints all functions. +- Cleanup of Distro, Uptime, Memory and CPU functions. +- We now use a more reliable white-space trimming substitution for CPU/GPU etc. +- Use `stty` instead of `read -s` to fix an issue with escape sequences
+ appearing in the output. +- Line wrap is now disabled by default. +- Implement base support for caching specific info. This will eventually
+ allow us to speed up the script by caching info that won't change for a
+ long period of time like the CPU/GPU. [1] +- Fixed a locale issue when `LC_ALL` is unset on the user's system. +- Change all usage of `$HOME/.config` to `$XDG_CONFIG_HOME` with a fallback to `$HOME/.config`. + +[1] You can clear the cache with `--clean`. + +### Colors + +![vs](https://ipfs.pics/ipfs/QmNVw4zm78tgBGdhDJ1FZ1aktpEtVapVtNWWMMKh5aitrZ) + +

Neofetch 1.5 vs Neofetch 1.6

+ +

Neofetch now works with bright color schemes and uses the foreground color instead of hard-coding white.

+ +
+- Fixed buggy colors in older versions of *BSD, OS X and Linux. +- The default text colors now work on bright color schemes. We no longer force
+ the color white, it's now based on your foreground color. +- Progress bars are now by default colored based on your distro's logo colors. +- Color blocks now work in older systems and in Travis CI. + +### Packages +- Neofetch is now is Void Linux's official repos. **[@konimex](https://github.com/konimex)** + +### Info +- Functions now no longer print `Unknown` when they fail, they now don't appear at all. + +**Window Manager Theme**
+- Added new `WM Theme` function to print window manager themes. + +**OS**
+- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)** +- [ Fedora ] Fixed a weird detection bug. + +**CPU**
+- [ Windows ] Don't print CPU cores if detection fails. +- [ BSD ] Fixed extremely long output. +- Fixed broken CPU speed when source is `/proc/cpuinfo`. + +**GPU**
+- Don't show GPU output on unsupported OS. +- `Nvidia` is now displayed as `NVIDIA`. **[@firstEncounter](https://github.com/firstEncounter)** +- Intel GPUs now all appear as `Intel Integrated Graphics`. to avoid naming issues. +- [ OS X ] We now cache the GPU value. + +**Battery**
+- Show charging state in battery output. **[@dawidd6](https://github.com/dawidd6)** and **[@iandrewt](https://github.com/iandrewt)** +- [ Windows / OpenBSD ] Fix blank battery output when battery isn't found. + +**Resolution**
+- [ Windows ] Don't print resolution if detection fails. +- [ Linux / OSX / BSD ] Print refresh rate next to resolutions. +- [ Linux ] Multi monitor support using `xorg-xrandr`. +- [ Linux ] Refresh rate support using `xorg-xrandr`. +- [ OSX ] Added support for using `screenresolution` to print the output.
+ This is much faster than the default method. + +**Packages**
+- Listing homebrew packages is now super fast. **[@iandrewt](https://github.com/iandrewt)** + +**Public IP**
+- Made public IP function faster by using `dig` if available. **[@iandrewt](https://github.com/iandrewt)** +- Each source now has a timeout to avoid a hang. +- If the IP detection fails we try another method. + +**Theme**
+- Use `$GTK2_RC_FILES` if the envar is set. **[@onespaceman](https://github.com/onespaceman)** + +**Desktop Environment**
+- Added OS X detection. + +**Song**
+- [ MPD ] Fixed function when mpd is running on another PC and not your own. +- Song now displays `Not Playing` instead of `Unknown` when no music player is found. +- Added support for Google Play Music Desktop Player (adds optional dependency of [`gpmdp-bash`](https://github.com/iandrewt/gpmdp-bash)) **[@iandrewt](https://github.com/iandrewt)** + +**Disk**
+- Added new display option `perc` to display just the percentage with the progress bar. +- [ FreeBSD ] Fixed disk usage not working. + +**Memory**
+- [ OpenBSD ] Fixed completely broken memory output on OpenBSD. +- [ Linux ] Rewrote memory function so that it works on old kernel versions. + +**Uptime**
+- [ OSX / BSD ] Performance improvements. **[@iandrewt](https://github.com/iandrewt)** +- [ OpenBSD ] Fixed duplicate `up` in output. + +**Birthday**
+- Fix stray `+` sign in output. + +### Image +- Remove `shuffledir` in favor of '--image path/to/dir/' +- Use `printf` instead of `shuf` to pick a random image. +- [ OS X ] Fixed issues with wallpaper detection. +- [ OS X ] Wallpaper detection now works on a per desktop basis. +- Removed `image_backend` and instead use iterm2 mode only when iterm2 is detected. + +### Ascii +- Added ascii art for Qubes OS. +- Added ascii art for Travis CI. +- Revamped Alpine Linux's ascii art. +- Fixed missing ascii colors for Puppy Linux. +- [ OSX ] Fixed incorrect text colors. +- Sped up ascii function by dropping `wc` usage. + +### Scrot +- Fixed scrot function not using user defined options. + + +## [1.5] - 2016-03-17 + +# Neofetch 1.5 + +![Xubuntu](https://ipfs.pics/ipfs/QmWPvwW3nQoKVffHSZUu57MwCpQDZoMVTHQVwwCom2ChqM) + +### Contributers + +Thanks to the following people for helping me to improve neofetch. +- **[@iandrewt](https://github.com/iandrewt)** +- **[@konimex](https://github.com/konimex)** +- **[@CousinMachu](https://github.com/CousinMachu)** + +### General +- Remove all `echo` usage inside the script. +- More cleanup and misc bug fixes. + +### Packages +- Neofetch is now packaged for `Fedora` and `Fedora` based distros. **[@konimex](https://github.com/konimex)**. +- Added installation instructions for RHEL and CentOS. **[@konimex](https://github.com/konimex)**. +- Added stable package to the AUR. **[neofetch](https://aur.archlinux.org/packages/neofetch/)** + +### Progress Bars + +This has finally been merged to master, a big thanks to **[@iandrewt](https://github.com/iandrewt)** for helping +me finish up with this PR. + +![bars](https://ipfs.pics/ipfs/Qmbj8S7pi4CVw12XTawtRwRpLvkiZ9cxRxCUPMLQ1Nhhkb) +- Added progress bar support to CPU, Memory, Disk, Battery. +- Added `progress_char` which allows you to change the character used when drawing the bars. +- Added `progress_length` which allows you to set the max length in spaces of the bars. +- Added `progress_elapsed_color` which sets the elapsed color. +- Added `progress_total_color` which sets the total color. +- Added `--progress_colors` which takes two color values: `elapsed`, `total`. +- Added `cpu_display`, `memory_display`, `disk_display` and `battery_display` which allow you
+ to customize where or if the progress bar will appear. + - Takes these values: `info`, `bar`, `infobar`, `barinfo` + +### OS +- Added support for `SteamOS`. + +### Images +- Using `xoffset` now also moves the text over. +- Changed default gap size to `2`. +- Fixed an issue with Nitrogen and multi monitor wallpaper setups. **[@CousinMachu](https://github.com/CousinMachu)** + +### Ascii +- Kaos: Update ascii logo to the new logo. +- Added ascii logos for `Kubuntu`, `Lubuntu`, `Xubuntu` and `ubuntu-gnome`. + - You can enable them with `--ascii_distro kubuntu`, `--ascii_distro lubuntu` and etc. + +### Info + +**OS**
+- [ OSX ] Fix buildversion displaying regardless of on/off. **[@iandrewt](https://github.com/iandrewt)** +- [ OSX ] Added `osx_codename` (on by default) which prints the OSX codename. **[@iandrewt](https://github.com/iandrewt)** + +**Disk Usage**
+- Only display usage of local disks. +- Fixed disk usage progress bars when the used value was larger than the total. **[@iandrewt](https://github.com/iandrewt)** + +**Theme**
+- Added `/usr/share` as another theme directory to fix an issue with no theme being found. **[@iandrewt](https://github.com/iandrewt)** + +**CPU**
+- Added `cpu_shorthand` to shorten the output of CPU. **[@iandrewt](https://github.com/iandrewt)** + - Takes these values: `name`, `speed`, `tiny`, `on`, `off` +- Added the ability to print the CPU Usage by using `cpu_display="info"` or `--cpu_display off/on info`. +- Added `cpu_cores` to enable/disable showing the number of CPU cores in the output. **[@iandrewt](https://github.com/iandrewt)** + +**GPU**
+- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. **[@iandrewt](https://github.com/iandrewt)** + +**Memory**
+- Fix hang on older systems. + +**Desktop Environment**
+- Fixed bug where `i3` would show up as both a DE and a WM. + +**Birthday**
+- Fixed the birthday function on OS X, it apparently wasn't working from the start. **[@iandrewt](https://github.com/iandrewt)** + +**Song**
+- [ OSX ] Added Spotify support to song. **[@iandrewt](https://github.com/iandrewt)** +- [ OSX ] Added Itunes support to song. **[@iandrewt](https://github.com/iandrewt)** +- Fix bug with `song_shorthand` and songs with more than one occurence of `-`. + +**Battery**
+- Fixed a naming error when multiple batteries are displayed. **[@iandrewt](https://github.com/iandrewt)** + +### Stdout Mode +- Fixed issues with functions that use `prin`. + + +## [1.4] - 2016-03-09 + +Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists +the major changes made to neofetch. For a full list, checkout the git commit history. + +Thanks to everyone for contributing, I appreciate it! +- Renamed `fetch` to `neofetch`. Thanks for voting. +- Neofetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** +- Added support for `Alpine Linux`. +- Fix issue with color blocks ending up on the same line as the prompt. + +### Packages +- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** +- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** + +### Info +- Reimplement `color` function. + +**Battery**
+- Added support for NetBSD + +**Song**
+- [Linux] Added support for Spotify. + +**Birthday**
+- Added `--birthday_format` and `$birthday_format` to change the date format of the
+ birthday function. The flag uses the `date` cmd's format options so see `man date`
+ for a list. + +**Packages**
+- Fix 0 package count in Slackware. Thanks **[@h3xx](https://github.com/h3xx)** + +**GPU**
+- Added more GPU substitutions. + +Example: + +``` sh +neofetch --birthday_format "%D" +neofetch --birthday_format "%a %d %b %Y %l:%M %p" +neofetch --birthday_format "%c" +``` + +**Theme**
+- Fix incorrect theme detection on Cinnamon. + +### Ascii +- Added small ascii logo variants for Arch, Crux and Gentoo. [1] +- Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. +- Optimized all ascii art fixing all leading whitespace issues. + +[1] The small ascii art was taken from [ufetch](https://github.com/jschx/ufetch). + +Example of small ascii logo: + +![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) + +### Stdout +- Don't create config file when using `--stdout`. +- Simplified stdout function. +- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
+ the separator between the info. + +Example: + +``` sh +# Display memory, battery and disk in a single line separated by " | " +# This output can then be used in lemonbar etc. +neofetch --stdout memory battery disk --stdout_separator " | " +``` + + +## [1.3] - 2016-02-26 + +# Fetch 1.3 + +Hey guys, + +This update brought some breaking changes, see this wiki page for what you'll +need to update in your config file. + +https://github.com/dylanaraps/fetch/wiki/Following-HEAD + +We're in the middle of renaming 'fetch' to something else as there are +already other programs using the name and we don't appear in any searches. + +You can help out by voting in our poll here: + +http://strawpoll.me/6894425 +- Fetch now supports **bash 3.0+**. +- More cleanup +- The text is now by default colored according to your distro's logo. +- Removed `$*_color` variables/flags in favour of a general `$colors` + variable/flag. See my writeup here: **https://github.com/dylanaraps/fetch/pull/96** + +### Image +- You no longer need to set the font_width value, your font size + is now calculated by fetch automatically. +- Image sizing now takes terminal height into account. +- `--size` now also takes a percentage as a value, for example. + +``` sh +# Image takes up 70% of the terminal size. +fetch --size 70% + +# Size the image in pixels. +fetch --size 200px +``` + +### Packages +- Fetch now has a `crux` port. Thanks **[@ix](https://github.com/ix)**. + +### OS +- Added support for `BunsenLabs`. +- Added support for `SailfishOS`. (Untested) + +### Info +- Don't display Theme, Icons, Font or Window Manager if X isn't running. +- Added function to show currently logged in users. + +**Window Manager** +- Add support for Wayland window managers. (Hardcoded) + +**Song** +- Added `song_shorthand` which prints the Artist/Title on seperate lines. + +**Theme** +- Windows Visual Style is now a part of `getstyle`. +- Disabled theme output on OS X to fix a `gsetttings` related crash. +- Uppercase the first letter of the theme. + +**Resolution** +- Added Windows support. +- Enabled by default but only displays info if the dependency is found. + +**Battery** +- Added FreeBSD and OpenBSD support. Thanks **[@tudurom](https://github.com/tudurom)**. + +**GPU** +- Added more substitutions/ + +### Stdout + +Printing to stdout in a plaintext format for use in scripts is now +much faster and cleaner. +- Removed `--stdout_separator` (Separator is now 2 spaces) +- Removed `--stdout_subtitles` +- Removed `--stdout_title` + + +## [1.2] - 2016-02-17 + +# Fetch 1.2 + +This new release comes with a few config breaking changes, see this wiki page +for info on how you can workaround the issues. + +https://github.com/dylanaraps/fetch/wiki/Following-HEAD +- Fetch now has a **gitter** chatroom. [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +- Fixed text padding when the user didn't have the locale `en_US.UTF8` installed. +- Cleaned up parts of the script. + +### OS + +We now support almost all the Linux distros Screenfetch supports excluding +the distros that have been discontinued. + +Added support for these distros: +- `Puppy Linux` +- `Kali Linux` +- `openSUSE` +- `Raspbian` +- `Mageia` +- `PCLinuxOS` +- `Zorin OS` +- `Tails` +- `BLAG` +- `Void Linux` +- `Trisquel` +- `Solus` +- `Peppermint` +- `NixOS` +- `Chakra` +- `Mandriva` +- `gNewSense` +- `LMDE` +- `KaOS` +- `Sabayon` +- `Frugalware` +- `Chapeau` +- `Slackware` +- `Scientific Linux` +- `Exherbo` +- `Chrome OS` +- `Chromium OS` + +### Makefile +- Fixed makefile on OS X El Captain. +- `$PREFIX` is now also used when installing ascii art and the default config + +### Wallpaper +- Fetch now supports using `MATE` desktop's wallpapers. +- Fetch now fallsback to ascii mode if the found wallpaper is an xml file. This + fixes issues where the wallpaper set by gsettings is an xml file. + +### Info + +**Desktop Environment**: +- Added support for showing the user's DE. + +**Window Manager**: +- `xprop` is now a required dependency. See **[#79](https://github.com/dylanaraps/fetch/pull/79)**. +- Renamed 'windowmanager' to 'wm' + +**IP Address**: +- Added function to get your local IP +- Added function to get your public IP [1] +- Added `--ip_host` and `$public_ip_host` which allow you to change the website we + ping for the public IP. + +[1] Public IP requires an internet connection as we ping a website. + +**Packages**: +- Check for packages based on which package manager is installed instead of + using a hardcoded list of distros. + +**Theme**: +- Added support for getting DE theme. +- Added support for getting KDE theme. +- Renamed `getgtk` to `getstyle`. +- Dropped the `gtk` from these printinfo functions `gtktheme`, `gtkicons` + and `gtkfont`. Theme output will be blank until you make these changes: + +``` sh +# Old Naming +info "GTK Theme" gtktheme +info "Icons" gtkicons +info "Font" gtkfont + +# New Naming +info "Theme" theme +info "Icons" icons +info "Font" font +``` + +**GPU**: +- `gpu_shorthand` is now enabled by default. +- We now favor showing the dedicated GPU over the integrated one. + +**Song**: +- Added support for `MOC`. +- We now check to see if the player is running before printing anything. +- We now check playback state and show it if relevent. + +**Uptime**: +- [Linux] Fixed uptime when it's under 1 minute. + +### Ascii Art +- `--ascii_distro` now also enables ascii mode. +- Fix missing ascii art when fetch is installed in /usr/local +- Update Deepin's ascii art to their new logo + + +## [1.1] - 2016-02-06 + +# Fetch 1.1 changelog + +Over the past 10~ days over **190** more commits have been pushed to master and the +script has had some big changes. Thanks to everyone who has contributed, you've been +a big help. + +![screenfetch mode](http://i.imgur.com/nW3HiNP.png) +New screenfetch mode +- If `w3m` or `imagemagick` aren't installed we gracefully fallback to ascii mode. +- Automatically find the `w3m-img` path and fallback to ascii mode if not found. [1] +- Fix padding escape codes on BSD systems. +- Swap escape codes from `\e` to `\033` for consistency. +- We only move the cursor to the bottom of the terminal in w3m/iterm2 rendering modes. +- Cursor position is now dynamic in ascii mode based on the height of the ascii and info text. +- If images and ascii are off, don't clear the terminal +- The script now exits correctly instead of always exiting with status code `1` +- If the script exits for any reason, unhide the cursor. +- Removed duplicate blocks inside `getcpu` and `getmemory`. +- Removed `--colors` as it was apparently broken from day 1. +- Usage has been reformatted so that every flag has a value. + +[1] Setting `$w3m_img_path` will make the script look there first. + +### Image +- Added support for displaying ascii art inside of text files. +- Added "screenfetch mode" which will display your distro's ascii art next to the info. [1] +- Added `--ascii_distro` to choose which distro's ascii logo to display. +- Added `--ascii_colors` and `$ascii_colors` which allow you to change the colors of the ascii art + and distro logos. [2] +- Added `--size` and `$image_size` to set the image size in pixels. +- Rename `--shuffledir` and `$shuffledir` to `shuffle_dir`. +- Rename `--imgtempdir` and `$imgtempdir` to `thumbnail_dir` +- Removed `--split_size` and `$split_size` as they were weird and confusing to use. +- Default thumbnail directory is now `$HOME/.cache/thumbnails/fetch`. Thanks @tudurom +- If `--image` and `--ascii` are left empty we fallback to ascii distro mode. + +Example usage of ascii from file: + +``` sh +fetch --ascii "path/to/ascii" --ascii_color 2 + +``` + +[1] **[How do I enable screenfetch mode?](http://github.com/dylanaraps/fetch#how-do-i-enable-screenfetch-mode)** +[2] `ascii_colors` takes a range of colors which allows you to color every aspect of +distro and OS ascii art. For custom art the script will color the entirety of it using +the first value of `ascii_colors`. If `ascii_colors` is left empty, color will be disabled. + +### Config file +- Fetch now has a config file that you can share with people and keep between + script versions! [1] +- Added `--config` and `$config_file` to specify a custom config location. +- Added `--config off`, `--config none` and `$config` to enable / disable config files + at launch or in script. + +[1] https://github.com/dylanaraps/fetch#using-the-config-file + +### Makefile +- Fetch now has a make file due to the increasing number of files, + this allows the script to be easily installed and uninstalled on + systems it isn't packaged for yet! [1] + +[1] The script will still work just fine on its own, you'll just be missing +the distro ascii art and the automatic config creation. + +### Packages +- Fetch now has a Gentoo/Funtoo e-build courtesy of **@z1lt0id** + +### Stdout +- Added `stdout` mode which allows you to fetch info in a plain text format that works + with lemonbar and in your scripts. You can use it by launching fetch with `--stdout` to print all + functions enabled in your `printinfo` function. You can selectively print functions by passing + arguments to `--stdout` like so: + +``` sh +# Print the output of all info functions enabled in printinfo +fetch --stdout + +# Print the output of memory +fetch --stdout memory + +# Print the output of memory and disk +fetch --stdout disk + +# Print the output of all functions excluding x +fetch --stdout --disable kernel packages gtktheme + +``` +- Added `--stdout_separator` and `$stdout_separator` which takes a string and adds it + as a separator between the output. +- Added `--stdout_title` and `$stdout_title` which allow you to toggle the `title@hostname` + from appearing in the output. +- Added `--stdout_subtitles` which allow you to toggle the `Info:` titles from appearing in + the output. + +``` sh +# Hiding subtitles +fetch --stdout --stdout_subtitles off + +# Custom separator +fetch --stdout disk gpu --stdout_separator " | " + +``` + +**NOTE:** `stdout_subtitles` and `stdout_title` only work when `--stdout` is used on its own +without any args. + +### Info +- You can now display info without a subtitle. eg. `info memory` +- Added `--disable` which allows you to stop an info line from appearing at launch. +- Added `--underline` and `$underline` which allow you to toggle visibility of the + underline at launch and in your config. + +``` sh +# Stop cpu, gpu, disk and shell functions from being called +fetch --disable cpu gpu disk shell +``` + +**Kernel:** Added `--kernel_shorthand` and `$kernel_shorthand` to print less or more kernel info +**Window Manager:** Added support for `$XINITRC` +**GTK:** Fix incorrect GTK3 theme being displayed +**CPU:** `cpu_shorthand`: New substitutions +**GPU:** `[Linux]` Count the number of identical GPUs. eg. `Nvidia Geforce GTX 970 x 2` +**Memory:** `[Mac OS X]` Added wired memory to memory usage. + +**Distro:** +- Added support for showing OS architecture. eg `Arch Linux x86_64`, `Windows 7 Ultimate 64-bit` [1] +- Mac OS X: Added support for showing Max OS X build version. [2] +- Windows: Distro now displays Windows edition. eg. `Windows 7 Ultimate` + +[1] You can toggle this using `--os_arch` and `$os_arch`. +[2] You can toggle it using `--osx_buildversion` and `$osx_buildversion`. + +**Shell:** +- Added `--shell_version` and `$shell_version` to hide/show your shell's version. +- Added `--shell_path` and `$shell_path` to hide/show the path to your shell + +**Birthday:** +- Added `birthday` which prints the age of your OS install. +- Added `--birthday_shorthand` and `$birthday_shorthand` to shorten/lengthen + the output of birthday. +- Added `--birthday_time` and `$birthday_time` to show/hide the time in the output. + +**Battery:** +- Added `battery` which prints the battery usage percentage for each battery + in your system. +- Linux: Added `battery_num` which allows you to choose which battery to display, + it also takes the value `all` which will print all batteries line by line. +- Linux: Added `battery_shorthand` which when set to `on` prints each battery on the + same line like so: + +``` sh +# battery_shorthand="on" +Battery: 10%, 5%, 67% + +# battery_shorthand="off" +Battery0: 10% +Battery1: 5% +Battery2: 67% + +# If there's only a single battery in the system +# we ommit the numbered title. +Battery: 10% +``` +- **NOTE:** This currently doesn't support BSD systems as we have no one to help us test + - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** + + +## [1.0] - 2016-01-27 + +# Fetch 1.0 + +There have been over **260** commits to master since I last made a release +and the script is at a point now where I can say that it's feature complete +so I'm releasing 1.0. The script now supports many more OS/distros and has +had lots of bug fixes, changes and features added. + +I'm probably missing a bunch of stuff from this changelog so if i've +forgotten anything, let me know! + +I'm also slowly adding pages to the wiki so check it out! + +# Here's what's new: +- Added full support for **Windows**, **BSD** and **Mac OS X**. +- Fetch is now MIT licensed +- Dropped the `.sh` from the filename and title. +- Dropped support for `mksh` so we can support some `bash` only features. +- Cleanup of everything +- Added `--prompt_height` and `$prompt_height` to fix the script going
+ offscreen due to multi-line shell prompts. This option should be set to
+ your prompt height in lines. +- The script now supports bash **4.0**. It turns out that we only
+ supported bash **4.3** +- Restore cursor and clear screen on ctrl+c. +- Swap `tput` cmds for `ansi escape sequences` where possible. +- Added folds to make the script easier to navigate in *vim. +- Added `-F` to grep where possible for a speedup where possible. +- Fix whitespace issues with different distros. +- Remove uneeded `$` symbols. +- Remove double negative tests. +- Added note about needing `procps` or `procps-ng` for uptime support. +- Fix syntax errors in script and readme. +- All vars now use `on/off` instead of `1/0`. +- Quote things that should be quoted. + +**Linux:** +- Fix issues with `Elementary OS` and `CentOS`. + +**Mac OS X:** +- Added support for other package managers. +- Fix issue with multiple resolutions in `getresolution` + +**Windows:** +- Added `getvisualstyle` function to get the current Windows theme. +- Added `choclatey` support to package count. + +**BSD:** +- Fix tput commands not working on BSD + +## Info: + +As of commit 9daacdd the info array at the top of the script has changed +to a regular function. The benefits of this are pretty cool, you can now +use any bash syntax to customize what gets displayed. You could have an +if statment and only print window manager and gtk themes if X is running +or only show current song if there's one playing. + +You can see some examples and read more about it here: + +https://github.com/dylanaraps/fetch/wiki/Customizing-Info + +
+ +**All:** +- All functions return `Unknown` or `None` instead of printing nothing.
+ +**Title:** +- You can now color the `@` symbol in the title using `--at_color`,
+ `$at_color` and `--colors x x x x x x`. + +**OS:** +- We now check `lsb_release` before looking inside of files, this fixes
+ detection for some *buntu based distros. +- We now exit if the OS type wasn't detected. + +**Window Manager:** +- `wmctrl` is now used by default if found. + +**Uptime:** +- Added `--uptime_shorthand` and `$uptime_shorthand` to make the output
+ of `uptime` smaller and prettier. +- Added new `--uptime_shorthand` and `$uptime_shorthand` value
+ called `tiny`. This makes the output even tinier. eg. `1d 10h 32m` + +**GTK:** +- Added functions to get GTK Theme, Icons and Font +- Added `--gtk{2,3}` and `$gtk{2,3}` to enable/disable gtk2 or gtk3 from
+ being displayed. +- Added `--gtk_shorthand` and `$gtk_shorthand` to make the output of
+ `gtk*` smaller and prettier. + +**Packages:** +- Remove package version and color from `Pacman` output +- All distros are now wildcarded so that version numbers from
+ `lsb_release` are ignored. + +**CPU:** +- Added more cpu speed types to `--speed_type` and `$speed_type`. +- Use `cpufreq` when available instead of hardcoding it for specific distros. + +**GPU:** + +See **[issue #21](https://github.com/dylanaraps/fetch/issues/21)** +- Added function to get the current Graphics Card. +- Added support for VirtualBox GPU. +- Added `--gpu_shorthand` and `$gpu_shorthand` to make the output of `gpu`
+ smaller and prettier. + +**Disk:** + +See **[issue #27](https://github.com/dylanaraps/fetch/issues/27)** +- Added function to get current/total disk usage. + +**Song:** +- Added `cmus` support. + +## Images: +- Added support for **iTerm2's** image rendering. +- Added `--image_backend` and `$image_backend` to change which program
+ is used to render the images. +- The image is now displayed **before** the text, this fixes image
+ rendering issues with **vte** based terminal emulators. +- Added `$w3m_img_path` to set the location of `w3mimgdisplay`. +- Unified all image options, the new var `$image` takes these
+ values: `wall`, `shuffle`, `path/to/img.png`, `off`. +- Added `shuffle` to image modes. The script can now pick a random
+ image from a specified folder to display. You can pick the shuffle
+ directory with `--shuffle_dir` and `$shuffle_dir` +- Fixed images getting cut off at the top. +- Added image size to filename which allowed us to remove a _really_
+ slow check. + +**Wallpaper:** +- Added `nitrogen` and `gsettings` support. +- Added wallpaper support to `Mac OS X` and `Windows`. +- Fix hang when wallpaper isn't found. +- We now check to see that `feh` set the wallpaper. +- Fixed wallpapers with spaces in the filename. +- `wall` is now the default image source. + +## Screenshot: + +The script can now take a screenshot on script finish. You can use +the flags `--scrot` or `-s` to take a screenshot. + +`--scrot` and `-s` can also take a path/filename so you can choose +where and what to name the file at launch. + +If left empty `--scrot` and `-s` will use `$scrot_dir` and +`$scrot_name` when saving the screenshot. + +By default the script uses `scrot` as the screenshot program. +You can use the launch flag `--scrot_cmd` or the option `$srot_cmd` +to set the program to use to take the screenshot. + +## Wiki: + +Added `Customizing Info` page which has info/examples about +the new printinfo function. + +https://github.com/dylanaraps/fetch/wiki/Customizing-Info + +Added `Customization` which lists all options and their values. + +https://github.com/dylanaraps/fetch/wiki/Customization + + +## [0.2.1] - 2016-01-04 + +Here's what's new: +- Mac OS X support (It's done now) +- Resolution Detection (Off by default) +- Song info is now off by default. +- You can now display the image on the right with: + - `--image_position left/right` +- Fixed bug with multiple colons +- Fixed underlines not being drawn the full width. +- Functions now fallback to "Unknown" instead of printing nothing. +- `getos` now gets os type and `getdistro` gets the distro. + - This makes it even easier to add other os types. + +Here's what I'm working on: +- Finishing OpenBSD support +- Cygwin support + +Enjoy + + +## [0.2] - 2016-01-03 + +I finished my rewrite! + +## Here's what's new: +- The script is now way faster. +- You can now pick what gets displayed and where using an array + at the top of the script. This also allows you to: + - underline anything + - print custom info + - print a custom title + - add linebreaks +- Mac OS X support and a base that allows us to add other OS later. +- You can now specify split size. +- Fixed issue with 2 line prompts +- Fixed image not displaying in vte based terminals +- Move all config options to the top of the script +- Moved almost everything to a function. +- Removed wmctrl dependency +- Made variable names more consistent +- Added shell substitution for cpu output. This means + that the cpu output won't include: (tm) (r) "Processor" "CPU" +- Optimized all get\* functions +- Use variable substitution where possible as it's faster than sed/awk +- Moved crop and smart_crop to crop_mode +- Removed --size and --padding in favor of --split_size + +## Here's what I'm currently working on: +- Window support (I'm almost done) +- Option to swap the image and text around +- Imagemagick optimizations +- Cleanup of info array handling +- More info outputs. Now that it's easy to customize what's printed and + everything is a function we can add optional support for pretty much anything. + - Resolution + - GTK themes + - Terminal Font + - GPU + - IP + - etc + +## Issues: +- Uptime doesn't work in OS X yet. +- If the customizable info includes a third colon then it breaks. + +I'd love to hear your thoughts. + + +## 0.1 - 2015-12-31 + +Changelog: +- Added flag to disable bold text `--nobold` +- Added flag to disable text wrapping `--nowrap` +- Moved to using only printf instead of a mix of echo/printf +- The script now aligns the cursor to the bottom of the + terminal instead of using a hardcoded amount of newlines +- Image size and padding is now dynamic, the only difference on the user + side is that instead of setting a long line of spaces as + padding, you set your font width. This means that you set the + var once and the script will just work at any window size. +- You can disable dynamic images and go back to the old + behaviour with by using the `--size` or the in config var. + $img_auto +- Manual padding now takes a count, so `--padding 10` will pad + the text 10 spaces. +- tput is now a dependency because we need (tput cols/lines/cup) + for the dynamic images and it allows us to support more terminals. +- Color block width can now be changed with the flag `--blockwidth`. + It takes a count like `--padding` so `--blockwidth 10` will make + the color blocks 10 spaces wide. + +Let me know if you're having issues. + + +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/3.4.0...HEAD +[3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 +[3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 +[3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0 +[3.1.0]: https://github.com/dylanaraps/neofetch/compare/3.0.1...3.1.0 +[3.0.1]: https://github.com/dylanaraps/neofetch/compare/3.0...3.0.1 +[3.0]: https://github.com/dylanaraps/neofetch/compare/2.0.2...3.0 +[2.0.2]: https://github.com/dylanaraps/neofetch/compare/2.0.1...2.0.2 +[2.0.1]: https://github.com/dylanaraps/neofetch/compare/2.0...2.0.1 +[2.0]: https://github.com/dylanaraps/neofetch/compare/1.9.1...2.0 +[1.9.1]: https://github.com/dylanaraps/neofetch/compare/1.9...1.9.1 +[1.9]: https://github.com/dylanaraps/neofetch/compare/1.8.1...1.9 +[1.8.1]: https://github.com/dylanaraps/neofetch/compare/1.8...1.8.1 +[1.8]: https://github.com/dylanaraps/neofetch/compare/1.7...1.8 +[1.7]: https://github.com/dylanaraps/neofetch/compare/1.6...1.7 +[1.6]: https://github.com/dylanaraps/neofetch/compare/1.5...1.6 +[1.5]: https://github.com/dylanaraps/neofetch/compare/1.4...1.5 +[1.4]: https://github.com/dylanaraps/neofetch/compare/1.3...1.4 +[1.3]: https://github.com/dylanaraps/neofetch/compare/1.2...1.3 +[1.2]: https://github.com/dylanaraps/neofetch/compare/1.1...1.2 +[1.1]: https://github.com/dylanaraps/neofetch/compare/1.0...1.1 +[1.0]: https://github.com/dylanaraps/neofetch/compare/0.2.1...1.0 +[0.2.1]: https://github.com/dylanaraps/neofetch/compare/0.2...0.2.1 +[0.2]: https://github.com/dylanaraps/neofetch/compare/0.1...0.2 From e4d3ad1f4203a6cb01cae8995353062491e0f46e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 19:52:08 +1000 Subject: [PATCH 291/300] general: Add back Makefile. --- Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..4adbd5f6 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +PREFIX ?= /usr +MANDIR ?= $(PREFIX)/share/man + +all: + @echo Run \'make install\' to install Neofetch. + +install: + @mkdir -p $(DESTDIR)$(PREFIX)/bin + @mkdir -p $(DESTDIR)$(MANDIR)/man1 + @cp -p neofetch $(DESTDIR)$(PREFIX)/bin/neofetch + @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 + @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch + +uninstall: + @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch + @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From 27df891ab90238c7765a54e880aa428d7e1a40f4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:51:29 +1000 Subject: [PATCH 292/300] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 621c1146..f958665b 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) +[![Discord](https://img.shields.io/discord/102860784329052160.svg)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 01721da4813190a082868f4145f60b931732b2dc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:54:11 +1000 Subject: [PATCH 293/300] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f958665b..0c86bf8e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/102860784329052160.svg)](https://discord.gg/BtnTPFF) +[![Discord](https://user-images.githubusercontent.com/7288322/34429152-141689f8-ecb9-11e7-8003-b5a10a5fcb29.png)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 6d003b2f2a96ce662423cc065120b006077399f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:57:17 +1000 Subject: [PATCH 294/300] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c86bf8e..fe11bb16 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://user-images.githubusercontent.com/7288322/34429152-141689f8-ecb9-11e7-8003-b5a10a5fcb29.png)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/102860784329052160.svg?style=social)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 5dbc0a27481d39b2195e68f24a8896a4b98c2fc7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:58:40 +1000 Subject: [PATCH 295/300] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe11bb16..c2395e48 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/102860784329052160.svg?style=social)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=for-the-badge)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 862a4c96dbfa173d0a033b3f3821422194eb2050 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:59:09 +1000 Subject: [PATCH 296/300] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2395e48..8bd32f21 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=for-the-badge)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=plastic)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From a9c4db2b54eb3bec86d57413052ec28f394825cc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 09:01:24 +1000 Subject: [PATCH 297/300] docs: update --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8bd32f21..4be61f4d 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ Packaging status +[![Discord](https://img.shields.io/discord/440354555197128704.svg)](https://discord.gg/BtnTPFF) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) -[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=plastic)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 8fe3130cbec6afefe8b43fdffa4c52938bc2e860 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 6 May 2018 16:16:27 +1000 Subject: [PATCH 298/300] gtk: Fix config file read order. Closes #972 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index dc65de71..a702ff11 100755 --- a/neofetch +++ b/neofetch @@ -2652,11 +2652,12 @@ get_style() { if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")" + elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then + gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" + elif [[ -f "/usr/share/gtk-2.0/gtkrc" ]]; then gtk2_theme="$(grep "^[^#]*${name}" /usr/share/gtk-2.0/gtkrc)" - elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then - gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" fi gtk2_theme="${gtk2_theme/${name}*=}" From f765caa03815aff2db5cdaa3b9fd0c9f447cb8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Sun, 6 May 2018 14:02:04 +0200 Subject: [PATCH 299/300] Tweak kitty font regex --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a702ff11..93f47b36 100755 --- a/neofetch +++ b/neofetch @@ -2906,7 +2906,7 @@ END fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /\s?font_size\s/ { size = $2 } END { print font " " size}' \ + /\^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From 859dc69b20acea4635024ed59904b10e64f9cb5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 May 2018 12:26:42 +1000 Subject: [PATCH 300/300] wm: Detect 2bwm manually --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index a702ff11..360fa83a 100755 --- a/neofetch +++ b/neofetch @@ -1580,6 +1580,7 @@ get_wm() { wm="$(ps -e | grep -m 1 -o -F \ -e "catwm" \ -e "dwm" \ + -e "2bwm" \ -e "monsterwm" \ -e "tinywm")"