Merge master

Changelog.md

@@ -3,6 +3,7 @@
 - **[@konimex](https://github.com/konimex)**
 - **[@iandrewt](https://github.com/iandrewt)**
 - **[@coypoop](https://github.com/coypoop)**
+- **[@ncmprhnsbl](https://github.com/ncmprhnsbl)**
 
 <br \>
 
@@ -12,12 +13,14 @@
 - Change all `OS X` references to `macOS`. **[@iandrewt](https://github.com/iandrewt)**
 - Fix corrupted text when long lines are cut-off.
 - Don't dynamically place prompt in `image=off` mode.
+- Cursor Position: Fix issues when using URxvt+Padding
 
 
 ## Operating System
 
 - Added support for Bitrig. **[@konimex](https://github.com/konimex)**
 - Added support for Sparky Linux.
+- Added support for Porteus. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)**
 
 
 ## Packages
@@ -65,6 +68,7 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 
 - Bold ascii art by default.
 - Fixed incorrect prompt location when using `ascii_logo_size small`.
+- Update Void Linux ascii art. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)**
 
 
 ## Info
@@ -74,6 +78,12 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 - Expanded `distro_shorthand` to macOS and Solaris. **[@konimex](https://github.com/konimex)**
 - Removed `osx_buildversion` and `osx_codename` in favour of `distro_shorthand`. **[@konimex](https://github.com/konimex)**
 
+**Desktop Environment**<br \>
+
+- [Windows] Added support for showing DE.
+    - Windows 8 and above: `Modern UI/Metro`
+    - Windows 7 and below: `Aero`
+
 **Window Manager**<br \>
 
 - [Windows] Added support for custom WMs/Shells.
@@ -86,10 +96,21 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 
 **CPU**<br \>
 
+- Added `cpu_speed` which lets you hide/show the speed in the output.
 - Expanded `cpu_cores` option by adding two new values, `logical` and `physical`.
     - `logical`: Show all virtual cores (hyperthreaded).
     - `physical`: Only show physical cores.
+- [Linux] Added support for showing CPU temperature.
+    - Added new option called `cpu_temp`.
+    - Note: This is disabled by default and can be enabled by changing the value of `cpu_temp` in your config to `on`.
 - [macOS] Print physical cores instead of hyper-threaded cores. **[@iandrewt](https://github.com/iandrewt)**
+- [iOS] Rewrite CPU function.
+
+**GPU**
+
+- [iOS] Rewrite GPU function.
+- [Linux] Rewrite GPU function.
+    - Neofetch also caches the info until reboot.
 
 **Uptime**<br \>
 
@@ -102,6 +123,7 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 
 **Memory**<br \>
 
+- [Linux] Correctly calculate used memory.
 - [NetBSD] Fix memory output for sizes over 4GB. **[@coypoop](https://github.com/coypoop)**
 
 **Shell**<br \>
@@ -109,6 +131,12 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 - Hide shell path by default.
 - Show shell version by default.
 
+**Battery**<br \>
+
+- [Linux] Rewrote and simplified battery function.
+- Removed `battery_shorthand`
+- Removed `battery_num`
+
 **Theme Font**<br \>
 
 - [XFCE] Fixed incorrect font output.
@@ -128,3 +156,5 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 **Song**<br \>
 
 - [macOS] Fix iTunes automatically opening. **[@iandrewt](https://github.com/iandrewt)**
+- Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)**
+- Rewrote song function, it's now much faster/cleaner.

README.md

@@ -434,22 +434,22 @@ alias neofetch2="neofetch \
     --cpu_cores type            Whether or not to display the number of CPU cores
                                 Takes: logical, physical, off
                                 Note: 'physical' doesn't work on BSD.
+    --cpu_speed on/off          Hide/Show cpu speed.
+    --cpu_temp on/off           Hide/Show cpu temperature.
+                                NOTE This only works on linux.
     --distro_shorthand on/off   Shorten the output of distro (tiny, on, off)
                                 NOTE: This is only possible on Linux, macOS, and Solaris
     --kernel_shorthand on/off   Shorten the output of kernel
     --uptime_shorthand on/off   Shorten the output of uptime (tiny, on, off)
     --refresh_rate on/off       Whether to display the refresh rate of each monitor
                                 Unsupported on Windows
-    --gpu_shorthand on/off      Shorten the output of GPU (tiny, on, off)
     --gpu_brand on/off          Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel)
     --gtk_shorthand on/off      Shorten output of gtk theme/icons
     --gtk2 on/off               Enable/Disable gtk2 theme/icons output
     --gtk3 on/off               Enable/Disable gtk3 theme/icons output
     --shell_path on/off         Enable/Disable showing \$SHELL path
     --shell_version on/off      Enable/Disable showing \$SHELL version
-    --battery_num num           Which battery to display, default value is 'all'
-    --battery_shorthand on/off  Whether or not each battery gets its own line/title
-    --ip_host url               Url to ping for public IP
+    --ip_host url               Url to query for public IP
     --song_shorthand on/off     Print the Artist/Title on seperate lines
     --birthday_shorthand on/off Shorten the output of birthday
     --birthday_time on/off      Enable/Disable showing the time in birthday output

ascii/distro/porteus

+"\
+${c1}             \`.-:::-.\`
+         -+ydmNNNNNNNmdy+-
+      .+dNmdhs+//////+shdmdo.
+    .smmy+-\`             ./sdy:
+  \`omdo.    \`.-/+osssso+/-\` \`+dy.
+ \`yms.   \`:shmNmdhsoo++osyyo-\`\`oh.
+ hm/   .odNmds/.\`    \`\`.....:::-+s
+/m:  \`+dNmy:\`   \`./oyhhhhyyooo++so
+ys  \`yNmy-    .+hmmho:-.\`     \`\`\`
+s:  yNm+\`   .smNd+.
+\`\` /Nm:    +dNd+\`
+   yN+   \`smNy.
+   dm    oNNy\`
+   hy   -mNm.
+   +y   oNNo
+   \`y\`  sNN:
+    \`:  +NN:
+     \`  .mNo
+         /mm\`
+          /my\`
+           .sy\`
+             .+:
+                \`
+"

ascii/distro/void

@@ -6,11 +6,11 @@ ${c1}                __.;=====;.__
        _vi,    \`            --+=++++:
       .uvnvi.       _._       -==+==+.
      .vvnvnI\`    .;==|==;.     :|=||=|.
-${c2}+QmQQmpvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV\$QQmL
-${c2} -QQWQWpvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE
+${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV\$QQmL
+${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE
 ${c2}  -\$QQQQmmU'  jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@'
-${c2}   -\$WQ8YnI:   ${c2}QWQQwgQQWV${c1}\`${c2}mWQQ.jQWQQgyyWW@!
-     -1vvnvv.     ${c1}\`~+++\`        ++|+++
+${c2}   -\$WQ8Y${c1}nI:   ${c2}QWQQwgQQWV${c1}\`${c2}mWQQ.jQWQQgyyWW@!
+${c1}     -1vvnvv.     \`~+++\`        ++|+++
       +vnvnnv,                 \`-|===
        +vnvnvns.           .      :=-
         -Invnvvnsi..___..=sv=.     \`
@@ -18,3 +18,4 @@ ${c2}   -\$WQ8YnI:   ${c2}QWQQwgQQWV${c1}\`${c2}mWQQ.jQWQQgyyWW@!
             ~|Invnvnvvnvvvnnv}+\`
                -~\|{*l}*|\\~
 "
+

config/config

@@ -14,7 +14,7 @@ export LANG=C
 # Info
 # See this wiki page for more info:
 # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
-printinfo () {
+printinfo() {
     info title
     info underline
 
@@ -55,7 +55,7 @@ printinfo () {
 # Kernel
 
 # Show more kernel info
-# --kernel_shorthand on/off
+# --kernel_shorthand on, off
 kernel_shorthand="on"
 
 
@@ -66,7 +66,7 @@ kernel_shorthand="on"
 distro_shorthand="off"
 
 # Show 'x86_64' and 'x86' in 'Distro:' output.
-# --os_arch on/off
+# --os_arch on, off
 os_arch="on"
 
 
@@ -80,11 +80,11 @@ uptime_shorthand="off"
 # Shell
 
 # Show the path to $SHELL
-# --shell_path on/off
+# --shell_path on, off
 shell_path="off"
 
 # Show $SHELL's version
-# --shell_version on/off
+# --shell_version on, off
 shell_version="on"
 
 
@@ -106,6 +106,11 @@ cpu_shorthand="off"
 # --cpu_display bar, infobar, barinfo, off
 cpu_display="off"
 
+# CPU Speed
+# Hide/Show CPU speed.
+# --cpu_speed on, off
+cpu_speed="on"
+
 # CPU Cores
 # Display CPU cores in output
 # Logical: All virtual cores
@@ -114,56 +119,44 @@ cpu_display="off"
 # Note: 'physical' doesn't work on BSD.
 cpu_cores="logical"
 
+# CPU Temperature
+# Hide/Show CPU temperature.
+# --cpu_temp on, off
+# Note: Only works on Linux.
+cpu_temp="off"
 
-# GPU
 
-# Shorten output of the getgpu funcion
-# --gpu_shorthand on/off/tiny
-gpu_shorthand="on"
+# GPU
 
 # Enable/Disable GPU Brand
-# --gpu_brand on/off
+# --gpu_brand on, off
 gpu_brand="on"
 
+
 # Resolution
 
 # Display refresh rate next to each monitor
 # Unsupported on Windows
-# --refresh_rate on/off
+# --refresh_rate on, off
 refresh_rate="off"
 
 
 # Gtk Theme / Icons
 
 # Shorten output (Hide [GTK2] etc)
-# --gtk_shorthand on/off
+# --gtk_shorthand on, off
 gtk_shorthand="off"
 
 
 # Enable/Disable gtk2 theme/icons output
-# --gtk2 on/off
+# --gtk2 on, off
 gtk2="on"
 
 # Enable/Disable gtk3 theme/icons output
-# --gtk3 on/off
+# --gtk3 on, off
 gtk3="on"
 
 
-# Battery
-
-# Which battery to display.
-# By default we display all batteries.
-# NOTE: Only works on Linux.
-# --battery_num all, 0, 1, 2, etc
-battery_num="all"
-
-# Whether or not to print each battery on the same line.
-# By default each battery gets its own line and title.
-# NOTE: Only works on Linux.
-# --battery_shorthand on/off
-battery_shorthand="off"
-
-
 # IP Address
 
 # Website to ping for the public IP
@@ -174,7 +167,7 @@ public_ip_host="http://ident.me"
 # Song
 
 # Print the Artist and Title on seperate lines
-# --song_shorthand on/off
+# --song_shorthand on, off
 song_shorthand="off"
 
 
@@ -183,11 +176,11 @@ song_shorthand="off"
 # Whether to show a long pretty output
 # or a shortened one
 # NOTE: Long pretty output doesn't work on OpenBSD or NetBSD.
-# --birthday_shorthand on/off
+# --birthday_shorthand on, off
 birthday_shorthand="off"
 
 # Whether to show the time in the output
-# --birthday_time on/off
+# --birthday_time on, off
 birthday_time="on"
 
 # Date format to use when printing birthday
@@ -216,11 +209,11 @@ colors=(distro)
 
 
 # Toggle bold text
-# --bold on/off
+# --bold on, off
 bold="on"
 
 # Enable/Disable Underline
-# --underline on/off
+# --underline on, off
 underline_enabled="on"
 
 # Underline character
@@ -239,7 +232,7 @@ start=0
 end=7
 
 # Toggle color blocks
-# --color_blocks on/off
+# --color_blocks on, off
 color_blocks="on"
 
 # Color block width in spaces
@@ -262,7 +255,7 @@ progress_char_elapsed="-"
 progress_char_total="="
 
 # Progress border
-# --progress_border on/off
+# --progress_border on, off
 progress_border="on"
 
 # Progress bar length in spaces
@@ -283,9 +276,9 @@ progress_color_total="distro"
 # barinfo: The bar is displayed before the info.
 # off: Only the info is displayed.
 #
-# --memory_display bar/infobar/barinfo/off
-# --battery_display bar/infobar/barinfo/off
-# --disk_display bar/infobar/barinfo/off
+# --memory_display bar, infobar, barinfo, off
+# --battery_display bar, infobar, barinfo, off
+# --disk_display bar, infobar, barinfo, off
 memory_display="off"
 battery_display="off"
 disk_display="off"
@@ -308,19 +301,14 @@ thumbnail_dir="$HOME/.cache/thumbnails/neofetch"
 # Some systems have this in another location
 w3m_img_path="/usr/lib/w3m/w3mimgdisplay"
 
-# Image position
-# Only works with the w3m backend.
-# --image_position left/right
-image_position="left"
-
 # Crop mode
-# --crop_mode normal/fit/fill
+# --crop_mode normal, fit, fill
 crop_mode="normal"
 
 # Crop offset
 # Only affects normal mode.
-# --crop_offset northwest/north/northeast/west/center
-#               east/southwest/south/southeast
+# --crop_offset northwest, north, northeast, west, center
+#               east, southwest, south, southeast
 crop_offset="center"
 
 # Image size
@@ -380,7 +368,7 @@ ascii_logo_size="normal"
 
 # Bold ascii logo
 # Whether or not to bold the ascii logo.
-# --ascii_bold on/off
+# --ascii_bold on, off
 ascii_bold="on"
 
 

neofetch.1

@@ -40,6 +40,14 @@ Whether or not to display the number of CPU cores
 .br
 Note: 'physical' doesn't work on BSD.
 .TP
+.B \--cpu_speed 'on/off'
+Hide/Show cpu speed.
+.TP
+.B \--cpu_temp 'on/off'
+Hide/Show cpu temperature.
+.br
+NOTE This only works on linux.
+.TP
 .B \--distro_shorthand 'on/off'
 Shorten the output of distro (tiny, on, off)
 .br
@@ -56,9 +64,6 @@ Whether to display the refresh rate of each monitor
 .br
 Note: Unsupported on Windows
 .TP
-.B \--gpu_shorthand 'on/off'
-Shorten the output of GPU (tiny, on, off)
-.TP
 .B \--gpu_brand on/off
 Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel)
 .TP
@@ -77,14 +82,8 @@ Enable/Disable showing $SHELL path
 .B \--shell_version 'on/off'
 Enable/Disable showing $SHELL version
 .TP
-.B \--battery_num 'num'
-Which battery to display, default value is 'all'
-.TP
-.B \--battery_shorthand 'on/off'
-Whether or not each battery gets its own line/title
-.TP
 .B \--ip_host 'url'
-URL to ping for public IP
+URL to query for public IP
 .TP
 .B \--song_shorthand 'on/off'
 Print the Artist/Title on seperate lines