W3m: Fix zws

Term: Add font support for mate-terminal

.github/ISSUE_TEMPLATE.md

@@ -7,6 +7,8 @@ If you're suggesting a new feature then just a description will suffice.
 
 ## Screenshot
 
+## Config file
+
 ## Verbose log
 
 1. Run `neofetch -vv 2> neofetchlog`

.travis.yml

@@ -17,7 +17,7 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
 
 script:
-    - time ./neofetch --ascii --config travis -v
+    - time ./neofetch --ascii --config config/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; fi

CHANGELOG.md

@@ -1,252 +1,41 @@
-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)**
+- **[@MatthewCox](https://github.com/MatthewCox)**
-- **[@iandrewt](https://github.com/iandrewt)**
+- **[@dawidd6](https://github.com/dawidd6)**
-- **[@jorgegonzalez](https://github.com/jorgegonzalez)**
+- **[@erikdubois](https://github.com/erikdubois)**
-- **[@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.
+- Minimum required BASH version is now 3.2.
-- The Makefile was rewritten to remove GNU-isms.
+    - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.)
-- 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**<br \>
-
-- [Fish] Fixed memory leak caused by Fish.
-- Added support for `xonsh`.
-- Fixed version output on `ksh`.
-- Rewrote the function to remove duplicate code.
-
-**Uptime**<br \>
-
-- Moved duplicate code to a function.
-- Changed `$uptime_shorthand` to `on` by default.
-
-**Desktop Environment**<br \>
-
-- 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**<br \>
-
-- [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**<br \>
-
-- Added Haiku cores command.
-- Updated Linux and macOS commands to the match the commands in the `get_cpu()` function.
-
-**GPU**<br \>
-
-- [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**<br \>
-
-- [Solaris] Fixed inaccurate used memory size.
-
-**Resolution**<br \>
-
-- [Windows] Declare variables locally to fix conflicts in other functions.
-
-**~~Birthday~~ Install Date**<br \>
-
-- 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**<br \>
-
-- 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**<br \>
-
-- [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**<br \>
-
-- Fixed WM Theme not detected on MATE. **[@mstraube](https://github.com/mstraube)**
-- Fixed WM Theme detection on KDE. **[@mstraube](https://github.com/mstraube)**
-
-**Song**<br \>
-
-- 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**<br \>
-
-- 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**<br \>
-
-- [MacOS] Fixed issue where battery always appears as charging. **[@jorgegonzalez](https://github.com/jorgegonzalez)**
-
-**Local IP**<br \>
-
-- [BSD and Solaris] Merged the detection to Linux.
-- [Windows] Support multiple interfaces.
-
-**Color Blocks**<br \>
-
-- 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.
+- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second.
-- Fixed bug where image mode would attempt to run in a TTY.
+    - This is a workaround to the images disappearing on resize and workspace switch.
-- All of the image/ascii backend handling was rewritten. Backend and Image/File/Directory selection is universal now and should make usage easier.
+    - Use Ctrl+C to exit.
-    - 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.
+- Added Ubuntu-MATE ascii art.
-    - Removed a call to `tr` for those using `bash 3`.
+- Fixed ArchLabs ascii art.  **[@erikdubois](https://github.com/erikdubois)**
-    - 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
+## Info
 
-- Use arrays for `$scrot_program`
+**Terminal Emulator**
 
+- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)**
+- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)**
 
-## Args
+**GPU**
 
-- Fixed bug where `neofetch --config` sourced the user config twice.
+- [Linux] Fixed GPU sort.
-- Cleaned up config arg handling.
+
+**Song**
+
+- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)**

README.md

@@ -6,11 +6,11 @@
 [![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)
 
-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 and etc.
+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.
 
-Neofetch can be used on any OS that has BASH, 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`, and `Windows (Cygwin/MSYS2/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`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`.
 
 For more information:
 
@@ -48,7 +48,7 @@ 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!
+If you don't want to use the config file you can customize almost everything using launch flags.
 
 Here's an example neofetch alias:
 
@@ -76,6 +76,6 @@ Thanks to:
     - 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.
+    - Some of the ASCII logos.
 - [ufetch](https://github.com/jschx/ufetch):
-    - Tiny ascii logos
+    - Tiny ASCII logos

ascii/distro/arch

@@ -7,9 +7,9 @@ ${c1}                   -`
              `/:-:++oooo+:
             `/++++/+++++++:
            `/++++++++++++++:
-          `/+++ooooooooooooo/`
+          `/+++o${c2}oooooooo${c1}oooo/`
-         ./ooosssso++osssssso+`
+${c2}         ${c1}./${c2}ooosssso++osssssso${c1}+`
-        .oossssso-````/ossssss+`
+${c2}        .oossssso-````/ossssss+`
        -osssssso.      :ssssssso.
       :osssssss/        osssso+++.
      /ossssssss/        +ssssooo/-

ascii/distro/archbox

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

ascii/distro/archlabs

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

ascii/distro/desaos

@@ -0,0 +1,16 @@
+${c1}███████████████████████
+███████████████████████
+███████████████████████
+███████████████████████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+██████████████████████████████
+██████████████████████████████
+████████████████████████
+████████████████████████
+████████████████████████

ascii/distro/nitrux

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

ascii/distro/obrevenge

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

ascii/distro/openbsd

@@ -7,8 +7,8 @@ ${c1}     / ||\| Y J  )   / |/| ./
     J  |)'( |        ` F`.'/       ${c3} _
 ${c1}  -<|  F         __     .-<        ${c3}(_)
 ${c1}    | /       .-'${c3}. ${c1}`.  /${c3}-. ${c1}L___
-    J \\      <    ${c3}\ ${c1} | | ${c5}O${c3}\\\\${c1}|.-' ${c3} _
+    J \\      <    ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _
-${c1}  _J \\  .-    \\\\${c3}/ ${c5}O ${c3}| ${c1}| \\  |${c1}F    ${c3}(_)
+${c1}  _J \\  .-    \\${c3}/ ${c5}O ${c3}| ${c1}| \\  |${c1}F    ${c3}(_)
 ${c1} '-F  -<_.     \\   .-'  `-' L__
 __J  _   _.     >-'  ${c1})${c4}._.   ${c1}|-'
 ${c1} `-|.'   /_.          ${c4}\_|  ${c1} F

ascii/distro/parabola

@@ -1,17 +1,16 @@
-${c1}              eeeeeeeee
+${c1}                          `.-.    `.
-          eeeeeeeeeeeeeee
+                   `.`  `:++.   `-+o+.
-       eeeeee${c2}//////////${c1}eeeee
+             `` `:+/. `:+/.   `-+oooo+
-     eeeee${c2}///////////////${c1}eeeee
+        ``-::-.:+/. `:+/.   `-+oooooo+
-   eeeee${c2}///           ////${c1}eeee
+    `.-:///-  ..`   .-.   `-+oooooooo-
-  eeee${c2}//              ///${c1}eeeee
+ `..-..`                 `+ooooooooo:
- eee                 ${c2}///${c1}eeeee
+``                        :oooooooo/
-ee                  ${c2}//${c1}eeeeee
+                          `ooooooo:
-e                  ${c2}/${c1}eeeeeee
+                          `oooooo:
-                  eeeeeee
+                          -oooo+.
-                 eeeeee
+                          +ooo/`
-                eeeeee
+                         -ooo-
-               eeeee
+                        `+o/.
-              eeee
+                        /+-
-            eee
+                       //`
-           ee
+                      -.
-          e

ascii/distro/raspbian

@@ -1,18 +1,23 @@
-${c1}  .',;:cc;,'.    .,;::c:,,.
+${c1}  `.::///+:/-.        --///+//-:``
- ,ooolcloooo:  'oooooccloo:
+ `+oooooooooooo:   `+oooooooooooo:
- .looooc;;:ol  :oc;;:ooooo'
+  /oooo++//ooooo:  ooooo+//+ooooo.
-   ;oooooo:      ,ooooooc.
+  `+ooooooo:-:oo-  +o+::/ooooooo:
-     .,:;'.       .;:;'.
+   `:oooooooo+``    `.oooooooo+-
-     ${c2}.... ..'''''. ....
+     `:++ooo/.        :+ooo+/.`
-   .''.   ..'''''.  ..''.
+        ${c2}...`  `.----.` ``..
-   ..  .....    .....  ..
+     .::::-``:::::::::.`-:::-`
-  .  .'''''''  .''''''.  .
+    -:::-`   .:::::::-`  `-:::-
-.'' .''''''''  .'''''''. ''.
+   `::.  `.--.`  `` `.---.``.::`
-'''  '''''''    .''''''  '''
+       .::::::::`  -::::::::` `
-.'    ........... ...    .'.
+ .::` .:::::::::- `::::::::::``::.
-  ....    ''''''''.   .''.
+-:::` ::::::::::.  ::::::::::.`:::-
-  '''''.  ''''''''. .'''''
+::::  -::::::::.   `-::::::::  ::::
-   '''''.  .'''''. .'''''.
+-::-   .-:::-.``....``.-::-.   -::-
-    ..''.     .    .''..
+ .. ``       .::::::::.     `..`..
-          .'''''''
+   -:::-`   -::::::::::`  .:::::`
-           ......
+   :::::::` -::::::::::` :::::::.
+   .:::::::  -::::::::. ::::::::
+    `-:::::`   ..--.`   ::::::.
+      `...`  `...--..`  `...`
+            .::::::::::
+             `.-::::-`

ascii/distro/slitaz

@@ -0,0 +1,17 @@
+${c1}        @    @(               @        
+      @@   @@                  @    @/ 
+     @@   @@                   @@   @@ 
+    @@  %@@                     @@   @@
+   @@  %@@@       @@@@@.       @@@@  @@
+  @@@    @@@@    @@@@@@@    &@@@    @@@
+   @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/
+       ,@@@@@@@@@@@@@@@@@@@@@@@@@      
+  .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/  
+@@@@@@.  @@@@@@@@@@@@@@@@@@@@@  /@@@@@@
+@@    @@@@@  @@@@@@@@@@@@,  @@@@@   @@@
+@@ @@@@.    @@@@@@@@@@@@@%    #@@@@ @@.
+@@ ,@@      @@@@@@@@@@@@@      @@@  @@ 
+@   @@.     @@@@@@@@@@@@@     @@@  *@  
+@    @@     @@@@@@@@@@@@      @@   @   
+      @      @@@@@@@@@.     #@         
+       @      ,@@@@@       @           

ascii/distro/ubuntu-mate

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

config/config

@@ -3,9 +3,6 @@
 # Neofetch config file
 # https://github.com/dylanaraps/neofetch
 
-# Speed up script by not using unicode
-export LC_ALL=C
-export LANG=C
 
 # See this wiki page for more info:
 # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
@@ -40,6 +37,7 @@ print_info() {
     # 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
@@ -141,6 +139,17 @@ shell_version="on"
 # 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.
+#
+# Example:
+# on:    'i7-6500U (4) @ 3.1GHz'
+# off:   'i7-6500U (4) @ 3.100GHz'
+speed_shorthand="off"
+
 # Shorten the output of the CPU function
 #
 # Default: 'off'
@@ -320,7 +329,7 @@ disk_show=('/')
 # What to append to the Disk subtitle.
 #
 # Default: 'mount'
-# Values:  'mount', 'name'
+# Values:  'mount', 'name', 'dir'
 # Flag:    --disk_subtitle
 #
 # Example:
@@ -329,6 +338,11 @@ disk_show=('/')
 #
 # 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"
 
 
@@ -526,6 +540,7 @@ disk_display="off"
 
 # Backend Settings
 
+
 # Image backend.
 #
 # Default:  'ascii'
@@ -588,6 +603,15 @@ 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'
@@ -673,16 +697,6 @@ scrot="off"
 # Flag:    --scrot_cmd
 scrot_cmd="auto"
 
-# Screenshot Directory
-# Where to save the screenshots
-#
-# Default: '~/Pictures/'
-# Values:  'dir'
-# Flag:    --scrot_dir
-#
-# Note: Neofetch won't create the directory if it doesn't exist.
-scrot_dir="$HOME/Pictures/"
-
 # Screenshot Filename
 # What to name the screenshots
 #
@@ -710,4 +724,4 @@ image_host="teknik"
 #
 # NOTE: Don't change this value, neofetch reads this to determine
 # how to handle backwards compatibility.
-config_version="2.1.0"
+config_version="3.1.0-git"

config/travis

@@ -38,6 +38,14 @@ print_info() {
     info line_break
     info cols
     info line_break
+
+    # Testing.
+    prin "prin"
+    prin "prin" "prin"
+
+    # Testing no subtitles.
+    info uptime
+    info disk
 }
 
 refresh_rate="on"

neofetch.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH NEOFETCH "1" "January 2017" "Neofetch 3.0" "User Commands"
+.TH NEOFETCH "1" "April 2017" "Neofetch 3.1.0-git" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -30,6 +30,9 @@ scaling_current, scaling_min, scaling_max
 .IP
 NOTE: This only supports Linux with cpufreq.
 .TP
+\fB\-\-speed_shorthand\fR on/off
+Whether or not to show decimals in CPU speed.
+.TP
 \fB\-\-cpu_shorthand\fR type
 Shorten the output of CPU
 Possible values: name, speed, tiny, on, off
@@ -96,12 +99,15 @@ Possible values: '/', '/dev/sdXX', '/path/to/mount point'
 .IP
 NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1')
 .TP
-\fB\-\-disk_subtitle\fR name/mount
+\fB\-\-disk_subtitle\fR type
 What information to append to the Disk subtitle.
+Takes: name, mount, dir
 .IP
 \&'name' shows the disk's name (sda1, sda2, etc)
 .IP
 \&'mount' shows the disk's mount point (/, \fI\,/mnt/Local\/\fP Disk, etc)
+.IP
+\&'dir' shows the basename of the disks's path. (/, Local Disk, etc)
 .TP
 \fB\-\-ip_host\fR url
 URL to query for public IP
@@ -175,7 +181,7 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', '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.
@@ -196,6 +202,12 @@ Shortcut to use 'iterm2' backend.
 \fB\-\-jp2a\fR source
 Shortcut to use 'jp2a' backend.
 .TP
+\fB\-\-sixel\fR source
+Shortcut to use 'sixel' backend.
+.TP
+\fB\-\-termpix\fR source
+Shortcut to use 'termpix' backend.
+.TP
 \fB\-\-tycat\fR source
 Shortcut to use 'tycat' backend.
 .TP
@@ -235,6 +247,9 @@ Hide the info text and only show the ascii logo.
 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.
+.TP
 \fB\-\-size\fR 00px | \fB\-\-size\fR 00%
 How to size the image.
 Possible values: auto, 00px, 00%, none