packages: start work on bedrock support

Song fixes

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [**@nero**](https://github.com/nero)
 - [**@alyssais**](https://github.com/alyssais)
 - [**@plgruener**](https://github.com/plgruener)
+- [**@StarryTony**](https://github.com/StarryTony)
+- [**@julianaito**](https://github.com/julianaito)
+- [**@HolyStephano**](https://github.com/HolyStephano)
+- [**@nikitenich**](https://github.com/nikitenich)
 
 **Info**
 
@@ -19,10 +23,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais)
 - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux.
 - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener)
+- **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito)
+- **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich)
+- **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito)
+- **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito)
+- **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito)
 
 **ASCII**
 
 - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener)
+- Do not parse file as ASCII if the source is an image file.
+
+**Image**
+
+- **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony)
+- **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano)
 
 ## [5.0.0] - 2018-06-18
 

neofetch

@@ -33,7 +33,7 @@ version="5.0.1"
 bash_version="${BASH_VERSION/.*}"
 sys_locale="${LANG:-C}"
 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}"
-PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}"
+PATH="${PATH}:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec"
 reset='\e[0m'
 shopt -s nocasematch
 
@@ -525,6 +525,18 @@ underline_enabled="on"
 underline_char="-"
 
 
+# Info Separator
+# Replace the default separator with the specified string.
+#
+# Default:  ':'
+# Flag:     --separator
+#
+# Example:
+# separator="->":   'Shell-> bash'
+# separator=" =":   'WM = dwm'
+separator=":"
+
+
 # Color Blocks
 
 
@@ -637,7 +649,7 @@ disk_display="off"
 # Image backend.
 #
 # Default:  'ascii'
-# Values:   'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m'
+# Values:   'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty'
 # Flag:     --backend
 image_backend="ascii"
 
@@ -977,8 +989,8 @@ get_distro() {
 
         "Solaris")
             case "$distro_shorthand" in
-                "on" | "tiny") distro="$(awk 'NR==1{print $1 " " $3;}' /etc/release)" ;;
-                *)             distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;;
+                "on" | "tiny") distro="$(awk 'NR==1 {print $1,$3}' /etc/release)" ;;
+                *)             distro="$(awk 'NR==1 {print $1,$2,$3}' /etc/release)" ;;
             esac
             distro="${distro/\(*}"
         ;;
@@ -1039,7 +1051,7 @@ get_model() {
         ;;
 
         "Mac OS X")
-            if [[ "$(kextstat | grep -F "FakeSMC")" != "" ]]; then
+            if [[ "$(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC")" != "" ]]; then
                 model="Hackintosh (SMBIOS: $(sysctl -n hw.model))"
             else
                 model="$(sysctl -n hw.model)"
@@ -1136,6 +1148,7 @@ get_model() {
 
     case "$model" in
         "Standard PC"*) model="KVM/QEMU (${model})" ;;
+        "OpenBSD"*)     model="vmm ($model)" ;;
     esac
 }
 
@@ -1257,6 +1270,12 @@ get_packages() {
     pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; }
     tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; }
 
+    [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && \
+        tot() {
+            IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "${s}" "$@"; done)
+            ((packages+="${#pkgs[@]}")); pac "${#pkgs[@]}"
+        }
+
     case "$os" in
         "Linux" | "BSD" | "iPhone OS" | "Solaris")
             # Package Manager Programs.
@@ -1302,6 +1321,8 @@ get_packages() {
 
             # List these last as they accompany regular package managers.
             has "flatpak" && tot flatpak list
+            has "spm"     && tot spm list -i
+            has "puyo"    && dir ~/.puyo/installed
 
             # Snap hangs if the command is run without the daemon running.
             # Only run snap if the daemon is also running.
@@ -1474,8 +1495,13 @@ get_wm() {
     # If function was run, stop here.
     ((wm_run == 1)) && return
 
+    case "$uname" in
+        *"OpenBSD"*) ps_flags=(x -c) ;;
+        *)           ps_flags=(-e) ;;
+    esac
+
     if [[ "$WAYLAND_DISPLAY" ]]; then
-        wm="$(ps -e | grep -m 1 -o -F \
+        wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \
                            -e "arcan" \
                            -e "asc" \
                            -e "clayland" \
@@ -1514,11 +1540,11 @@ get_wm() {
 
         # Window Maker does not set _NET_WM_NAME
         [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker"
-
         # Fallback for non-EWMH WMs.
         [[ -z "$wm" ]] && \
-            wm="$(ps -e | grep -m 1 -o -F \
+            wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \
                                -e "catwm" \
+                               -e "fvwm" \
                                -e "dwm" \
                                -e "2bwm" \
                                -e "monsterwm" \
@@ -2200,9 +2226,9 @@ get_memory() {
 
         "Mac OS X" | "iPhone OS")
             mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))"
-            mem_wired="$(vm_stat | awk '/wired/ { print $4 }')"
-            mem_active="$(vm_stat | awk '/active / { printf $3 }')"
-            mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')"
+            mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')"
+            mem_active="$(vm_stat | awk '/ active/ { printf $3 }')"
+            mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')"
             mem_compressed="${mem_compressed:-0}"
             mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))"
         ;;
@@ -2249,8 +2275,11 @@ get_memory() {
         ;;
 
         "Solaris")
-            mem_total="$(prtconf | awk '/Memory/ {print $3}')"
-            mem_free="$(($(vmstat | awk 'NR==3{printf $5}') / 1024))"
+            hw_pagesize="$(pagesize)"
+            pages_total=$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')
+            pages_free=$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')
+            mem_total="$((pages_total * hw_pagesize / 1024 / 1024))"
+            mem_free="$((pages_free * hw_pagesize / 1024 / 1024))"
             mem_used="$((mem_total - mem_free))"
         ;;
 
@@ -2309,7 +2338,7 @@ get_song() {
         "deadbeef"
         "deepin-music"
         "dragon"
-        "elise"
+        "elisa"
         "exaile"
         "gnome-music"
         "gmusicbrowser"
@@ -2338,7 +2367,7 @@ get_song() {
 
     printf -v players "|%s" "${players[@]}"
     player="$(ps aux | awk -v pattern="(${players:1})" \
-                '!/ awk / && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')"
+        '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')"
 
     [[ "$music_player" && "$music_player" != "auto" ]] && \
         player="$music_player"
@@ -2350,19 +2379,18 @@ get_song() {
             dbus-send --print-reply --dest=org.mpris.MediaPlayer2."${1}" /org/mpris/MediaPlayer2 \
             org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \
             string:'Metadata' |\
-            awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4}
-                        /xesam:title/ {t = $4} END {print a " \n " b " \n " t}'
+            awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4}
+                        /"xesam:title"/ {t = $4} END {print a "\n" b "\n" t}'
         )"
     }
 
     case "${player/*\/}" in
         "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;;
-        "mocp"*)          song="$(mocp -Q '%artist \n %album \n %song')" ;;
+        "mocp"*)          song="$(mocp -Q '%artist\n%album\n%song')" ;;
         "google play"*)   song="$(gpmdp-remote current)" ;;
-        "rhythmbox"*)     song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;;
-        "deadbeef"*)      song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;;
+        "deadbeef"*)      song="$(deadbeef --nowplaying-tf '%artist%\n%album%\n%title%')" ;;
         "xmms2d"*)        song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;;
-        "qmmp"*)          song="$(qmmp --nowplaying '%p \n %a \n %t')" ;;
+        "qmmp"*)          song="$(qmmp --nowplaying '%p\n%a\n%t')" ;;
         "gnome-music"*)   get_song_dbus "GnomeMusic" ;;
         "lollypop"*)      get_song_dbus "Lollypop" ;;
         "clementine"*)    get_song_dbus "clementine" ;;
@@ -2381,6 +2409,7 @@ get_song() {
         "amarok"*)        get_song_dbus "amarok" ;;
         "dragon"*)        get_song_dbus "dragonplayer" ;;
         "smplayer"*)      get_song_dbus "smplayer" ;;
+        "rhythmbox"*)     get_song_dbus "rhythmbox" ;;
 
         "cmus"*)
             song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "};
@@ -2393,7 +2422,7 @@ get_song() {
                                           /tag title/ {
                                               $1=$2=""; sub("  ", ""); t=$0
                                           }
-                                          END { print a " \n " b " \n " t }')"
+                                          END { print a "\n" b "\n" t }')"
         ;;
 
         "spotify"*)
@@ -2402,57 +2431,46 @@ get_song() {
 
                 "Mac OS X")
                     song="$(osascript -e 'tell application "Spotify" to artist of current track as¬
-                                          string & " \n " & album of current track as¬
-                                          string & " \n " & name of current track as string')"
+                                          string & "\n" & album of current track as¬
+                                          string & "\n" & name of current track as string')"
                 ;;
             esac
         ;;
 
         "itunes"*)
             song="$(osascript -e 'tell application "iTunes" to artist of current track as¬
-                                  string & " \n " & album of current track as¬
-                                  string & " \n " & name of current track as string')"
+                                  string & "\n" & album of current track as¬
+                                  string & "\n" & name of current track as string')"
         ;;
 
         "banshee"*)
             song="$(banshee --query-artist --query-album --query-title |\
                     awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
-                               END {print a " \n " b " \n "t}')"
+                               END {print a "\n" b "\n"t}')"
         ;;
 
         "exaile"*)
             # NOTE: Exaile >= 4.0.0 will support mpris2.
             song="$(dbus-send --print-reply --dest=org.exaile.Exaile  /org/exaile/Exaile \
                     org.exaile.Exaile.Query |
-                    awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')"
+                    awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')"
         ;;
 
         "quodlibet"*)
             song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \
                     /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\
-                    awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2}
-                               /title/ {getline; t=$2} END {print a " \n " b " \n " t}')"
+                    awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4}
+                    /"title"/ {t=$4} END {print a "\n" b "\n" t}')"
         ;;
 
         "pogo"*)
             song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \
                     org.freedesktop.MediaPlayer.GetMetadata |
-                    awk -F'"' '/string "artist"/ {
-                                   getline;
-                                   a=$2
-                               }
-                               /string "album"/ {
-                                   getline;
-                                   b=$2
-                               }
-                               /string "title"/ {
-                                   getline;
-                                   t=$2
-                               }
-                               END {print a " \n " b " \n " t}')"
+                    awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4}
+                    /"title"/ {t=$4} END {print a "\n" b "\n" t}')"
         ;;
 
-        *) mpc &>/dev/null && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;;
+        *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" ;;
     esac
 
     [[ "$song" != *[a-z]* ]] && { unset -v song; return; }
@@ -2839,13 +2857,13 @@ END
         ;;
 
         "deepin-terminal"*)
-            term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a " " b}' \
+            term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a,b}' \
                          "${XDG_CONFIG_HOME}/deepin/deepin-terminal/config.conf")"
         ;;
 
         "GNUstep_Terminal")
              term_font="$(awk -F '>|<' '/>TerminalFont</ {getline; f=$3}
-                          />TerminalFontSize</ {getline; s=$3} END {print f " " s}' \
+                          />TerminalFontSize</ {getline; s=$3} END {print f,s}' \
                           "${HOME}/GNUstep/Defaults/Terminal.plist")"
         ;;
 
@@ -2869,7 +2887,7 @@ END
                               /^([[:space:]]*|[^#_])font_size[[:space:]]+/ {
                                   size = $2
                               }
-                              END { print font " " size}' "${confs[0]}")"
+                              END {print font,size}' "${confs[0]}")"
         ;;
 
         "konsole" | "yakuake")
@@ -2896,7 +2914,7 @@ END
             profile_filename="${profile_filename/$'\n'*}"
 
             [[ "$profile_filename" ]] && \
-                term_font="$(awk -F '=|,' '/Font=/ {print $2 " " $3}' "$profile_filename")"
+                term_font="$(awk -F '=|,' '/Font=/ {print $2,$3}' "$profile_filename")"
         ;;
 
         "lxterminal"*)
@@ -2955,7 +2973,7 @@ END
         ;;
 
         "qterminal")
-            term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END {print a " " b}' \
+            term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END {print a,b}' \
                          "${XDG_CONFIG_HOME}/qterminal.org/qterminal.ini")"
         ;;
 
@@ -3070,6 +3088,7 @@ get_disk() {
     case "$df_version" in
         *"IMitv"*)   df_flags=(-P -g) ;; # AIX
         *"befhikm"*) df_flags=(-P -k) ;; # IRIX
+        *"hiklnP"*) df_flags=(-h) ;; # OpenBSD
 
         *"Tracker"*) # Haiku
             err "Your version of df cannot be used due to the non-standard flags"
@@ -3563,7 +3582,12 @@ get_window_size() {
     # The escape codes above print the desired output as
     # user input so we have to use read to store the out
     # -put as a variable.
-    IFS=';t' read -d t -t 0.05 -sra term_size
+    # The 1 second timeout is required for older bash
+    case "${BASH_VERSINFO[0]}" in
+        4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;;
+        *)   IFS=';t' read -d t -t 1 -sra term_size ;;
+    esac
+    unset IFS
 
     # Split the string into height/width.
     if [[ "$image_backend" == "tycat" ]]; then
@@ -3576,7 +3600,7 @@ get_window_size() {
     fi
 
     [[ "$image_backend" == "kitty" ]] && \
-        IFS=x read -r term_width term_height < <(kitty icat --print-window-size)
+        IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size)
 
     # Get terminal width/height if \e[14t is unsupported.
     if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then
@@ -3755,7 +3779,7 @@ display_image() {
         ;;
 
         "kitty")
-            kitty icat \
+            kitty +kitten icat \
                 --align left \
                 --place "$((width/font_width))x$((height/font_height))@${xoffset}x${yoffset}" \
             "$image"
@@ -3877,7 +3901,7 @@ prin() {
     fi
 
     # Format the output.
-    string="${string/:/${reset}${colon_color}:${info_color}}"
+    string="${string/:/${reset}${colon_color}${separator:=:}${info_color}}"
     string="${subtitle_color}${bold}${string}"
 
     # Print the info.
@@ -3929,7 +3953,7 @@ trim() {
     set -f
     # shellcheck disable=2048,2086
     set -- $*
-    printf '%s\n' "${*//[[:space:]]/ }"
+    printf '%s\n' "${*//[[:space:]]/}"
     set +f
 }
 
@@ -4062,19 +4086,19 @@ get_full_path() {
 get_user_config() {
     mkdir -p "${XDG_CONFIG_HOME}/neofetch/"
 
-    shopt -s nullglob
-    files=("$XDG_CONFIG_HOME"/neofetch/confi*)
-    shopt -u nullglob
-
     # --config /path/to/config.conf
     if [[ -f "$config_file" ]]; then
         source "$config_file"
         err "Config: Sourced user config. (${config_file})"
         return
 
-    elif [[ -f "${files[0]}" ]]; then
-        source "${files[0]}"
-        err "Config: Sourced user config.    (${files[0]})"
+    elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then
+        source "${XDG_CONFIG_HOME}/neofetch/config.conf"
+        err "Config: Sourced user config.    (${XDG_CONFIG_HOME}/neofetch/config.conf)"
+
+    elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then
+        source "${XDG_CONFIG_HOME}/neofetch/config"
+        err "Config: Sourced user config.    (${XDG_CONFIG_HOME}/neofetch/config)"
 
     else
         config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
@@ -4313,6 +4337,7 @@ TEXT FORMATTING:
     --underline on/off          Enable/Disable the underline.
     --underline_char char       Character to use when underlining title
     --bold on/off               Enable/Disable bold text
+    --separator string          Changes the default ':' separator to the specified string.
 
 COLOR BLOCKS:
     --color_blocks on/off       Enable/Disable the color blocks
@@ -4498,6 +4523,7 @@ get_args() {
             "--underline") underline_enabled="$2" ;;
             "--underline_char") underline_char="$2" ;;
             "--bold") bold="$2" ;;
+            "--separator") separator="$2" ;;
 
             # Color Blocks
             "--color_blocks") color_blocks="$2" ;;
@@ -4919,6 +4945,23 @@ dhhyys+/-`
 EOF
         ;;
 
+        "arcolinux_small"*)
+            set_colors 7 4
+            read -rd '' ascii_data <<'EOF'
+${c2}          A
+         ooo
+        ooooo
+       ooooooo
+      ooooooooo
+     ooooo ooooo
+    ooooo   ooooo
+   ooooo     ooooo
+  ooooo  ${c1}<oooooooo>${c2}
+ ooooo      ${c1}<oooooo>${c2}
+ooooo          ${c1}<oooo>${c2}
+EOF
+        ;;
+
         "ArcoLinux"*)
             set_colors 7 4
             read -rd '' ascii_data <<'EOF'
@@ -5223,6 +5266,31 @@ ${c2}           `.:/++++/:.`           ${c1}:oys+.
 EOF
         ;;
 
+        "BlueLight"*)
+            set_colors 7 4
+            read -rd '' ascii_data <<'EOF'
+${c1}              oMMNMMMMMMMMMMMMMMMMMMMMMM
+              oMMMMMMMMMMMMMMMMMMMMMMMMM
+              oMMMMMMMMMMMMMMMMMMMMMMMMM
+              oMMMMMMMMMMMMMMMMMMMMMMMMM
+              -+++++++++++++++++++++++mM${c2}
+             ```````````````````````..${c1}dM${c2}
+           ```````````````````````....${c1}dM${c2}
+         ```````````````````````......${c1}dM${c2}
+       ```````````````````````........${c1}dM${c2}
+     ```````````````````````..........${c1}dM${c2}
+   ```````````````````````............${c1}dM${c2}
+.::::::::::::::::::::::-..............${c1}dM${c2}
+ `-+yyyyyyyyyyyyyyyyyyyo............${c1}+mMM${c2}
+     -+yyyyyyyyyyyyyyyyo..........${c1}+mMMMM${c2}
+        ./syyyyyyyyyyyyo........${c1}+mMMMMMM${c2}
+           ./oyyyyyyyyyo......${c1}+mMMMMMMMM${c2}
+              omdyyyyyyo....${c1}+mMMMMMMMMMM${c2}
+              ${c1}oMMM${c2}mdhyyo..${c1}+mMMMMMMMMMMMM
+              oNNNNNNm${c2}dso${c1}mMMMMMMMMMMMMMM
+EOF
+        ;;
+
        "BSD")
             set_colors 1 7 4 3 6
             read -rd '' ascii_data <<'EOF'
@@ -6426,26 +6494,26 @@ EOF
         "Lubuntu"*)
             set_colors 4 7 1
             read -rd '' ascii_data <<'EOF'
-${c1}           `-/+oyyhhhhyyo+/-`
-        ./shhhhhhhhhhhhhhhhhhs/.
-     `:shhhhhhhhhhhhhhhhhhhhhhhhs:`
-    :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy:
-  `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho`
- `shhhhhhhhhhy+:`     /yhhhhhhhhhhhhhs`
- shhhhhhhhy+.          .ohhhhhhhhhhhhhs
-:hhhhhhy/.               /hhhhhhhhhhhhh:
-shhhy/.                   :hhhhhhhhhhhhs
-hy+.   `        `+yhs/`    +hhhhhhhhhhhh
--.:/oshy-  `   :yhhhhhy/    shhhhhhhhhhh
-shhhhhy-`/s. .shhhhhhhhho`  .hhhhhhhhhhs
-:hhhho`:ys` /yhhhhhhhhhhhs`  +hhhhhhhhh:
- shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs
- `o-+hh: :yhhhhhhhhhhhhhhhho  ohhhhhhs`
-   +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho`
-    :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy:
-      :shhhhhhhhhhhhhhhhhhhhhy`+s:`
-        .+shhhhhhhhhhhhhhhhhhs:`
-           `-/+oyyhhhhyys+/-`
+${c1}           `-mddhhhhhhhhhddmss`
+        ./mdhhhhhhhhhhhhhhhhhhhhhh.
+     :mdhhhhhhhhhhhhhhhhhhhhhhhhhhhm`
+   :ymhhhhhhhhhhhhhhhyyyyyyhhhhhhhhhy:
+  `odhyyyhhhhhhhhhy+-````./syhhhhhhhho`
+ `hhy..:oyhhhhhhhy-`:osso/..:/++oosyyyh`
+ dhhs   .-/syhhhhs`shhhhhhyyyyyyyyyyyyhs
+:hhhy`  yso/:+syhy/yhhhhhshhhhhhhhhhhhhh:
+hhhhho. +hhhys++oyyyhhhhh-yhhhhhhhhhhhhhs
+hhhhhhs-`/syhhhhyssyyhhhh:-yhhhhhhhhhhhhh
+hhhhhhs  `:/+ossyyhyyhhhhs -yhhhhhhhhhhhh
+hhhhhhy/ `syyyssyyyyhhhhhh: :yhhhhhhhhhhs
+:hhhhhhyo:-/osyhhhhhhhhhhho  ohhhhhhhhhh:
+ sdhhhhhhhyyssyyhhhhhhhhhhh+  +hhhhhhhhs
+ `shhhhhhhhhhhhhhhhhhhhhhy+` .yhhhhhhhh`
+  +sdhhhhhhhhhhhhhhhhhyo/. `/yhhhhhhhd`
+   `:shhhhhhhhhh+---..``.:+yyhhhhhhh:
+     `:mdhhhhhh/.syssyyyyhhhhhhhd:`
+        `+smdhhh+shhhhhhhhhhhhdm`
+           `sNmdddhhhhhhhddm-`
 EOF
         ;;
 
@@ -6556,6 +6624,27 @@ o00.              k0O${c2}dddddd${c1}occ
 EOF
         ;;
 
+        "Mandriva"*)
+            set_colors 4 3
+            read -rd '' ascii_data <<'EOF'
+${c2}                        ``
+                       `-.
+${c1}      `               ${c2}.---
+${c1}    -/               ${c2}-::--`
+${c1}  `++    ${c2}`----...```-:::::.
+${c1} `os.      ${c2}.::::::::::::::-```     `  `
+${c1} +s+         ${c2}.::::::::::::::::---...--`
+${c1}-ss:          ${c2}`-::::::::::::::::-.``.``
+${c1}/ss-           ${c2}.::::::::::::-.``   `
+${c1}+ss:          ${c2}.::::::::::::-
+${c1}/sso         ${c2}.::::::-::::::-
+${c1}.sss/       ${c2}-:::-.`   .:::::
+${c1} /sss+.    ${c2}..`${c1}  `--`    ${c2}.:::
+${c1}  -ossso+/:://+/-`        ${c2}.:`
+${c1}    -/+ooo+/-.              ${c2}`
+EOF
+        ;;
+
         "Manjaro"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'
@@ -6703,6 +6792,32 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 EOF
         ;;
 
+        "Namib"*)
+            set_colors 1
+            read -rd '' ascii_data <<'EOF'
+${c1}          .:+shysyhhhhysyhs+:.
+       -/yyys              syyy/-
+     -shy                      yhs-
+   -yhs                          shy-
+  +hy                              yh+
+ +ds                                sd+
+/ys                  so              sy/
+sh                 smMMNdyo           hs
+yo               ymMMMMNNMMNho        oy
+N             ydMMMNNMMMMMMMMMmy       N
+N         shmMMMMNNMMMMMMMMMMMMMNy     N
+yo  ooshmNMMMNNNNMMMMMMMMMMMMMMMMMms  oy
+sd yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ds
+/ys                                  sy/
+ +ds                                sd+
+  +hy                              yh+
+   -yhs                          shy-
+     -shy                      yhs-
+       -/yyys              syyy/-
+          .:+shysyhyhhysyhs+:.
+EOF
+        ;;
+
         "NetBSD"*)
             set_colors 5 7
             read -rd '' ascii_data <<'EOF'
@@ -6956,24 +7071,32 @@ h+`      `.-:+oyyyo/-`
 EOF
         ;;
 
+
         "OpenMandriva"*)
-            set_colors 4 3
+            set_colors 4
             read -rd '' ascii_data <<'EOF'
-${c2}                        ``
-                       `-.
-${c1}      `               ${c2}.---
-${c1}    -/               ${c2}-::--`
-${c1}  `++    ${c2}`----...```-:::::.
-${c1} `os.      ${c2}.::::::::::::::-```     `  `
-${c1} +s+         ${c2}.::::::::::::::::---...--`
-${c1}-ss:          ${c2}`-::::::::::::::::-.``.``
-${c1}/ss-           ${c2}.::::::::::::-.``   `
-${c1}+ss:          ${c2}.::::::::::::-
-${c1}/sso         ${c2}.::::::-::::::-
-${c1}.sss/       ${c2}-:::-.`   .:::::
-${c1} /sss+.    ${c2}..`${c1}  `--`    ${c2}.:::
-${c1}  -ossso+/:://+/-`        ${c2}.:`
-${c1}    -/+ooo+/-.              ${c2}`
+${c1}                  ``````
+            `-:/+++++++//:-.`
+         .:+++oooo+/:.``   ``
+      `:+ooooooo+:.  `-:/++++++/:.`
+     -+oooooooo:` `-++o+/::::://+o+/-
+   `/ooooooooo-  -+oo/.`        `-/oo+.
+  `+ooooooooo.  :os/`              .+so:
+  +sssssssss/  :ss/                 `+ss-
+ :ssssssssss`  sss`                  .sso
+ ossssssssss  `yyo                    sys
+`sssssssssss` `yys                   `yys
+`sssssssssss:  +yy/                  +yy:
+ oyyyyyyyyyys. `oyy/`              `+yy+
+ :yyyyyyyyyyyo. `+yhs:.         `./shy/
+  oyyyyyyyyyyys:` .oyhys+:----/+syhy+. `
+  `syyyyyyyyyyyyo-` .:osyhhhhhyys+:``.:`
+   `oyyyyyyyyyyyyys+-`` `.----.```./oo.
+     /yhhhhhhhhhhhhhhyso+//://+osyhy/`
+      `/yhhhhhhhhhhhhhhhhhhhhhhhhy/`
+        `:oyhhhhhhhhhhhhhhhhhhyo:`
+            .:+syhhhhhhhhys+:-`
+                 ``....``
 EOF
         ;;
 
@@ -7428,6 +7551,30 @@ ${c1}  `.::///+:/-.        --///+//-:``
 EOF
         ;;
 
+        "Reborn OS"* | "Reborn"*)
+            set_colors 2 2 8
+            read -rd '' ascii_data <<'EOF'
+${c3}
+        mMMMMMMMMM  MMMMMMMMMm
+       NM                    MN
+      MM  ${c1}dddddddd  dddddddd  ${c3}MN
+     mM  ${c1}dd                dd  ${c3}MM
+        ${c1}dd  hhhhhh   hhhhh  dd
+   ${c3}mM      ${c1}hh            hh      ${c3}Mm
+  NM  ${c1}hd       ${c3}mMMMMMMd       ${c1}dh  ${c3}MN
+ NM  ${c1}dd  hh   ${c3}mMMMMMMMMm   ${c1}hh  dd  ${c3}MN
+NM  ${c1}dd  hh   ${c3}mMMMMMMMMMMm   ${c1}hh  dd  ${c3}MN
+ NM  ${c1}dd  hh   ${c3}mMMMMMMMMm   ${c1}hh  dd  ${c3}MN
+  NM  ${c1}hd       ${c3}mMMMMMMm       ${c1}dh  ${c3}MN
+   mM      ${c1}hh            hh      ${c3}Mm
+        ${c1}dd  hhhhhh  hhhhhh  dd
+     ${c3}MM  ${c1}dd                dd  ${c3}MM
+      MM  ${c1}dddddddd  dddddddd  ${c3}MN
+       NM                    MN
+        mMMMMMMMMM  MMMMMMMMMm
+EOF
+        ;;
+
         "Red Star"* | "Redstar"*)
             set_colors 1 7 3
             read -rd '' ascii_data <<'EOF'
@@ -7889,6 +8036,31 @@ ${c1}
 EOF
         ;;
 
+        "Star"*)
+            set_colors 7
+            read -rd '' ascii_data <<'EOF'
+${c1}                   ./
+                  `yy-
+                 `y.`y`
+    ``           s-  .y            `
+    +h//:..`    +/    /o    ``..:/so
+     /o``.-::/:/+      o/://::-.`+o`
+      :s`     `.        .`     `s/
+       .y.                    .s-
+        `y-                  :s`
+      .-//.                  /+:.
+   .:/:.                       .:/:.
+-+o:.                             .:+:.
+-///++///:::`              .-::::///+so-
+       ``..o/              d-....```
+           s.     `/.      d
+           h    .+o-+o-    h.
+           h  -o/`   `/o:  s:
+          -s/o:`       `:o/+/
+          /s-             -yo
+EOF
+        ;;
+
         "SteamOS"*)
             set_colors 5 7
             read -rd '' ascii_data <<'EOF'

neofetch.1

@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.7.
+.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -143,6 +143,9 @@ Character to use when underlining title
 .TP
 \fB\-\-bold\fR on/off
 Enable/Disable bold text
+.TP
+\fB\-\-separator\fR string
+Changes the default ':' separator to the specified string.
 .SS "COLOR BLOCKS:"
 .TP
 \fB\-\-color_blocks\fR on/off