WM Theme: update for Mojave

new logo for janus

README.md

@@ -7,7 +7,6 @@
 <a href="./LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
 <a href="https://github.com/dylanaraps/neofetch/releases"><img src="https://img.shields.io/github/release/dylanaraps/neofetch.svg"></a>
 <a href="https://repology.org/metapackage/neofetch"><img src="https://repology.org/badge/tiny-repos/neofetch.svg" alt="Packaging status"></a>
-<a href="#donate"><img src="https://img.shields.io/badge/donate-donate-yellow.svg"></a>
 </p>
 
 <img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">

neofetch

@@ -1389,10 +1389,11 @@ get_packages() {
         ;;
 
         "Haiku")
-            dir /boot/system/package-links/*
+            has "pkgman" && dir /boot/system/package-links/*
         ;;
 
         "IRIX")
+            manager="swpkg"
             tot versions -b && ((packages-=3))
         ;;
     esac
@@ -1574,8 +1575,10 @@ get_wm() {
             wm="${wm/\"*}"
         fi
 
-        # Window Maker does not set _NET_WM_NAME
+        # Rename window managers to their proper values.
         [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker"
+        [[ "$wm" =~ "GNOME Shell" ]] && wm="Mutter"
+
         # Fallback for non-EWMH WMs.
         [[ -z "$wm" ]] && \
             wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \
@@ -1750,15 +1753,23 @@ get_wm_theme() {
         "Quartz Compositor")
             global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist"
             wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")"
-            wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")"
+            wm_theme_color="$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences")"
 
             [[ -z "$wm_theme" ]] && \
                 wm_theme="Light"
 
-            [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)) && \
+            case "$wm_theme_color" in
-                wm_theme_color="Blue"
+                "-1") wm_theme_color="Graphite" ;;
+                "0") wm_theme_color="Red" ;;
+                "1") wm_theme_color="Orange" ;;
+                "2") wm_theme_color="Yellow" ;;
+                "3") wm_theme_color="Green" ;;
+                "5") wm_theme_color="Purple" ;;
+                "6") wm_theme_color="Pink" ;;
+                *) wm_theme_color="Blue" ;;
+            esac
 
-            wm_theme="${wm_theme_color:-Graphite} ($wm_theme)"
+            wm_theme="${wm_theme_color} ($wm_theme)"
         ;;
 
         *"Explorer")
@@ -1805,13 +1816,9 @@ get_cpu() {
                 ;;
 
                 *)
-                    cpu="$(awk -F ': | @' '/model name|Processor|^cpu model|chip type|^cpu type/ {
+                    cpu="$(awk -F ': | @' \
-                                               printf $2;
+                            '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ {
-                                               exit
+                            printf $2; exit}' "$cpu_file")"
-                                           }' "$cpu_file")"
-
-                    [[ "$cpu" == *"processor rev"* ]] && \
-                        cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")"
                 ;;
             esac
 
@@ -2307,10 +2314,20 @@ get_memory() {
             esac
         ;;
 
-        "Solaris")
+        "Solaris" | "AIX")
             hw_pagesize="$(pagesize)"
-            pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')"
+            case "$os" in
-            pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')"
+                "Solaris")
+                    pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')"
+                    pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')"
+                ;;
+
+                "AIX")
+                    IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=page)"
+                    pages_total="${mem_stat[11]}"
+                    pages_free="${mem_stat[16]}"
+                ;;
+            esac
             mem_total="$((pages_total * hw_pagesize / 1024 / 1024))"
             mem_free="$((pages_free * hw_pagesize / 1024 / 1024))"
             mem_used="$((mem_total - mem_free))"
@@ -2322,15 +2339,6 @@ get_memory() {
             mem_used="$((${mem_used/max} / 1024 / 1024))"
         ;;
 
-        "AIX")
-            IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=MB)"
-
-            mem_total="${mem_stat[11]/.*}"
-            mem_free="${mem_stat[16]/.*}"
-            mem_used="$((mem_total - mem_free))"
-            mem_label="MB"
-        ;;
-
         "IRIX")
             IFS=$'\n' read -d "" -ra mem_cmd <<< "$(pmem)"
             IFS=" " read -ra mem_stat <<< "${mem_cmd[0]}"
@@ -2915,17 +2923,15 @@ END
             kitty_config="$(kitty --debug-config)"
             [[ "$kitty_config" != *font_family* ]] && return
 
-            term_font_size="${kitty_config/*font_size}"
+            term_font="$(awk '/^font_family|^font_size/ {printf $2 " "}' <<< "$kitty_config")"
-            term_font_size="${term_font_size/$'\n'*}"
-            term_font="${kitty_config/*font_family}"
-            term_font="${term_font/$'\n'*} $term_font_size"
         ;;
 
         "konsole" | "yakuake")
             # Get Process ID of current konsole window / tab
             child="$(get_ppid "$$")"
 
-            IFS=$'\n' read -d "" -ra konsole_instances < <(qdbus | grep -F 'org.kde.konsole')
+            IFS=$'\n' read -d "" -ra konsole_instances \
+                < <(qdbus | awk '/org.kde.konsole/ {print $1}')
 
             for i in "${konsole_instances[@]}"; do
                 IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/')
@@ -4069,8 +4075,6 @@ get_full_path() {
 }
 
 get_user_config() {
-    mkdir -p "${XDG_CONFIG_HOME}/neofetch/"
-
     # --config /path/to/config.conf
     if [[ -f "$config_file" ]]; then
         source "$config_file"
@@ -4085,10 +4089,11 @@ get_user_config() {
         source "${XDG_CONFIG_HOME}/neofetch/config"
         err "Config: Sourced user config.    (${XDG_CONFIG_HOME}/neofetch/config)"
 
-    else
+    elif [[ -z "$no_config" ]]; then
         config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
 
         # The config file doesn't exist, create it.
+        mkdir -p "${XDG_CONFIG_HOME}/neofetch/"
         printf '%s\n' "$config" > "$config_file"
     fi
 }
@@ -4157,9 +4162,17 @@ term_padding() {
 
     case "$term" in
         urxvt*|"rxvt-unicode")
-            [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)"
+            [[ -z "$xrdb" ]] &&
+                xrdb="$(xrdb -query)"
+
+            [[ $xrdb != *".internalBorder:"* ]] &&
+                return
+
             padding="${xrdb/*.internalBorder:}"
-            ((padding=${padding/$'\n'*}))
+            padding="${padding/$'\n'*}"
+
+            [[ $padding =~ ^[0-9]+$ ]] ||
+                padding=
         ;;
     esac
 }
@@ -4420,7 +4433,7 @@ ASCII:
                                 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors.
 
                                 NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS,
-                                OpenBSD, and Void have a smaller logo variant.
+                                OpenBSD, postmarketOS, and Void have a smaller logo variant.
 
                                 NOTE: Use '{distro name}_small' to use the small variants.
 
@@ -4454,6 +4467,7 @@ IMAGE:
 OTHER:
     --config /path/to/config    Specify a path to a custom config file
     --config none               Launch the script without a config file
+    --no_config                 Don't create the user config file.
     --print_config              Print the default config file to stdout.
     --stdout                    Turn off all colors and disables any ASCII/image backend.
     --help                      Print this text and exit
@@ -4473,7 +4487,7 @@ exit 1
 
 get_args() {
     # Check the commandline flags early for '--config'.
-    [[ "$*" != *--config* ]] && get_user_config
+    [[ "$*" != *--config* && "$*" != *--no_config* ]] && get_user_config
 
     while [[ "$1" ]]; do
         case "$1" in
@@ -4634,6 +4648,7 @@ get_args() {
                     ;;
                 esac
             ;;
+            "--no_config") no_config="on" ;;
             "--stdout") stdout="on" ;;
             "-v") verbose="on" ;;
             "--print_config") printf '%s\n' "$config"; exit ;;
@@ -5192,27 +5207,28 @@ EOF
         ;;
 
         "Artix"*)
-            set_colors 6 4 2 7
+            set_colors 6 6 7 1
             read -rd '' ascii_data <<'EOF'
-${c1}                        d${c2}c.
+${c1}                   '
-${c1}                       x${c2}dc.
+                  'o'
-${c1}                  '.${c4}.${c1} d${c2}dlc.
+                 'ooo'
-${c1}                 c${c2}0d:${c1}o${c2}xllc;
+                'ooxoo'
-${c1}                :${c2}0ddlolc,lc,
+               'ooxxxoo'
-${c1}           :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc.
+              'oookkxxoo'
-${c1}          ;${c1}K${c2}kxoOddollc'  cllc.
+             'oiioxkkxxoo'
-${c1}         ,${c1}K${c2}kkkxdddllc,   ${c4}.${c2}lll:
+            ':;:iiiioxxxoo'
-${c1}        ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk:
+               `'.;::ioxxoo'
-${c1}       ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo,
+          '-.      `':;jiooo'
-${c3}    xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}.
+         'oooio-..     `'i:io'
-${c3}    ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll;
+        'ooooxxxxoio:,.   `'-;'
-${c1}   .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}.           ${c2}.llc,
+       'ooooxxxxxkkxoooIi:-.  `'
-${c1}   .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}.             ${c2};llc.
+      'ooooxxxxxkkkkxoiiiiiji'
-${c1}  .${c1}K${c2}Okdcddl${c4}.                   ${c2}cllc${c4}.
+     'ooooxxxxxkxxoiiii:'`     .i'
-${c1}  0${c2}Okd''dc.                    .cll;
+    'ooooxxxxxoi:::'`       .;ioxo'
-${c1} k${c2}Okd'                          .llc,
+   'ooooxooi::'`         .:iiixkxxo'
-${c1} d${c2}Od,                            'lc.
+  'ooooi:'`                `'';ioxxo'
-${c1} :,${c4}.                              ${c2}...
+ 'i:'`                          '':io'
+'`                                   `'
 EOF
         ;;
 
@@ -5580,6 +5596,32 @@ ${c1}             `.--::::::--.`
 EOF
         ;;
 
+        "Clear Linux OS"*)
+            set_colors 4 3 7 6
+            read -rd '' ascii_data <<'EOF'
+${c1}          BBB
+       BBBBBBBBB
+     BBBBBBBBBBBBBBB
+   BBBBBBBBBBBBBBBBBBBB
+   BBBBBBBBBBB         BBB
+  BBBBBBBB${c2}YYYYY
+${c1}  BBBBBBBB${c2}YYYYYY
+${c1}  BBBBBBBB${c2}YYYYYYY
+${c1}  BBBBBBBBB${c2}YYYYY${c3}W
+${c4} GG${c1}BBBBBBBY${c2}YYYY${c3}WWW
+${c4} GGG${c1}BBBBBBB${c2}YY${c3}WWWWWWWW
+${c4} GGGGGG${c1}BBBBBB${c3}WWWWWWWW
+${c4} GGGGGGGG${c1}BBBB${c3}WWWWWWWW
+${c4}GGGGGGGGGGG${c1}BBB${c3}WWWWWWW
+${c4}GGGGGGGGGGGGG${c1}B${c3}WWWWWW
+${c4}GGGGGGGG${c3}WWWWWWWWWWW
+${c4}GG${c3}WWWWWWWWWWWWWWWW
+ WWWWWWWWWWWWWWWW
+      WWWWWWWWWW
+          WWW
+EOF
+        ;;
+
         "Clover"*)
             set_colors 2 6
             read -rd '' ascii_data <<'EOF'
@@ -6320,21 +6362,25 @@ WW                           W
 EOF
         ;;
 
-        "januslinux"*)
+        "januslinux"*|"janus"*)
-            set_colors 7
+            set_colors 4 7 4
             read -rd '' ascii_data <<'EOF'
-${c1} ________________
+${c1}oooooooooooooooooooooooooooooooo
-|\               \
+oooooooooooooooooooooooooooooooo
-| \               \
+oooooooooooooooooooooooooooooooo
-|  \               \
+ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo
-|   \ ______________\
+oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo
-|    |              |
+oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll
-|    |              |
+ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll
-|    |              |
+ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll
- \   |  januslinux  |
+ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll
-  \  |              |
+ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll
-   \ |              |
+ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll
-    \|______________|
+oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc
+oooooooooooll${c2}o0WW0o${c3}lllllcccccccc
+ooooooooooollll${c2}oo${c3}llllllccccccccc
+oooooooooollllllllllllcccccccccc
+oooooooooollllllllllllcccccccccc
 EOF
         ;;
 
@@ -7158,7 +7204,7 @@ ${c1} `-|.'   /_.          ${c4}\_|  ${c1} F
    |/`. `-.     `._)
       / .-.\\
       \\ (  `\\
-       `.\
+       `.\\
 EOF
         ;;
 
@@ -7543,26 +7589,42 @@ s:  yNm+`   .smNd+.
 EOF
         ;;
 
+        "postmarketos_small")
+            set_colors 2 7
+            read -rd '' ascii_data <<'EOF'
+${c1}        /\\
+       /  \\
+      /    \\
+      \\__   \\
+    /\\__ \\  _\\
+   /   /  \\/ __
+  /   / ____/  \\
+ /    \\ \\       \\
+/_____/ /________\\
+EOF
+        ;;
+
         "PostMarketOS"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'
-${c1}                    ss
+${c1}                 /\\
-                 `hMMh`
+                /  \\
-                .dMMMMd.
+               /    \\
-               -NMMMMMMN-
+              /      \\
-              /MMMMMMMMMN/
+             /        \\
-              hMMMMMMMMMMMo
+            /          \\
-            y+`mMMmdNMMMMMMy
+            \\           \\
-          `dMM-.-:- .mMMMMMMh`
+          /\\ \\____       \\
-         .mMMMMMMd`  `dMMMMMMm.
+         /  \\____ \\       \\
-        :NMMMMMMy      yMMMMMMN:
+        /       /  \\       \\
-       /MMMMMMMo        oMMMmdmN/
+       /       /    \\    ___\\
-      oMMMMMMM/          /MN.-/:-.
+      /       /      \\  / ____
-    `yMMMMMMN-            -:.NMMMMy`
+     /       /        \\/ /    \\
-   `dMMMMMMM- -/////////////dMMMMMMd`
+    /       / __________/      \\
-  -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm-
+   /        \\ \\                 \\
- :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN:
+  /          \\ \\                 \\
-+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+
+ /           / /                  \\
+/___________/ /____________________\\
 EOF
         ;;
 
@@ -7635,6 +7697,30 @@ ${c1}               `..--..`
 EOF
         ;;
 
+        "Radix"*)
+            set_colors 1 2
+            read -rd '' ascii_data <<'EOF'
+${c2}                .:oyhdmNo
+             `/yhyoosdms`
+            -o+/ohmmho-
+           ..`.:/:-`
+     `.--:::-.``${c1}
+  .+ydNMMMMMMNmhs:`
+`omMMMMMMMMMMMMMMNh-
+oNMMMNmddhhyyhhhddmy.
+mMMMMNmmddhhysoo+/:-`
+yMMMMMMMMMMMMMMMMNNh.
+-dmmmmmNNMMMMMMMMMMs`
+ -+oossyhmMMMMMMMMd-
+ `sNMMMMMMMMMMMMMm:
+  `yMMMMMMNmdhhhh:
+   `sNMMMMMNmmho.
+    `+mMMMMMMMy.
+      .yNMMMm+`
+       `:yd+.
+EOF
+        ;;
+
         "Raspbian"*)
             set_colors 2 1
             read -rd '' ascii_data <<'EOF'