Merge branch 'master' of https://github.com/dylanaraps/neofetch

neofetch

@@ -78,6 +78,12 @@ get_distro() {
                     *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
                 esac
 
+            elif [[ -f "/etc/siduction-version" ]]; then
+                case "$distro_shorthand" in
+                    "on" | "tiny") distro="Siduction" ;;
+                    *) distro="Siduction ($(lsb_release -sic))"
+                esac
+
             elif type -p lsb_release >/dev/null; then
                 case "$distro_shorthand" in
                     "on")   lsb_flags="-sir" ;;
@@ -1573,7 +1579,8 @@ get_resolution() {
 
                     "off")
                         resolution="$(xrandr --nograb --current |\
-                                      awk -F 'connected |\\+' '/ connected/ {printf $2 ", "}')"
+                                      awk -F 'connected |\\+|\\(' \
+                                             '/ connected/ && $2 {printf $2 ", "}')"
                         resolution="${resolution/primary }"
                     ;;
                 esac
@@ -1963,7 +1970,7 @@ get_term_font() {
 
         "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm")
             term_font="$(grep -i -F "${term/d}*font" < <(xrdb -query))"
-            term_font="${term_font/*font:}"
+            term_font="${term_font/*"*font:"}"
             term_font="$(trim "$term_font")"
 
             # Xresources has two different font formats, this checks which
@@ -3422,6 +3429,11 @@ get_distro_colors() {
             ascii_file="nixos"
         ;;
 
+        "Nurunner"*)
+            set_colors 4
+            ascii_file="nurunner"
+        ;;
+
         "OBRevenge"*)
             set_colors 1 7 3
             ascii_file="obrevenge"
@@ -3562,6 +3574,11 @@ get_distro_colors() {
             ascii_file="scientific"
         ;;
 
+	"Siduction"*)
+            set_colors 4 4
+            ascii_file="siduction"
+        ;;
+
         "Slackware"*)
             set_colors 4 7 1
             ascii_file="slackware"