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" ;;