Skip to content

Commit

Permalink
Merge dylanaraps#2125 dylanaraps#2151 dylanaraps#2187
Browse files Browse the repository at this point in the history 
dylanaraps#2222
dylanaraps#2224
dylanaraps#2251
dylanaraps#2266
dylanaraps#2274
  • Loading branch information
@mrquantumoff
mrquantumoff committed Jan 7, 2023
1 parent 041de8f commit 6514317
Show file tree
Hide file tree
Showing 10 changed files with 567 additions and 38 deletions.
79 changes: 79 additions & 0 deletions 2125.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..73b956bfc 100755
--- a/nexfetch
+++ b/nexfetch
@@ -10966,7 +10966,7 @@ sssss${c2}yMMMMMmhy${c1}ssssssssssss${c2}NM${c1}ss${c2}dMy${c1}sssssss
EOF
;;

- "ubuntu_old")
+ "ubuntu_old02")
set_colors 1 7 3
read -rd '' ascii_data <<'EOF'
${c1} ./+o+-
@@ -11017,18 +11017,23 @@ EOF
;;

"ubuntu_small")
- set_colors 1 7 3
+ set_colors 1
read -rd '' ascii_data <<'EOF'
-${c1} _
- ---(_)
- _/ --- \\
-(_) | |
- \\ --- _/
- ---(_)
+${c1} ..;,; .,;,.
+ .,lool: .ooooo,
+ ;oo;: .coool.
+ .... ''' ,l;
+:oooo, 'oo.
+looooc :oo'
+ '::' ,oo:
+ ,., .... co,
+ lo:;. :oooo; .
+ ':ooo; cooooc
+ ''' ''''
EOF
;;

- "Ubuntu"* | "i3buntu"*)
+ "Ubuntu_old"* | "i3buntu"*)
set_colors 1 7 3
read -rd '' ascii_data <<'EOF'
${c1} .-/+oossssoo+\-.
@@ -11053,6 +11058,33 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso
.-\+oossssoo+/-.
EOF
;;
+
+ "Ubuntu"*)
+ set_colors 1
+ read -rd '' ascii_data <<'EOF'
+${c1} ....
+ .',:clooo: .:looooo:.
+ .;looooooooc .oooooooooo'
+ .;looooool:,''. :ooooooooooc
+ ;looool;. 'oooooooooo,
+ ;clool' .cooooooc. ,,
+ ... ...... .:oo,
+ .;clol:,. .loooo'
+ :ooooooooo, 'ooool
+'ooooooooooo. loooo.
+'ooooooooool coooo.
+ ,loooooooc. .loooo.
+ .,;;;'. ;ooooc
+ ... ,ooool.
+ .cooooc. ..',,'. .cooo.
+ ;ooooo:. ;oooooooc. :l.
+ .coooooc,.. coooooooooo.
+ .:ooooooolc:. .ooooooooooo'
+ .':loooooo; ,oooooooooc
+ ..';::c' .;loooo:'
+ .
+EOF
+ ;;

"Univention"*)
set_colors 1 7
80 changes: 80 additions & 0 deletions 2151.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..65db44704 100755
--- a/nexfetch
+++ b/nexfetch
@@ -1260,7 +1260,14 @@ get_model() {
if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then
model="Hackintosh (SMBIOS: $(sysctl -n hw.model))"
else
- model=$(sysctl -n hw.model)
+ if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then
+ model="$(system_profiler SPHardwareDataType | grep Machine\ Name\:)"
+ model=${model/Machine\ Name\:/}
+
+ model="$model ($(sysctl -n hw.model))"
+ else
+ model=$(sysctl -n hw.model)
+ fi
fi
;;

@@ -2282,7 +2289,20 @@ get_cpu() {
;;

"Mac OS X"|"macOS")
- cpu="$(sysctl -n machdep.cpu.brand_string)"
+ if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then
+ cpu="$(system_profiler SPHardwareDataType | grep CPU\ Type)"
+ cpu="${cpu/CPU\ Type\:/}"
+
+ speed="$(system_profiler SPHardwareDataType | grep CPU\ Speed)"
+ speed="${speed/CPU\ Speed\:/}"
+ speed="${speed/ MHz/}"
+ speed="${speed/ GHz/}"
+
+ cores="$(system_profiler SPHardwareDataType | grep Number\ Of\ CPUs)"
+ cores="${cores/Number\ Of\ CPUs\:/}"
+ else
+ cpu="$(sysctl -n machdep.cpu.brand_string)"
+ fi

# Get CPU cores.
case $cpu_cores in
@@ -2704,13 +2724,30 @@ get_memory() {
;;

"Mac OS X" | "macOS" | "iPhone OS")
- hw_pagesize="$(sysctl -n hw.pagesize)"
- mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))"
- pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))"
- pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')"
- pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')"
- pages_compressed="${pages_compressed:-0}"
- mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))"
+ if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then
+ mem_total="$(system_profiler SPHardwareDataType | grep Memory:)"
+ mem_total="${mem_total/Memory\: /}"
+ mem_total="${mem_total/ MB/}"
+
+ mem_used="$(vm_stat | grep Pages\ active\:)"
+ mem_used="${mem_used/Pages active\: /}"
+ mem_used="${mem_used/\./}"
+
+ pages_inactive=$(vm_stat | grep "Pages inactive")
+ pages_inactive=${pages_inactive/Pages inactive\: /}
+ pages_inactive=${pages_inactive/\./}
+
+ mem_used=$((mem_used + pages_inactive))
+ mem_used=$((mem_used * 4096 / 1048576))
+ else
+ hw_pagesize="$(sysctl -n hw.pagesize)"
+ mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))"
+ pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))"
+ pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')"
+ pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')"
+ pages_compressed="${pages_compressed:-0}"
+ mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))"
+ fi
;;

"BSD" | "MINIX")
43 changes: 43 additions & 0 deletions 2187.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..a8367fdc4 100755
--- a/nexfetch
+++ b/nexfetch
@@ -11233,21 +11233,23 @@ EOF
set_colors 6 7
read -rd '' ascii_data <<'EOF'
${c1}
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
-
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
-################ ################
+,,**************/ ///////////////()
+****************/ ///////////////((
+***************// //////////////(((
+**************/// ////////////(((((
+************///// /////////((((((((
+*********//////// /////((((((((((((
+*******////////// ///((((((((((((((
+****///////////// (((((((((((((((((
+
+/////////////(((( (((((((((((((((((
+////////////((((( (((((((((((((((((
+///////////(((((( (((((((((((((((((
+/////////(((((((( (((((((((((((((((
+///////(((((((((( (((((((((((((((((
+////((((((((((((( (((((((((((((((((
+((((((((((((((((( (((((((((((((((((
+((((((((((((((((( (((((((((((((((()
EOF
;;

46 changes: 46 additions & 0 deletions 2222.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..0d23ffe2b 100755
--- a/nexfetch
+++ b/nexfetch
@@ -807,7 +807,7 @@ image_source="auto"
# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc,
-# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
+# Obarun, windows10, Windows7, Xubuntu, Zorin, Vanilla, and IRIX have ascii logos.
# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
# Use '{distro name}_old' to use the old logos.
# NOTE: Ubuntu has flavor variants.
@@ -11202,6 +11202,32 @@ ${c1} | (-- | |
EOF

;;
+
+ "Vanilla"*)
+ set_colors 11 15
+ read -rd '' ascii_data <<'EOF'
+${c1}
+ .----:
+ .-------.
+ :---::----:
+ .----::-----.
+ ......... :----::-----: ..:::-::::..
+.-----------------::------------------:
+ ----::-----------::----------::::---:
+ -----:::--------::-------:::-------
+ :------::::--::...:::::---------:
+ .---------::.. ..:---------.
+ .::-----::.. .::----::.
+ .:------:.......:-------:
+ .--------::::::::-:::-------.
+ .-------::-----.:-----::------.
+ -----::------: :------::-----
+ :--::--------: .-------::---:
+ :----------:: .:----------
+
+EOF
+ ;;
+

"Obarun"*)
set_colors 6 6 7 1
12 changes: 12 additions & 0 deletions 2224.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..d7378373a 100755
--- a/nexfetch
+++ b/nexfetch
@@ -1155,6 +1155,7 @@ get_distro() {
10.16*) codename="macOS Big Sur" ;;
11.*) codename="macOS Big Sur" ;;
12.*) codename="macOS Monterey" ;;
+ 13.*) codename="macOS Ventura" ;;
*) codename=macOS ;;
esac

66 changes: 66 additions & 0 deletions 2251.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..0527482ef 100755
--- a/nexfetch
+++ b/nexfetch
@@ -783,7 +783,7 @@ image_source="auto"
# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft,
# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch,
-# Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
+# Artix, Arya, Aster, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
# Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres,
# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin,
@@ -5142,7 +5142,7 @@ ASCII:
NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android,
instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\",
Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike,
- XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig,
+ XFerience, ArchMerge, Arch, Artix, Arya, Aster, Bedrock, Bitrig,
BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs,
Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom,
Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux,
@@ -6250,6 +6250,30 @@ ${c4} %%%
EOF
;;

+ "Aster"*)
+ set_colors 6 6
+ read -rd '' ascii_data <<'EOF'
+${c1} ...''...
+${c1} .;oOXWMWNXXXNMMN0d:.
+${c1} .oXMWOo;.. ..:oO;
+${c1} ;KMWx, co,
+${c1} 'KMNl dMMW.
+${c1} oMMx xMMMMk
+${c1} xMM: dMMMMMM;
+${c1} cMMl dMMMMMMMW
+${c1} NMK xMMMx::dXMx
+${c1} ,MMl xMMN' .o.
+${c1} cMM; dMMW'
+${c1} ;MMc oMMW,
+${c1} WMK dMMW, ccccccc.
+${c1} lMMl oMMM; ooooooo.
+${c1} OMMc ...
+${c1} xMMx
+${c1} ;XMN:
+${c1} ,.
+EOF
+ ;;
+
"Bedrock"*)
set_colors 8 7
read -rd '' ascii_data <<'EOF'
diff --git a/nexfetch.1 b/nexfetch.1
index b90b57817..e66d6a4c9 100644
--- a/nexfetch.1
+++ b/nexfetch.1
@@ -304,7 +304,7 @@ Which Distro's ascii art to print
NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft,
ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch,
-Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
+Artix, Arya, Aster, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres,
Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS,
24 changes: 24 additions & 0 deletions 2266.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..c98c2c48c 100755
--- a/nexfetch
+++ b/nexfetch
@@ -4082,6 +4082,10 @@ print_ascii() {
print_ascii
return
}
+
+ if [[ $custom_ascii_len -gt 0 ]];then
+ ascii_len="$custom_ascii_len"
+ fi

# Colors.
ascii_data="${ascii_data//\$\{c1\}/$c1}"
@@ -5366,6 +5370,8 @@ get_args() {
*) image_source="$2" ;;
esac
;;
+
+ "--ascii-len") custom_ascii_len="$2";;

# Image options
"--loop") image_loop="on" ;;
31 changes: 31 additions & 0 deletions 2274.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/nexfetch b/nexfetch
index 48b96d215..fed4b8b87 100755
--- a/nexfetch
+++ b/nexfetch
@@ -10168,6 +10168,26 @@ ${c1}
EOF
;;

+ "RhaymOS"*)
+ set_colors 1
+ read -rd '' ascii_data <<'EOF'
+${c1}
+ ###
+ #####
+
+ ####### /########
+ ############# ###########
+ ,########### #### ####(..
+ #### #### ####* ##########
+ #### ##### ##### (####
+ #### ########### ###########
+ #### ######### ##########
+
+ ###################################
+ #####################################
+#######################################
+EOF
+
"rocky_small"*)
set_colors 2
read -rd '' ascii_data <<'EOF'
Loading

0 comments on commit 6514317

Please sign in to comment.