Merge branch 'master' into hp-ux

Update Kubuntu Logo

CHANGELOG.md

@@ -1,122 +1,27 @@
 ## Contributors
 
-- **[@konimex](https://github.com/konimex)**
+- [**@yslgirl**](https://github.com/yslgirl)
-- **[@mstraube](https://github.com/mstraube)**
+- [**@iandrewt**](https://github.com/iandrewt)
-- **[@dominiklohmann](https://github.com/dominiklohmann)**
+- [**@chrisweeksnz**](https://github.com/chrisweeksnz)
-- **[@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
+## OS
-
-- 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.
 
+- 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
 
-**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)**
+- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt)
-- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)**
 
-**Song**
+**Install Date**
 
-- Added support for Pogo. **[@mstraube](https://github.com/mstraube)**
+- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt)
-- Fixed bug with players not being found.
 
-**Battery**
+**Resolution**
 
-- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)**
+- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt)
-
-
-## 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)**

ascii/distro/archlabs

@@ -1,18 +1,21 @@
-${c1}                 sy
+${c1}                     'c'                     
-                h--d
+                    'kKk,                    
-               d---:
+                   .dKKKx.                   
-               :----/N
+                  .oKXKXKd.                  
-              :------/N
+                 .l0XXXXKKo.                 
-            N/----:---+
+                 c0KXXXXKX0l.                
-           N/---+/ :--:o
+                :0XKKOxxOKX0l.               
-          N/--:/    ::::s
+               :OXKOc. .c0XX0l.              
-          +---       ::::s
+              :OK0o. ${c4}...${c1}'dKKX0l.             
-        N+---+        ::::s
+             :OX0c  ${c4};xOx'${c1}'dKXX0l.            
-       N+----o  +:o   s::::s
+            :0KKo.${c4}.o0XXKd'.${c1}lKXX0l.           
-      N/----:: s:::s  h:::::s
+           c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l.          
-     N/----:::y::::+  o::::::o
+         .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo.         
-    N/---::::::::::s d::::::::+N
+        .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo.        
-    /--::::::::::::dd::::::::::+N
+       .o0XXXX0d,${c4}:x;   .oKKx'${c1}.dXKXXKd.       
-   :-:::/+syhd  NNN N  dhys+/:::/
+      .oKXXXXKK0c.${c4};.    :00c'${c1}cOXXXXXKd.      
- d::+ydN                      /s+/d
+     .dKXXXXXXXXk,${c4}.     cKx'${c1}'xKXXXXXXKx'     
-arc                               y\\.
+    'xKXXXXK0kdl:.     ${c4}.ok; ${c1}.cdk0KKXXXKx'    
+   'xKK0koc,..         ${c4}'c, ${c1}    ..,cok0KKk,   
+  ,xko:'.             ${c4}.. ${c1}           .':okx;  
+ .,'.                                   .',. 

ascii/distro/coreos

@@ -0,0 +1,20 @@
+${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:;..           
+                .....               

ascii/distro/kubuntu

@@ -1,20 +1,20 @@
 ${c1}           `.:/ossyyyysso/:.
         .:oyyyyyyyyyyyyyyyyyyo:`
-      -oyyyyyyyo-``/yyyyyyysyyyyo-
+      -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo-
-    -syyyyyyyyyy`   +yyyy/` `/yyyys-
+    -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys-
-   +yyys/./syyyy:    ..-`    /yyyyyy+
+   oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo
- `oyyyy:   `:syys+oooo+:.   .yyyyyyyyo`
+ `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo`
- +yyyyyy/   `/yyyyyyyyyyys/` /sssssyyy+
+ oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo
--yyyyyyyy- -syyyyyyyyyyyyyys-      syyy-
+-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy-
-oyyyyso+: .yyyyyyyyyyyyyyyyyy.   `.+yyyo
+oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo
-yyys      /yyyyyyyyyyyyyyyyyysosyyyyyyyy
+yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy
-yyys.`    /yyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy
-oyyyyyso: .yyyyyyyyyyyyyyyyyy.`.-:/syyyo
+oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo
--yyyyyyyy. -syyyyyyyyyyyyyys-      syyy-
+-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy-
- +yyyyyy:   `syyyyyyyyyyys/` /o+++oyyy+
+ oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo
- `oyyyy.   -syyy++oooo+/.   oyyyyyyyyo
+ `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo
-   +yyys/-oyyyys`   `..`    -yyyyyyy+
+   oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo
-    -syyyyyyyyy:   .syyy/`  `syyyys-
+    -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys-
-      -oyyyyyyy:.`-yyyyyys+syyyyo-
+      -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo-
         ./oyyyyyyyyyyyyyyyyyyo/.
            `.:/oosyyyysso/:.`

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}          __
+         |  |   _ _ ___ ___ ___
+         |  |__| | |   | .'|  _|
+         |_____|___|_|_|__,|_|

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}/////    
+      ///////////////////////////      
+         /////////////////////         
+             /////////////
+

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
@@ -729,4 +729,4 @@ stdout="off"
 #
 # NOTE: Don't change this value, neofetch reads this to determine
 # how to handle backwards compatibility.
-config_version="3.3.0"
+config_version="3.3.1-git"

neofetch

@@ -9,7 +9,7 @@
 # https://github.com/dylanaraps/
 
 # Neofetch version.
-version="3.3.0"
+version="3.3.1-git"
 
 bash_version="${BASH_VERSION/.*}"
 sys_locale="${LANG:-C}"
@@ -44,6 +44,7 @@ get_os() {
         "MINIX") os="MINIX" ;;
         "AIX") os="AIX" ;;
         "IRIX64") os="IRIX" ;;
+        "HP-UX") os="HP-UX" ;;
         *)
             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
@@ -160,6 +161,7 @@ get_distro() {
                 fi
             fi
             distro="$(trim_quotes "$distro")"
+            distro="${distro/'NAME='}"
         ;;
 
         "Mac OS X")
@@ -176,6 +178,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" ;;
                 *)        codename="macOS" ;;
             esac
             distro="$codename $osx_version $osx_build"
@@ -186,7 +189,7 @@ get_distro() {
                     case "$osx_version" in
                         "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;;
                         "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;;
-                        "10.12"*) distro="${distro/${codename}/macOS}" ;;
+                        "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;;
                     esac
                     distro="${distro/ ${osx_build}}"
                 ;;
@@ -224,8 +227,11 @@ get_distro() {
             distro="AIX $(oslevel)"
         ;;
 
-        "IRIX")
+        "IRIX" | "HP-UX")
-            distro="IRIX ${kernel_version}"
+            distro="$os ${kernel_version}"
+            case "$distro_shorthand" in
+                "on" | "tiny") distro="${distro/ ${kernel_version}}" ;;
+            esac
         ;;
     esac
 
@@ -277,13 +283,16 @@ get_model() {
         "iPhone OS")
             case "$machine_arch" in
                 "iPad1,1") model="iPad" ;;
-                "iPad2,"[1-4]) model="iPad2" ;;
+                "iPad2,"[1-4]) model="iPad 2" ;;
-                "iPad3,"[1-3]) model="iPad3" ;;
+                "iPad3,"[1-3]) model="iPad 3" ;;
-                "iPad3,"[4-6]) model="iPad4" ;;
+                "iPad3,"[4-6]) model="iPad 4" ;;
+                "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)" ;;
                 "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" ;;
@@ -304,6 +313,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" ;;
@@ -331,6 +343,10 @@ get_model() {
         "AIX")
             model="$(/usr/bin/uname -M)"
         ;;
+
+        "HP-UX")
+            model="$(model)"
+        ;;
     esac
 
     # Remove dummy OEM info.
@@ -344,6 +360,8 @@ get_model() {
     model="${model//Default string}"
     model="${model//Not Specified}"
     model="${model//Type1ProductConfigId}"
+    model="${model//INVALID}"
+    model="${model//<2F>}"
 
     case "$model" in
         "Standard PC"*) model="KVM/QEMU (${model})" ;;
@@ -358,8 +376,8 @@ get_title() {
 }
 
 get_kernel() {
-    # Since these OS are integrated systems, it's better to skip this function altogether
+    # Since AIX has no useful output in uname, it's better to skip this function altogether
-    [[ "$os" =~ (AIX|IRIX) ]] && return
+    [[ "$os" == "AIX" ]] && return
 
     case "$kernel_shorthand" in
         "on")  kernel="$kernel_version" ;;
@@ -367,7 +385,7 @@ get_kernel() {
     esac
 
     # Hide kernel info if it's identical to the distro info.
-    if [[ "$os" =~ (BSD|MINIX) && "$distro" == *"$kernel_name"* ]]; then
+    if [[ "$os" =~ (BSD|MINIX|IRIX|HP-UX) && "$distro" == *"$kernel_name"* ]]; then
         case "$distro_shorthand" in
             "on" | "tiny") kernel="$kernel_version" ;;
             *) unset kernel ;;
@@ -407,8 +425,8 @@ get_uptime() {
                     seconds="${seconds/.*}"
                 ;;
 
-                "AIX" | "IRIX")
+                "AIX" | "IRIX" | "HP-UX")
-                    t="$(LC_ALL=POSIX ps -o etime= -p 1)"
+                    t="$(LC_ALL=POSIX UNIX95=1 ps -o etime= -p 1)"
                     d="0" h="0"
                     case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac
                     case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac
@@ -589,6 +607,10 @@ get_packages() {
         "IRIX")
             packages="$(($(versions -b | wc -l)-3))"
         ;;
+
+        "HP-UX")
+            packages="$(($(swlist -l product | wc -l)-6))"
+        ;;
     esac
 
     ((packages == 0)) && unset packages
@@ -704,11 +726,11 @@ get_wm() {
     else
         case "$os" in
             "Mac OS X")
-                ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hunkwm')"
+                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" ;;
@@ -1060,6 +1082,18 @@ get_cpu() {
             # Get CPU cores.
             cores="$(sysconf NPROC_ONLN)"
         ;;
+
+        "HP-UX")
+            # Get CPU name.
+            # This will be partial for now, because apparently hppa and
+            # IA64 has different approaches of how it should be handled.
+
+            # Get CPU speed.
+            # Same reasons as above.
+
+            # Get CPU cores.
+            cores="$(ioscan -k | grep -c "processor")"
+        ;;
     esac
 
     # Remove un-needed patterns from cpu output.
@@ -1395,6 +1429,13 @@ get_memory() {
             mem_free="$((mem_stat[5] / 1024))"
             mem_used="$((mem_total - mem_free))"
         ;;
+
+        "HP-UX")
+            mem_total="$(machinfo | awk -F':' '/Memory/ {print $2}')"
+            mem_total="${mem_total/MB*}"
+            mem_free="$(($(vmstat | awk 'NR==3{printf $5}') / 1024))"
+            mem_used="$((mem_total - mem_free))"
+        ;;
     esac
     memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}"
 
@@ -1410,7 +1451,7 @@ 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/ {printf $5 " " $6; exit}')"
+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.
@@ -1441,6 +1482,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo/ {printf $5 " " $6;
         "yarock"*)       get_song_dbus "yarock" ;;
         "deepin-music"*) get_song_dbus "deepinmusic" ;;
         "tomahawk"*)     get_song_dbus "tomahawk" ;;
+        "elisa"*)        get_song_dbus "elisa" ;;
 
         "audacious"*)
             song="$(audtool current-song)"
@@ -1536,14 +1578,18 @@ get_resolution() {
                               awk '/Resolution:/ {printf $2"x"$4" @ "$6"Hz, "}')"
             fi
 
-            scale_factor="$(PlistBuddy -c "Print DisplayAnyUserSets:0:0:Resolution" \
+            if [[ -e "/Library/Preferences/com.apple.windowserver.plist" ]]; then
-                            /Library/Preferences/com.apple.windowserver.plist)"
+                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
@@ -1617,7 +1663,12 @@ get_style() {
                     kde_config_file="${kde_config_dir}/kdeglobals"
 
                     kde_theme="$(grep "^${kde}" "$kde_config_file")"
-                    kde_theme="${kde_theme/${kde}*=}"
+                    kde_theme="${kde_theme/*=}"
+                    if [[ "$kde" == "font" ]]; then
+                        kde_font_size="${kde_theme#*,}"
+                        kde_font_size="${kde_font_size/,*}"
+                        kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}"
+                    fi
                     kde_theme="$(uppercase "$kde_theme") [KDE], "
                 else
                     err "Theme: KDE config files not found, skipping."
@@ -2024,7 +2075,10 @@ 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[@]:-/}"))
+    case "$os" in
+        "HP-UX") disks=($(bdf "${disk_show[@]:-/}" 2>/dev/null)); df_version="bdf" ;;
+        *) disks=($(df "${df_flags[@]}" "${disk_show[@]:-/}" 2>/dev/null)) ;;
+    esac
     unset 'disks[0]'
     IFS="$old_ifs"
 
@@ -2040,9 +2094,10 @@ get_disk() {
         disk_perc="${disk_info[4]/'%'}"
 
         case "$df_version" in
-            *"befhikm"*)
+            *"befhikm"*|"bdf")
-                disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)"
+                disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024)) (${disk_perc}%)"
             ;;
+
             *) disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" ;;
         esac
 
@@ -2220,6 +2275,7 @@ get_install_date() {
             esac
         ;;
         "AIX") install_file="/var/adm/ras/bosinstlog" ;;
+        "HP-UX") install_file="/dev/config" ;;
     esac
 
     ls_prog="$(ls --version 2>&1)"
@@ -2240,12 +2296,18 @@ get_install_date() {
             install_date="$(ls -tcd --full-time "$install_file" | awk '{printf $6 " " $7}')"
         ;;
 
-        *"ACFHLNRS"* | *"RadC1xmnlog"*) # AIX ls / IRIX ls
+        *"ACFHLNRS"* | *"RadC1xmnlog"* | *"1ARadeCx"*) # AIX ls / IRIX ls / HP-UX ls
             err "Install Date doesn't work because your 'ls' doesn't support full date/time."
             return
         ;;
 
-        *) install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" ;;
+        *"HLOPRSTUWabc"*) # macOS ls
+            install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')"
+        ;;
+
+        *)
+            install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')"
+        ;;
     esac
 
     install_date="${install_date//-/ }"
@@ -2265,6 +2327,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
 }
 
@@ -2483,7 +2552,7 @@ get_wallpaper() {
 
                 *)
                     if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then
-                        image="$(awk -F\' '/feh/ {printf $2}' "${HOME}/.fehbg")"
+                        image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")"
 
                     elif type -p nitrogen >/dev/null; then
                         image="$(awk -F'=' '/file/ {printf $2;exit;}' \
@@ -3194,6 +3263,11 @@ get_distro_colors() {
             ascii_file="cloveros"
         ;;
 
+        "Container Linux by CoreOS"*)
+            set_colors 4 7 1
+            ascii_file="coreos"
+        ;;
+
         "crux_small")
             set_colors 4 5 7 6
             ascii_file="crux_small"
@@ -3374,6 +3448,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"
@@ -3529,6 +3608,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"