Merge branch 'master' into hp-ux

.travis.yml

@@ -20,4 +20,8 @@ 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; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004; 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

CHANGELOG.md

@@ -1,22 +1,27 @@
 ## Contributors
 
+- [**@yslgirl**](https://github.com/yslgirl)
+- [**@iandrewt**](https://github.com/iandrewt)
+- [**@chrisweeksnz**](https://github.com/chrisweeksnz)
 
-## General
 
-- Config file now has a `.conf` suffix.
+## OS
-- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as 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
 
-**CPU**
+**Window Manager**
 
-- [Linux] Fixed inaccurate output on ARM SoC devices.
+- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt)
 
-**Terminal**
+**Install Date**
 
-- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells.
+- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt)
 
+**Resolution**
 
-## Images
+- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt)
-
-- Fixed division by 0 error in XTerm.

LICENSE.md

@@ -9,6 +9,9 @@ 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

Makefile

@@ -0,0 +1,29 @@
+PREFIX ?= /usr
+SYSCONFDIR ?= /etc
+MANDIR ?= $(PREFIX)/share/man
+
+all:
+	@echo Run \'make install\' to install Neofetch.
+
+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
+	@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

README.md

@@ -1,10 +1,10 @@
 # Neofetch
 
 [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch)
 [![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.
 
@@ -79,3 +79,13 @@ Thanks to:
     - Some of the ASCII logos.
 - [ufetch](https://github.com/jschx/ufetch):
     - Tiny ASCII logos
+
+
+
+## Donate
+
+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**

ascii/distro/amazon

@@ -0,0 +1,19 @@
+${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+:`

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/artix

@@ -0,0 +1,19 @@
+${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}...

ascii/distro/arya

@@ -0,0 +1,15 @@
+${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

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/debian_small

@@ -0,0 +1,6 @@
+  ${c1}_____
+ /  __ \\
+|  /    |
+|  \\___-
+-_
+  --_

ascii/distro/endless

@@ -0,0 +1,21 @@
+${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+:`
+

ascii/distro/freebsd_small

@@ -0,0 +1,7 @@
+${c1} /\\ _____ /\\
+ \\_)     (_/
+ /         \
+|           |
+|           |
+ \         /
+  --_____--

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/mac

@@ -1,16 +1,18 @@
-${c1}                -/+:.
+${c1}                    'c.
-               :++++.
+                 ,xNMM.
-              /+++/.
+               .OMMMMo
-      .:-::- .+/:-``.::-
+               OMMM0,
-   .:/++++++/::::/++++++/:`
+     .;loddo:' loolloddol;.
-${c2} .:///////////////////////:`
+   cKMMMMMMMMMMNWMMMMMMMMMM0:
- ////////////////////////`
+${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd.
-${c3}-+++++++++++++++++++++++`
+ XMMMMMMMMMMMMMMMMMMMMMMMX.
-/++++++++++++++++++++++/
+${c3};MMMMMMMMMMMMMMMMMMMMMMMM:
-${c4}/sssssssssssssssssssssss.
+:MMMMMMMMMMMMMMMMMMMMMMMM:
-:ssssssssssssssssssssssss-
+${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX.
-${c5} osssssssssssssssssssssssso/`
+ kMMMMMMMMMMMMMMMMMMMMMMMMWd.
- `syyyyyyyyyyyyyyyyyyyyyyyy+`
+ ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk
-${c6}  `ossssssssssssssssssssss/
+  .XMMMMMMMMMMMMMMMMMMMMMMMMK.
-    :ooooooooooooooooooo+.
+    ${c6}kMMMMMMMMMMMMMMMMMMMMMMd
-     `:+oo+/:-..-:/+o+/-
+     ;KMMMMMMMWXXWMMMMMMMk.
+       .cooc,.    .,coo:.
+

ascii/distro/mac_small

@@ -0,0 +1,8 @@
+${c1}       .:'
+    _ :'_
+${c2} .'`_`-'_``.
+:________.-'
+${c3}:_______:
+:_______:
+${c4} :_______`-;
+${c5}  `._.-._.'

ascii/distro/nixos_small

@@ -0,0 +1,7 @@
+  ${c1}\\\\  \\\\ //
+ ==\\\\__\\\\/ //
+   //   \\\\//
+==//     //==
+ //\\\\___//
+// /\\\\  \\\\==
+  // \\\\  \\\\

ascii/distro/nurunner

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

ascii/distro/parsix

@@ -0,0 +1,21 @@
+                 ${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}`.::-`

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

ascii/distro/refracta

@@ -0,0 +1,19 @@
+${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/
+

ascii/distro/sabotage

@@ -0,0 +1,12 @@
+
+${c2} .|'''.|      |     '||''|.    ..|''||
+ ||..  '     |||     ||   ||  .|'    ||
+  ''|||.    |  ||    ||'''|.  ||      ||
+.     '||  .''''|.   ||    || '|.     ||
+|'....|'  .|.  .||. .||...|'   ''|...|'
+
+|''||''|     |      ..|'''.|  '||''''|
+   ||       |||    .|'     '   ||  .
+   ||      |  ||   ||    ....  ||''|
+   ||     .''''|.  '|.    ||   ||
+  .||.   .|.  .||.  ''|...'|  .||.....|

ascii/distro/siduction

@@ -0,0 +1,21 @@
+${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??"
+

ascii/distro/source_mage

@@ -0,0 +1,21 @@
+${c2}       :ymNMNho.
+.+sdmNMMMMMMMMMMy`
+.-::/yMMMMMMMMMMMm-
+      sMMMMMMMMMMMm/
+     /NMMMMMMMMMMMMMm:
+    .MMMMMMMMMMMMMMMMM:
+    `MMMMMMMMMMMMMMMMMN.
+     NMMMMMMMMMMMMMMMMMd
+     mMMMMMMMMMMMMMMMMMMo
+     hhMMMMMMMMMMMMMMMMMM.
+     .`/MMMMMMMMMMMMMMMMMs
+        :mMMMMMMMMMMMMMMMN`
+         `sMMMMMMMMMMMMMMM+
+           /NMMMMMMMMMMMMMN`
+             oMMMMMMMMMMMMM+
+          ./sd.-hMMMMMMMMmmN`
+      ./+oyyyh- `MMMMMMMMMmNh
+                 sMMMMMMMMMmmo
+                 `NMMMMMMMMMd:
+                  -dMMMMMMMMMo
+                    -shmNMMms.

config/config.conf

@@ -9,7 +9,7 @@ print_info() {
     info underline
 
     info "OS" distro
-    info "Model" model
+    info "Host" model
     info "Kernel" kernel
     info "Uptime" uptime
     info "Packages" packages
@@ -26,6 +26,7 @@ print_info() {
     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
@@ -142,25 +143,23 @@ speed_type="bios_limit"
 # 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"
 
-# Shorten the output of the CPU function
+# Enable/Disable CPU brand in output.
 #
-# Default: 'off'
+# Default: 'on'
-# Values:  'on', 'off', 'tiny', 'name', 'speed'
+# Values:  'on', 'off'
-# Flag:    --cpu_shorthand
+# Flag:    --cpu_brand
 #
 # Example:
-# on:    'i7-6500U (4) @ 3.1GHz'
+# on:   'Intel i7-6500U'
-# off:   'Intel i7-6500U (4) @ 3.1GHz'
+# off:  'i7-6500U (4)'
-# tiny:  'i7-6500U (4)'
+cpu_brand="on"
-# name:  'Intel i7-6500U (4)'
-# speed: '3.1GHz'
-cpu_shorthand="off"
 
 # CPU Speed
 # Hide/Show CPU speed.
@@ -195,7 +194,9 @@ cpu_cores="logical"
 # Default: 'off'
 # Values:  'C', 'F', 'off'
 # Flag:    --cpu_temp
-# Supports: Linux
+# 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]'
@@ -717,9 +718,15 @@ 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.2.1-git"
+config_version="3.3.1-git"

config/travis.conf

@@ -5,8 +5,8 @@ print_info() {
     info title
     info underline
 
-    info "Model" model
     info "OS" distro
+    info "Host" model
     info "Kernel" kernel
     info "Uptime" uptime
     info "Packages" packages
@@ -21,6 +21,7 @@ print_info() {
     info "Terminal Font" term_font
     info "CPU" cpu
     info "GPU" gpu
+    info "GPU Driver" gpu_driver
     info "Memory" memory
 
     info "CPU Usage" cpu_usage

install.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-while [ "$1" ]; do
-	case "$1" in
-		"--destdir") DESTDIR="$2" ;;
-		"--bindir") BINDIR="$2" ;;
-		"--confdir") CONFDIR="$2" ;;
-		"--prefix") PREFIX="$2" ;;
-		"--asciidir") ASCIIDIR="$2" ;;
-		"--mandir") MANDIR="$2" ;;
-	esac
-	shift
-done
-
-if [ -z "$PREFIX" ]; then
-	[ -z "$BINDIR" ] && BINDIR="/usr/bin"
-	[ -z "$ASCIIDIR" ] && ASCIIDIR="/usr/share/neofetch/ascii/distro"
-	[ -z "$MANDIR" ] && MANDIR="/usr/share/man/man1"
-else
-	[ -z "$BINDIR" ] && BINDIR="/bin"
-	[ -z "$ASCIIDIR" ] && ASCIIDIR="/share/neofetch/ascii/distro"
-	[ -z "$MANDIR" ] && MANDIR="/share/man/man1"
-fi
-[ -z "$CONFDIR" ] && CONFDIR="/etc/neofetch"
-
-mkdir -p "${DESTDIR}""${PREFIX}""${BINDIR}"
-mkdir -p "${DESTDIR}""${PREFIX}""${CONFDIR}"
-mkdir -p "${DESTDIR}""${PREFIX}""${ASCIIDIR}"
-mkdir -p "${DESTDIR}""${PREFIX}""${MANDIR}"
-
-sed -i -e "s|CONFDIR|${PREFIX}${CONFDIR}|g" neofetch
-sed -i -e "s|ASCIIDIR|${PREFIX}${ASCIIDIR}|g" neofetch
-
-cp -p neofetch "${DESTDIR}""${PREFIX}""${BINDIR}"
-cp -p config/config.conf "${DESTDIR}""${PREFIX}""${CONFDIR}"
-cp -p ascii/distro/* "${DESTDIR}""${PREFIX}""${ASCIIDIR}"
-cp -p neofetch.1 "${DESTDIR}""${PREFIX}""${MANDIR}"

neofetch.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH NEOFETCH "1" "June 2017" "Neofetch 3.2.1-git" "User Commands"
+.TH NEOFETCH "1" "September 2017" "Neofetch 3.3.0" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -18,7 +18,7 @@ NOTE: Every launch flag has a config option.
 Allows you to disable an info line from appearing
 in the output.
 .IP
-NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu disk shell'
+NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu'
 .TP
 \fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
@@ -33,9 +33,11 @@ NOTE: This only supports Linux with cpufreq.
 \fB\-\-speed_shorthand\fR on/off
 Whether or not to show decimals in CPU speed.
 .TP
-\fB\-\-cpu_shorthand\fR type
+NOTE: This flag is not supported in systems with CPU speed less than
-Shorten the output of CPU
+1 GHz.
-Possible values: name, speed, tiny, on, off
+.TP
+\fB\-\-cpu_brand\fR on/off
+Enable/Disable CPU brand in output.
 .TP
 \fB\-\-cpu_cores\fR type
 Whether or not to display the number of CPU cores
@@ -50,8 +52,9 @@ Hide/Show cpu speed.
 Hide/Show cpu temperature.
 .IP
 NOTE: This only works on Linux and BSD.
-.IP
+.TP
-NOTE: For FreeBSD\-based systems, you need to enable coretemp kernel module.
+NOTE: For FreeBSD and NetBSD\-based systems, you need to enable
+coretemp kernel module. This only supports newer Intel processors.
 .TP
 \fB\-\-distro_shorthand\fR on/off
 Shorten the output of distro (tiny, on, off)
@@ -181,11 +184,13 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'sixel', 'tycat', 'w3m'
+Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off',
+\&'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
 Which image or ascii file to use.
-Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img',
+\&'/path/to/ascii', '/path/to/dir/'
 .TP
 \fB\-\-ascii\fR source
 Shortcut to use 'ascii' backend.
@@ -217,7 +222,8 @@ Shortcut to use 'w3m' backend.
 \fB\-\-off\fR
 Shortcut to use 'off' backend.
 .IP
-NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img',
+\&'/path/to/ascii', '/path/to/dir/'
 .SS "ASCII:"
 .TP
 \fB\-\-ascii_colors\fR x x x x x x
@@ -231,12 +237,14 @@ NOTE: Arch and Ubuntu have 'old' logo variants.
 NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos.
 .IP
 NOTE: Ubuntu has flavor variants.
+.TP
+NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME',
+\&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors.
+.TP
+NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS,
+OpenBSD, and Void have a smaller logo variant.
 .IP
-NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', 'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors.
+NOTE: Use '{distro name}_small' to use the small variants.
-.IP
-NOTE: Alpine, Arch, Crux, Gentoo, OpenBSD, and Void have a smaller logo variant.
-.IP
-NOTE: Change this to 'alpine_small', 'arch_small', 'crux_small', 'gentoo_small', 'openbsd_small', and 'void_small' to use the small logos.
 .TP
 \fB\-\-ascii_bold\fR on/off
 Whether or not to bold the ascii logo.
@@ -248,7 +256,8 @@ Possible values: bar, infobar, barinfo, off
 .SS "IMAGE:"
 .TP
 \fB\-\-loop\fR
-Redraw the image constantly until Ctrl+C is used. This fixes issues in some terminals emulators when using image mode.
+Redraw the image constantly until Ctrl+C is used. This fixes issues
+in some terminals emulators when using image mode.
 .TP
 \fB\-\-size\fR 00px | \fB\-\-size\fR 00%
 How to size the image.
@@ -277,8 +286,9 @@ This only works with w3m.
 .TP
 \fB\-\-gap\fR num
 Gap between image and text.
-.IP
+.TP
-NOTE: \fB\-\-gap\fR can take a negative value which will move the text closer to the left side.
+NOTE: \fB\-\-gap\fR can take a negative value which will move the text
+closer to the left side.
 .TP
 \fB\-\-clean\fR
 Delete cached files and thumbnails.
@@ -303,6 +313,9 @@ Specify a path to a custom config file
 \fB\-\-config\fR none
 Launch the script without a config file
 .TP
+\fB\-\-stdout\fR
+Turn off all colors and disables any ASCII/image backend.
+.TP
 \fB\-\-help\fR
 Print this text and exit
 .TP
@@ -334,6 +347,9 @@ 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