Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Furreto Linux" support (but properly integrated this time) #290

Merged
merged 6 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hyfetch/distros/distro_detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ def detect(name: str) -> AsciiArt | None:
if name.startswith('arcolinux'):
from .arcolinux import arcolinux
return arcolinux

if name.startswith('furreto'):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file and everything in this folder get auto-generated by this script. It shouldn't cause problems to modify like this, but it will be overwritten every time a release happens, and doesn't really impact functionality till then.

Copy link
Contributor Author

@furretpaws furretpaws May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait so i shouldn't have touched that file and the furreto.py file then or..?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't bad to, but also wasn't necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh okie

from .furreto import furreto
return furreto

if name == 'arch_small':
from .arch_small import arch_small
Expand Down Expand Up @@ -1499,4 +1503,4 @@ def detect(name: str) -> AsciiArt | None:
if name == 'sunos':
from .sunos import sunos
return sunos


1 change: 0 additions & 1 deletion hyfetch/distros/femboyos.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@
MMMMMMMMMMMMMWNWMMMWWNNNWMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
""")

31 changes: 31 additions & 0 deletions hyfetch/distros/furreto.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This file is automatically generated. Please do not modify.

from . import AsciiArt

furreto = AsciiArt(match=r'''"furreto"*''', color='211 255 225 199', ascii=r"""
${c1}
${c1}.xOOko .odd,
o${c3}X${c2}WWK${c3}O${c1}OOO. 'O${c3}N${c2}WW${c3}0${c1}kkk.
.k0${c3}XKO${c1}OOOOOcOO${c2}NWN${c1}OOOOO.
xOOOOOOOOOkkOOOOOOOOO;
.O0OkkocxO000000kcdk0OO0OOkx
k${c3}W${c2}MX${c1}kkkkloxkkkx; :dxxxxddc...
'kO0OOOOOkc .cl:..kk0KK0Okc
;kOOO0000xd. dO00000Oo .xkO${c3}N${c2}MM${c3}X${c1}OOOO
.dddxkOOOkddc.k${c3}K${c2}NWW${c3}N${c1}000000l.ddk${c2}00${c1}00OOOO.
'dd:;ddddd;.d${c3}K${c2}MMM${c3}W${c1}K00KKK0O::ddxkO00Oko
.okxkOKK0kkOO00KKOxxlodddddddl
.00OOkkkkkkkkOOO00OOOO0O; .dddl
'kkkkkxxkkkkkkkOOkxdxkxxddd.
cddddddddxxkkkkk${c4}xddddddddddo
'ddddddodddddddddddddddddddc
.ddddddodddddddddodddddddc
.odddo.

.kOOkkk;
lkKWNkkkxc
kkxkkkkkkx.
,,..xxx.

""")

1 change: 0 additions & 1 deletion hyfetch/distros/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
${c3}#######${c2}#${c1}#####${c2}#${c3}#######
${c3} #####${c2}#######${c3}#####
""")

32 changes: 31 additions & 1 deletion neofetch
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ image_source="auto"
# CRUX, Crystal Linux, Cucumber, CutefishOS, CuteOS, CyberOS, dahlia, DarkOs, Darwin, Debian,
# Deepin, DesaOS, Devuan, DietPi, digital UNIX, DracOS, DragonFly, Drauger, Droidian, Elementary,
# Elive, EncryptOS, EndeavourOS, Endless, Enso, EuroLinux, EvolutionOS, eweOS, Exherbo, Exodia Predator OS,
# Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS,
# Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeMiNT, Frugalware, Funtoo, Furreto, GalliumOS,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mentioned not being sure what this does in the commit; this huge block prints the default config file and this option lets you override the detected OS. This is just so a user knows most of the valid options for what they can override to.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohh so it's like saying what distros are available and such? i get it now

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FemboyOS 🤣 i gotta get that 🤣

Copy link
Collaborator

@catumin catumin May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep yep. For if you prefer a different distro's logo to your own (for example I may override mine to Furreto instead of Gentoo since I think the paw is cute), or for testing things related to ascii art of a distro you're not using.

# Garuda, Gentoo, GhostBSD, glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix,
# Haiku, HamoniKR, HarDClanZ, Hash, Huayra, Hybrid, HydroOS, Hyperbola, iglunix, instantOS, Interix,
# IRIX, Ironclad, Itc, januslinux, Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, Korora, KrassOS,
Expand Down Expand Up @@ -9909,6 +9909,36 @@ ${c1} ,,:;;;;:,,
EOF
;;

"Furreto"*)
set_colors 211 255 225 199
read -rd '' ascii_data <<'EOF'
${c1}
${c1}.xOOko .odd,
o${c3}X${c2}WWK${c3}O${c1}OOO. 'O${c3}N${c2}WW${c3}0${c1}kkk.
.k0${c3}XKO${c1}OOOOOcOO${c2}NWN${c1}OOOOO.
xOOOOOOOOOkkOOOOOOOOO;
.O0OkkocxO000000kcdk0OO0OOkx
k${c3}W${c2}MX${c1}kkkkloxkkkx; :dxxxxddc...
'kO0OOOOOkc .cl:..kk0KK0Okc
;kOOO0000xd. dO00000Oo .xkO${c3}N${c2}MM${c3}X${c1}OOOO
.dddxkOOOkddc.k${c3}K${c2}NWW${c3}N${c1}000000l.ddk${c2}00${c1}00OOOO.
'dd:;ddddd;.d${c3}K${c2}MMM${c3}W${c1}K00KKK0O::ddxkO00Oko
.okxkOKK0kkOO00KKOxxlodddddddl
.00OOkkkkkkkkOOO00OOOO0O; .dddl
'kkkkkxxkkkkkkkOOkxdxkxxddd.
cddddddddxxkkkkk${c4}xddddddddddo
'ddddddodddddddddddddddddddc
.ddddddodddddddddodddddddc
.odddo.

.kOOkkk;
lkKWNkkkxc
kkxkkkkkkx.
,,..xxx.

EOF
;;

"freebsd_small")
set_colors 1 7 3
read -rd '' ascii_data <<'EOF'
Expand Down