amadaluzia/whyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: add proper BSD support

Browse source
This commit is contained in:
Artur Manuel 2024-09-13 01:38:44 +01:00
commit 09b355a92e
Failed to generate hash of commit
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -59,11 +59,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722495206, "lastModified": 1726167369,
"narHash": "sha256-kJ/MgnoLxuVVnGcVrnZuzZ2eUasKhD7SJG/HI8ugWVQ=", "narHash": "sha256-HESGBMdDP5NweNsfCmifXsmYg66EPRseEriIU9vbkog=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "43c433f2931b803dbe7853e0438ea0744ee48574", "rev": "c7b929cfd422f37173be14f0787decb6b06aa34c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,11 +84,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1722515463, "lastModified": 1725532428,
"narHash": "sha256-6FVPz1WzHak65xJQg8tRjVyFEWMesGxfskKaCxDUnRk=", "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "8c25e871bba3f472e1569bbf6c0f52dcc34bf2a4", "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
whyfetch/__init__.py
View file

@ -26,11 +26,11 @@ def __main__():
props: list[str] = [ props: list[str] = [
f"{d.username}@{d.hostname}", f"{d.username}@{d.hostname}",
f"kernel: {d.kernel}",
f"os: {d.os}", f"os: {d.os}",
f"kernel: {d.kernel}",
f"shell: {d.shell}", f"shell: {d.shell}",
f"ram: {d.ram}", f"ram: {d.ram}",
f"up: {d.uptime}", f"uptime: {d.uptime}",
f"locale: {d.locale}", f"locale: {d.locale}",
f"server: {d.display_server}", f"server: {d.display_server}",
] ]
@ -42,17 +42,17 @@ def __main__():
f" {Colours.red}_.----._{Colours.white} {Colours.magenta}{d.username}{Colours.white}@{Colours.magenta}{d.hostname}" f" {Colours.red}_.----._{Colours.white} {Colours.magenta}{d.username}{Colours.white}@{Colours.magenta}{d.hostname}"
) )
print( print(
f" {Colours.red}.' '.{Colours.white} {Colours.magenta}kernel:{Colours.white} {d.kernel}" f" {Colours.red}.' '.{Colours.white} {Colours.magenta}os:{Colours.white} {d.os}"
) )
print( print(
f"{Colours.red}/{Colours.white}._ _.--._ {Colours.red}\\{Colours.white} {Colours.magenta}os:{Colours.white} {d.os}" f"{Colours.red}/{Colours.white}._ _.--._ {Colours.red}\\{Colours.white} {Colours.magenta}kernel:{Colours.white} {d.kernel}"
) )
print(f"|_ '-' _.._ `| {Colours.magenta}shell:{Colours.white} {d.shell}") print(f"|_ '-' _.._ `| {Colours.magenta}shell:{Colours.white} {d.shell}")
print( print(
f"{Colours.blue}\\{Colours.white} `---' `-{Colours.blue}/{Colours.white} {Colours.magenta}ram:{Colours.white} {d.ram}" f"{Colours.blue}\\{Colours.white} `---' `-{Colours.blue}/{Colours.white} {Colours.magenta}ram:{Colours.white} {d.ram}"
) )
print( print(
f" {Colours.blue}'._ _.'{Colours.white} {Colours.magenta}up:{Colours.white} {d.uptime}" f" {Colours.blue}'._ _.'{Colours.white} {Colours.magenta}uptime:{Colours.white} {d.uptime}"
) )
print( print(
f" {Colours.blue}'----'{Colours.white} {Colours.magenta}locale:{Colours.white} {d.locale}" f" {Colours.blue}'----'{Colours.white} {Colours.magenta}locale:{Colours.white} {d.locale}"

4
whyfetch/data.py
View file

@ -31,7 +31,7 @@ class Data:
linux_res: dict[str, str] = pl.freedesktop_os_release() linux_res: dict[str, str] = pl.freedesktop_os_release()
return linux_res["PRETTY_NAME"] return linux_res["PRETTY_NAME"]
if ["FreeBSD", "OpenBSD", "NetBSD"] not in [ures.system]: if ures.system in ["FreeBSD", "OpenBSD", "NetBSD"]:
return ures.system return ures.system
if sys == "Darwin": if sys == "Darwin":
@ -71,7 +71,7 @@ class Data:
return tm.strftime("%H hours, %M minutes, %S seconds", current_uptime) return tm.strftime("%H hours, %M minutes, %S seconds", current_uptime)
def get_display_server(self) -> str: def get_display_server(self) -> str:
if "Linux" == ures.system: if ures.system in ["Linux", "FreeBSD", "OpenBSD", "NetBSD"]:
return os.environ["XDG_SESSION_TYPE"] return os.environ["XDG_SESSION_TYPE"]
elif "Darwin" == ures.system: elif "Darwin" == ures.system:
return "XQuartz" return "XQuartz"