From 2071fe608c473b0f3418bc85c99d50329b760757 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:03:18 +0100 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 8f25d0190bde4b4d912a96defc8ace64da9c8d59 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 16:49:32 +0100 Subject: [PATCH 5/7] 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 6/7] 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 7/7] 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" ;;