Compare commits

...

10 Commits

Author SHA1 Message Date
912ba30d58
chore(release): prepare for pfetch-rs v2.11.0
Some checks failed
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, Linux x86_64, ubuntu-latest, true, x86_64-unknown-linux-gnu) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, Windows x86_64, windows-latest, true, x86_64-pc-windows-gnu) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, macOS x86_64, macos-latest, true, x86_64-apple-darwin) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (true, Android, ubuntu-latest, true, aarch64-linux-android) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (true, FreeBSD, ubuntu-latest, true, x86_64-unknown-freebsd) (push) Has been cancelled
CI / render (push) Has been cancelled
Release / Generate Changelog (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-apple-darwin/release/pfetch, false, macOS aarch64, macos-latest, pfetch-macos-aarch64.tar.gz, true, aarch64-apple-darwin) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-linux-android/release/pfetch, true, Android, ubuntu-latest, pfetch-android-aarch64.tar.gz, true, aarch64-linux-android) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-unknown-linux-musl/release/pfetch, true, Linux musl aarch64, ubuntu-latest, pfetch-linux-musl-aarch64.tar.gz, true, aarch64-unknown-linux-musl) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/armv7-unknown-linux-gnueabihf/release/pfetch, true, Linux ARMv7, ubuntu-latest, pfetch-linux-gnueabihf-armv7.tar.gz, true, armv7-unknown-linux-gnueabihf) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-apple-darwin/release/pfetch, false, macOS x86_64, macos-latest, pfetch-macos-x86_64.tar.gz, true, x86_64-apple-darwin) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-pc-windows-gnu/release/pfetch.exe, false, Windows x86_64, windows-latest, pfetch-windows-x86_64.exe, true, x86_64-pc-windows-gnu) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-freebsd/release/pfetch, true, freeBSD x86_64, ubuntu-latest, pfetch-freebsd-x86_64.tar.gz, true, x86_64-unknown-freebsd) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-linux-gnu/release/pfetch, false, Linux GNU x86_64, ubuntu-latest, pfetch-linux-gnu-x86_64.tar.gz, true, x86_64-unknown-linux-gnu) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-linux-musl/release/pfetch, true, Linux musl x86_64, ubuntu-latest, pfetch-linux-musl-x86_64.tar.gz, true, x86_64-unknown-linux-musl) (push) Has been cancelled
2024-08-02 19:43:42 +02:00
aa20ed1d94
chore(deps): update dependencies 2024-08-02 19:40:10 +02:00
d3ab51b0c3
fix: fix PF_COLOR=0 stripping too much
closes #60
2024-08-02 19:31:10 +02:00
github-actions
96facd5b5a chore(logos): re-render all logos 2024-07-25 19:10:27 +00:00
Un1q32
7a22f30007
feat(logos): update EndeavourOS logo (#59) 2024-07-25 21:06:30 +02:00
84243151fa
chore(release): prepare for pfetch-rs v2.10.0
Some checks failed
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, Linux x86_64, ubuntu-latest, true, x86_64-unknown-linux-gnu) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, Windows x86_64, windows-latest, true, x86_64-pc-windows-gnu) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (false, macOS x86_64, macos-latest, true, x86_64-apple-darwin) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (true, Android, ubuntu-latest, true, aarch64-linux-android) (push) Has been cancelled
CI / ${{ matrix.name }} (${{ matrix.target }}) (true, FreeBSD, ubuntu-latest, true, x86_64-unknown-freebsd) (push) Has been cancelled
CI / render (push) Has been cancelled
Release / Generate Changelog (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-apple-darwin/release/pfetch, false, macOS aarch64, macos-latest, pfetch-macos-aarch64.tar.gz, true, aarch64-apple-darwin) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-linux-android/release/pfetch, true, Android, ubuntu-latest, pfetch-android-aarch64.tar.gz, true, aarch64-linux-android) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/aarch64-unknown-linux-musl/release/pfetch, true, Linux musl aarch64, ubuntu-latest, pfetch-linux-musl-aarch64.tar.gz, true, aarch64-unknown-linux-musl) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/armv7-unknown-linux-gnueabihf/release/pfetch, true, Linux ARMv7, ubuntu-latest, pfetch-linux-gnueabihf-armv7.tar.gz, true, armv7-unknown-linux-gnueabihf) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-apple-darwin/release/pfetch, false, macOS x86_64, macos-latest, pfetch-macos-x86_64.tar.gz, true, x86_64-apple-darwin) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-pc-windows-gnu/release/pfetch.exe, false, Windows x86_64, windows-latest, pfetch-windows-x86_64.exe, true, x86_64-pc-windows-gnu) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-freebsd/release/pfetch, true, freeBSD x86_64, ubuntu-latest, pfetch-freebsd-x86_64.tar.gz, true, x86_64-unknown-freebsd) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-linux-gnu/release/pfetch, false, Linux GNU x86_64, ubuntu-latest, pfetch-linux-gnu-x86_64.tar.gz, true, x86_64-unknown-linux-gnu) (push) Has been cancelled
Release / ${{ matrix.name }} (${{ matrix.target }}) (target/x86_64-unknown-linux-musl/release/pfetch, true, Linux musl x86_64, ubuntu-latest, pfetch-linux-musl-x86_64.tar.gz, true, x86_64-unknown-linux-musl) (push) Has been cancelled
2024-06-29 17:36:23 +02:00
3852feaeb6
chore(deps): update dependencies 2024-06-29 17:31:38 +02:00
Adrian Groh
015a867455
feat: use faster method for nix package count (#57)
* Use fast nix package count from libmacchina

* Update docs on slow nix package count

* Update libmacchina to 7.3.0
2024-06-29 17:29:34 +02:00
Adrian Groh
4309bc1a08
feat(logos): add CachyOS logo (#56)
* Add CachyOS logo

* chore(logos): re-render all logos

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2024-06-27 10:42:47 +02:00
Un1q32
7e7cf324a2
fix(logos): change primary text color for the GNU Hurd logo (#55)
closes #49
2024-06-26 21:27:10 +02:00
14 changed files with 636 additions and 197 deletions

View File

@ -1,5 +1,36 @@
# Changelog
## [2.11.0] - 2024-08-02
### Bug Fixes
- Fix `PF_COLOR=0` stripping too much
### Features
- Update EndeavourOS logo (#59)
### Miscellaneous
- Update dependencies
## [2.10.0] - 2024-06-29
### Bug Fixes
- Improve uptime calculation
- Change primary text color for the GNU Hurd logo (#55)
### Features
- Add CachyOS logo (#56)
- Use faster method for nix package count (#57)
### Miscellaneous
- Update the license year (#53)
- Update dependencies
## [2.9.2] - 2024-06-03
### Features

215
Cargo.lock generated
View File

@ -40,9 +40,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "block"
@ -52,9 +52,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "bstr"
version = "1.9.1"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"serde",
@ -74,9 +74,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
version = "1.0.98"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
[[package]]
name = "cfg-if"
@ -100,7 +100,7 @@ dependencies = [
"iana-time-zone",
"num-traits",
"serde",
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
@ -202,15 +202,15 @@ dependencies = [
[[package]]
name = "crossterm"
version = "0.27.0"
version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"crossterm_winapi",
"libc",
"mio",
"parking_lot",
"rustix",
"signal-hook",
"signal-hook-mio",
"winapi",
@ -263,9 +263,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
[[package]]
name = "either"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "enum-as-inner"
@ -276,7 +276,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -316,7 +316,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -387,7 +387,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -534,9 +534,9 @@ dependencies = [
[[package]]
name = "lazy_static"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
@ -546,19 +546,19 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
name = "libloading"
version = "0.8.3"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if 1.0.0",
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
name = "libmacchina"
version = "7.2.3"
version = "7.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc54c7fbfab302c347ed0c02d183b80f8682d34396d5122b1a16052d7db74d4d"
checksum = "db7da6b3cc07bad368785109f144ea939ad8737fda2bb3ac08e29b794579627b"
dependencies = [
"cfg-if 1.0.0",
"core-foundation 0.9.4",
@ -593,7 +593,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"libc",
]
@ -627,9 +627,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.21"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "mach2"
@ -651,9 +651,9 @@ dependencies = [
[[package]]
name = "memchr"
version = "2.7.2"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@ -681,14 +681,15 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.11"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
dependencies = [
"hermit-abi",
"libc",
"log",
"wasi",
"windows-sys 0.48.0",
"windows-sys 0.52.0",
]
[[package]]
@ -807,7 +808,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
@ -821,7 +822,7 @@ dependencies = [
[[package]]
name = "pfetch"
version = "2.9.2"
version = "2.11.0"
dependencies = [
"crossterm",
"dotenvy",
@ -836,7 +837,7 @@ dependencies = [
[[package]]
name = "pfetch-extractor"
version = "0.2.1"
version = "0.2.3"
dependencies = [
"pfetch-logo-parser",
"proc-macro2",
@ -845,7 +846,7 @@ dependencies = [
[[package]]
name = "pfetch-logo-parser"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"proc-macro2",
"quote",
@ -872,9 +873,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "proc-macro2"
version = "1.0.85"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@ -890,11 +891,11 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.1"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
]
[[package]]
@ -910,9 +911,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.4"
version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@ -922,9 +923,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@ -933,9 +934,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "rpm-pkg-count"
@ -952,7 +953,7 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@ -976,22 +977,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
version = "1.0.203"
version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.203"
version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -1006,9 +1007,9 @@ dependencies = [
[[package]]
name = "signal-hook-mio"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
dependencies = [
"libc",
"mio",
@ -1041,19 +1042,18 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "sqlite"
version = "0.31.1"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05439db7afa0ce0b38f6d1b4c691f368adde108df021e15e900fec6a1af92488"
checksum = "274e5a9a0968bc9797fd3fe75a544cbcd3e3c2a111cb1c11cb8a0290f9684cb2"
dependencies = [
"libc",
"sqlite3-sys",
]
[[package]]
name = "sqlite3-src"
version = "0.5.1"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454"
checksum = "174d4a6df77c27db281fb23de1a6d968f3aaaa4807c2a1afa8056b971f947b4a"
dependencies = [
"cc",
"pkg-config",
@ -1061,11 +1061,10 @@ dependencies = [
[[package]]
name = "sqlite3-sys"
version = "0.15.2"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b"
checksum = "3901ada7090c3c3584dc92ec7ef1b7091868d13bfe6d7de9f0bcaffee7d0ade5"
dependencies = [
"libc",
"sqlite3-src",
]
@ -1082,9 +1081,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.66"
version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [
"proc-macro2",
"quote",
@ -1097,7 +1096,7 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"byteorder",
"enum-as-inner",
"libc",
@ -1107,22 +1106,22 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.61"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.61"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -1144,7 +1143,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
]
[[package]]
@ -1199,7 +1198,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
"wasm-bindgen-shared",
]
@ -1221,7 +1220,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.72",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -1234,9 +1233,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "wayland-sys"
version = "0.31.2"
version = "0.31.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
dependencies = [
"dlib",
"log",
@ -1246,14 +1245,14 @@ dependencies = [
[[package]]
name = "which"
version = "4.4.2"
version = "6.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075"
dependencies = [
"either",
"home",
"once_cell",
"rustix",
"winsafe",
]
[[package]]
@ -1326,7 +1325,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
@ -1366,7 +1365,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
@ -1386,18 +1385,18 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm 0.52.5",
"windows_aarch64_msvc 0.52.5",
"windows_i686_gnu 0.52.5",
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.5",
"windows_x86_64_gnu 0.52.5",
"windows_x86_64_gnullvm 0.52.5",
"windows_x86_64_msvc 0.52.5",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
]
[[package]]
@ -1408,9 +1407,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@ -1426,9 +1425,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@ -1444,15 +1443,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@ -1468,9 +1467,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@ -1486,9 +1485,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@ -1498,9 +1497,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@ -1516,9 +1515,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winreg"
@ -1529,6 +1528,12 @@ dependencies = [
"winapi",
]
[[package]]
name = "winsafe"
version = "0.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
[[package]]
name = "wmi"
version = "0.12.2"

View File

@ -3,7 +3,7 @@ members = ["pfetch-extractor", "pfetch-logo-parser"]
[package]
name = "pfetch"
version = "2.9.2"
version = "2.11.0"
edition = "2021"
authors = ["Gobidev"]
description = "A rewrite of the pfetch system information tool"
@ -15,14 +15,14 @@ categories = ["command-line-utilities"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
pfetch-logo-parser = { path = "./pfetch-logo-parser", version = "0.1.0" }
pfetch-extractor = { path = "./pfetch-extractor", version = "0.2.0" }
pfetch-logo-parser = { path = "./pfetch-logo-parser", version = "0.1.1" }
pfetch-extractor = { path = "./pfetch-extractor", version = "0.2.3" }
globset = "0.4.10"
dotenvy = "0.15.6"
glob = "0.3.1"
which = "4.4.0"
libmacchina = "7.2.3"
crossterm = "0.27.0"
which = "6.0.2"
libmacchina = "7.3.0"
crossterm = "0.28.1"
os-release = "0.1.0"
[profile.release]

View File

@ -14,13 +14,13 @@ minimalistic look.
**Included Logos:** Alma Linux _(new)_, Alpine Linux, Android, AmogOS _(new)_,
Arch Linux, ArcoLinux, Artix Linux, Bazzite _(new)_, Bedrock Linux, Buildroot,
CelOS, CentOS, Crystal Linux, dahliaOS, Debian, Devuan, DietPi _(new)_,
DragonflyBSD, Elementary OS, EndeavourOS, Fedora, Fiwix _(new)_, FreeBSD, Garuda
Linux, Gentoo Linux, Gnu Hurd _(updated)_, Guix, Haiku, HydroOS, Hyperbola,
instantOS, IRIX, KDE neon, Linux Lite, Linux, Mint, macOS, Mageia, Manjaro,
Minix, MorphOS _(new)_, MX Linux, NetBSD, NixOS, Nobara Project _(new)_,
OpenBSD, openSUSE Tumbleweed, openSUSE Leap, OpenWrt, Oracle Linux _(new)_,
Parabola, Pop!\_OS _(updated)_, PureOS, Raspbian, Rocky Linux _(new)_,
CachyOS _(new)_, CelOS, CentOS, Crystal Linux, dahliaOS, Debian, Devuan, DietPi
_(new)_, DragonflyBSD, Elementary OS, EndeavourOS, Fedora, Fiwix _(new)_,
FreeBSD, Garuda Linux, Gentoo Linux, Gnu Hurd _(updated)_, Guix, Haiku, HydroOS,
Hyperbola, instantOS, IRIX, KDE neon, Linux Lite, Linux, Mint, macOS, Mageia,
Manjaro, Minix, MorphOS _(new)_, MX Linux, NetBSD, NixOS, Nobara Project
_(new)_, OpenBSD, openSUSE Tumbleweed, openSUSE Leap, OpenWrt, Oracle Linux
_(new)_, Parabola, Pop!\_OS _(updated)_, PureOS, Raspbian, Rocky Linux _(new)_,
SerenityOS, Slackware, Solus, SteamOS _(new)_, Solaris, Ubuntu, Vanilla OS
_(new)_, Void Linux, Windows _(new)_, Xeonix Linux
@ -83,13 +83,9 @@ managers. For more info, see [Improving Performance](#imp_perf)._
### Improving Performance
The by far slowest part of the `pfetch` execution time is counting the installed
packages. For most package managers this is still very fast, but there are some
(currently `nix` (and `zypper`, if `rpm-devel` is not installed)) that take
~500ms to report installed packages, which takes away all performance benefits
of the Rust version. If you have one or more of these installed, you can skip
counting them by setting the `PF_FAST_PKG_COUNT` environment variable to any
value.
Counting packages of `zypper` can be sped up a lot by installing the `rpm-devel`
package. If the `zypper` package count takes too long, it can be disabled by
setting the `PF_FAST_PKG_COUNT` environment variable to any value.
## Configuration
@ -172,7 +168,7 @@ USER=""
# Which hostname to display.
HOSTNAME=""
# Skip package managers that take "long" to query package count (like nix)
# Skip zypper package count if only slow method is available
PF_FAST_PKG_COUNT=1
```

View File

@ -30,6 +30,9 @@ Generated using `./tools/render_all.sh`, powered by [typst](https://typst.app)
## buildroot
<img src="./assets/logos/buildroot.svg" width="230">
## cachyos
<img src="./assets/logos/cachyos.svg" width="230">
## celos
<img src="./assets/logos/celos.svg" width="230">

400
assets/logos/cachyos.svg Normal file
View File

@ -0,0 +1,400 @@
<svg class="typst-doc" viewBox="0 0 149.9465 137.27450000000002" width="149.9465" height="137.27450000000002" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:h5="http://www.w3.org/1999/xhtml">
<g>
<g transform="translate(14.17325 14.17325)">
<g class="typst-group">
<g>
<g transform="translate(-0 -0)">
<path class="typst-shape" fill="#000000" d="M 0 5 C 0 2.2385762 2.2385762 0 5 0 L 116.6 0 C 119.36143 0 121.6 2.2385762 121.6 5 L 121.6 103.928 C 121.6 106.68942 119.36143 108.928 116.6 108.928 L 5 108.928 C 2.2385762 108.928 0 106.68942 0 103.928 Z "/>
</g>
<g transform="translate(8 19.616)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 19.616)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 8)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gBA8BB243EE0A5024F975614D7555959C" x="15.84" fill="#00875f"/>
<use xlink:href="#gEC826E4B49E9173F2F2FE2900EA74933" x="26.400000000000002" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="31.680000000000003" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="36.96" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="42.24" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="47.52" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="52.800000000000004" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="58.080000000000005" fill="#00875f"/>
<use xlink:href="#g42DC7392A4CAA3092F5BE13CE699DB55" x="63.36000000000001" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(92.47999999999999 8)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gAAF5C779834DDD7C9E874D53022AA2E2" x="0" fill="#00afaf"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(113.6 8)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 31.232000000000003)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 31.232000000000003)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 31.232000000000003)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 19.616)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="10.56" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="15.84" fill="#00875f"/>
<use xlink:href="#gEC826E4B49E9173F2F2FE2900EA74933" x="26.400000000000002" fill="#00875f"/>
<use xlink:href="#g5D002CEEE5398717D3D8FEE83A5E7373" x="31.680000000000003" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="36.96" fill="#00875f"/>
<use xlink:href="#gB9FF1C969CB908D4EDE5F422D191005B" x="52.800000000000004" fill="#00875f"/>
<use xlink:href="#g8A3CBEE574368E4667AFEC0912736A09" x="58.080000000000005" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(113.59999999999998 19.616)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 31.232000000000003)">
<g class="typst-group">
<g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="5.28" fill="#00875f"/>
<use xlink:href="#gB85FB72A8970B6DBEE752810A5068D6E" x="10.56" fill="#00875f"/>
<use xlink:href="#g9C13C898DD549E20A13D500F138C14A" x="15.84" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="21.12" fill="#00875f"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="26.400000000000002" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(73.91999999999999 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g42DC7392A4CAA3092F5BE13CE699DB55" x="0" fill="#00afaf"/>
<use xlink:href="#g17CDE7B7097BB8E04FFA74A95F21EFA9" x="5.28" fill="#00afaf"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(105.6 0)">
<g class="typst-group">
<g/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(8 42.848000000000006)">
<g class="typst-group">
<g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gC6E1CC4D6C05065C5BE14EB8CD3CBEF1" x="5.28" fill="#00875f"/>
<use xlink:href="#gC7504CBB3DEE9ABA7A46331F90CDBA52" x="15.84" fill="#00875f"/>
<use xlink:href="#gCB6A8C0589E950492D9221737405DF53" x="21.12" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(73.91999999999999 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g18F2CC7D21B50B3D6254372B735CE06D" x="0" fill="#00afaf"/>
<use xlink:href="#g18F2CC7D21B50B3D6254372B735CE06D" x="5.28" fill="#00afaf"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="21.12" fill="#00afaf"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(105.6 0)">
<g class="typst-group">
<g/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(8 54.464000000000006)">
<g class="typst-group">
<g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 11.616000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(0 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="5.28" fill="#00875f"/>
<use xlink:href="#gB9FF1C969CB908D4EDE5F422D191005B" x="21.12" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="26.400000000000002" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(89.75999999999999 0)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB9FF1C969CB908D4EDE5F422D191005B" x="10.56" fill="#00afaf"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(105.6 0)">
<g class="typst-group">
<g/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(8 77.69600000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 77.69600000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 77.69600000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 66.08000000000001)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="10.56" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="15.84" fill="#00875f"/>
<use xlink:href="#gCB6A8C0589E950492D9221737405DF53" x="21.12" fill="#00875f"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="26.400000000000002" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="31.680000000000003" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="36.96" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="42.24" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="47.52" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="52.800000000000004" fill="#00875f"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="58.080000000000005" fill="#00875f"/>
<use xlink:href="#gEC826E4B49E9173F2F2FE2900EA74933" x="68.64" fill="#00875f"/>
<use xlink:href="#g42DC7392A4CAA3092F5BE13CE699DB55" x="73.92" fill="#00875f"/>
<use xlink:href="#g8A3CBEE574368E4667AFEC0912736A09" x="95.04" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(113.59999999999998 66.08000000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 89.31200000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 89.31200000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 89.31200000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 77.69600000000001)">
<g class="typst-group">
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g8A3CBEE574368E4667AFEC0912736A09" x="15.84" fill="#00875f"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="21.12" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="26.400000000000002" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="31.680000000000003" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="36.96" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="42.24" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="47.52" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="52.800000000000004" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="58.080000000000005" fill="#00875f"/>
<use xlink:href="#g28FCE79DFF017F7566BD09EFC228E21D" x="63.36000000000001" fill="#00875f"/>
<use xlink:href="#g8A3CBEE574368E4667AFEC0912736A09" x="68.64" fill="#00875f"/>
</g>
</g>
</g>
</g>
</g>
<g transform="translate(113.59999999999998 77.69600000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 89.31200000000001)">
<g class="typst-group">
<g/>
</g>
</g>
<g transform="translate(8 100.92800000000001)">
<g class="typst-group">
<g/>
</g>
</g>
</g>
</g>
</g>
</g>
<defs id="glyph">
<symbol id="gBA8BB243EE0A5024F975614D7555959C" overflow="visible">
<path d="M 2.6399999 -0.088 Q 2.2616 -0.088 2.0372 0.132 Q 1.8127999 0.352 1.8127999 0.73039997 Q 1.8127999 1.1087999 2.0372 1.3332 Q 2.2616 1.5576 2.6399999 1.5576 Q 3.0184 1.5576 3.2428 1.3332 Q 3.4672 1.1087999 3.4672 0.73039997 Q 3.4672 0.352 3.2428 0.132 Q 3.0184 -0.088 2.6399999 -0.088 Z "/>
</symbol>
<symbol id="gEC826E4B49E9173F2F2FE2900EA74933" overflow="visible">
<path d="M -4.3384 0 L -4.048 1.6719999 L -4.7167997 1.6719999 L -4.7167997 2.42 L -3.916 2.42 L -3.6432 4.004 L -4.4088 4.004 L -4.4088 4.752 L -3.52 4.752 L -3.212 6.424 L -2.4464 6.424 L -2.7456 4.752 L -1.496 4.752 L -1.188 6.424 L -0.4224 6.424 L -0.7216 4.752 L 1.232 4.752 L 1.54 6.424 L 2.3056 6.424 L 2.0064 4.752 L 3.256 4.752 L 3.564 6.424 L 4.3296 6.424 L 4.0304 4.752 L 4.6992 4.752 L 4.6992 4.004 L 3.8984 4.004 L 3.6255999 2.42 L 4.3912 2.42 L 4.3912 1.6719999 L 3.5024 1.6719999 L 3.2031999 0 L 2.4376 0 L 2.728 1.6719999 L 1.4784 1.6719999 L 1.1791999 0 L 0.4136 0 L 0.704 1.6719999 L -1.2495999 1.6719999 L -1.5488 0 L -2.3144 0 L -2.024 1.6719999 L -3.2736 1.6719999 L -3.5728 0 L -4.3384 0 Z M -3.1504 2.42 L -1.892 2.42 L -1.6192 4.004 L -2.8776 4.004 L -3.1504 2.42 Z M -1.1264 2.42 L 0.83599997 2.42 L 1.1087999 4.004 L -0.8536 4.004 L -1.1264 2.42 Z M 1.6015999 2.42 L 2.86 2.42 L 3.1328 4.004 L 1.8744 4.004 L 1.6015999 2.42 Z "/>
</symbol>
<symbol id="gB89C091A677BB504765364DF9A4BB3CD" overflow="visible">
<path d="M 3.5992 -0.968 L 0.528 7.304 L 1.6719999 7.304 L 4.7432 -0.968 L 3.5992 -0.968 Z "/>
</symbol>
<symbol id="g28FCE79DFF017F7566BD09EFC228E21D" overflow="visible">
<path d="M 0.6776 0 L 0.97679996 1.6719999 L 0.308 1.6719999 L 0.308 2.42 L 1.1 2.42 L 1.3728 4.004 L 0.616 4.004 L 0.616 4.752 L 1.5048 4.752 L 1.804 6.424 L 2.5784 6.424 L 2.2792 4.752 L 3.5288 4.752 L 3.828 6.424 L 4.6024 6.424 L 4.3032 4.752 L 4.972 4.752 L 4.972 4.004 L 4.1712 4.004 L 3.8984 2.42 L 4.664 2.42 L 4.664 1.6719999 L 3.7663999 1.6719999 L 3.476 0 L 2.7016 0 L 3.0008 1.6719999 L 1.7423999 1.6719999 L 1.452 0 L 0.6776 0 Z M 1.8744 2.42 L 3.124 2.42 L 3.3968 4.004 L 2.1472 4.004 L 1.8744 2.42 Z "/>
</symbol>
<symbol id="g42DC7392A4CAA3092F5BE13CE699DB55" overflow="visible">
<path d="M 2.0944 0.8096 L 2.0944 2.3936 L 0.51919997 2.3936 L 0.51919997 3.4144 L 2.0944 3.4144 L 2.0944 4.9983997 L 3.1856 4.9983997 L 3.1856 3.4144 L 4.7608 3.4144 L 4.7608 2.3936 L 3.1856 2.3936 L 3.1856 0.8096 L 2.0944 0.8096 Z "/>
</symbol>
<symbol id="gAAF5C779834DDD7C9E874D53022AA2E2" overflow="visible">
<path d="M 2.6399999 -0.0792 Q 1.7072 -0.0792 1.1616 0.43559998 Q 0.616 0.9504 0.616 1.8216 L 0.616 3.0184 Q 0.616 3.8896 1.1616 4.4044 Q 1.7072 4.9192 2.6399999 4.9192 Q 3.5728 4.9192 4.1184 4.4044 Q 4.664 3.8896 4.664 3.0272 L 4.664 1.8216 Q 4.664 0.9504 4.1184 0.43559998 Q 3.5728 -0.0792 2.6399999 -0.0792 Z M 2.6399999 0.88 Q 3.08 0.88 3.322 1.122 Q 3.564 1.364 3.564 1.8216 L 3.564 3.0184 Q 3.564 3.476 3.322 3.718 Q 3.08 3.96 2.6399999 3.96 Q 2.2 3.96 1.958 3.718 Q 1.716 3.476 1.716 3.0184 L 1.716 1.8216 Q 1.716 1.364 1.958 1.122 Q 2.2 0.88 2.6399999 0.88 Z "/>
</symbol>
<symbol id="g6DFD4CB43BBA88802CBD8EAC7B58F918" overflow="visible">
<path d="M 0.528 -0.968 L 3.608 7.304 L 4.752 7.304 L 1.6719999 -0.968 L 0.528 -0.968 Z "/>
</symbol>
<symbol id="g5D002CEEE5398717D3D8FEE83A5E7373" overflow="visible">
<path d="M 3.168 3.784 L 3.0536 5.2712 L 3.0536 6.424 L 4.1624 6.424 L 4.1624 5.2712 L 4.0568 3.784 L 3.168 3.784 Z M 1.232 3.784 L 1.1176 5.2712 L 1.1176 6.424 L 2.2264 6.424 L 2.2264 5.2712 L 2.1208 3.784 L 1.232 3.784 Z "/>
</symbol>
<symbol id="gB9FF1C969CB908D4EDE5F422D191005B" overflow="visible">
<path d="M -9.6184 0 L -9.328 1.6719999 L -9.996799 1.6719999 L -9.996799 2.42 L -9.196 2.42 L -8.9232 4.004 L -9.6888 4.004 L -9.6888 4.752 L -8.8 4.752 L -8.492 6.424 L -7.7264 6.424 L -8.0256 4.752 L -6.776 4.752 L -6.468 6.424 L -5.7024 6.424 L -6.0016 4.752 L -3.784 4.752 L -3.476 6.424 L -2.7104 6.424 L -3.0096 4.752 L -1.76 4.752 L -1.452 6.424 L -0.6864 6.424 L -0.9856 4.752 L 1.232 4.752 L 1.54 6.424 L 2.3056 6.424 L 2.0064 4.752 L 3.256 4.752 L 3.564 6.424 L 4.3296 6.424 L 4.0304 4.752 L 4.6992 4.752 L 4.6992 4.004 L 3.8984 4.004 L 3.6255999 2.42 L 4.3912 2.42 L 4.3912 1.6719999 L 3.5024 1.6719999 L 3.2031999 0 L 2.4376 0 L 2.728 1.6719999 L 1.4784 1.6719999 L 1.1791999 0 L 0.4136 0 L 0.704 1.6719999 L -1.5136 1.6719999 L -1.8127999 0 L -2.5784 0 L -2.288 1.6719999 L -3.5376 1.6719999 L -3.8368 0 L -4.6024 0 L -4.312 1.6719999 L -6.5296 1.6719999 L -6.8288 0 L -7.5944 0 L -7.304 1.6719999 L -8.5536 1.6719999 L -8.8528 0 L -9.6184 0 Z M -8.4304 2.42 L -7.172 2.42 L -6.8992 4.004 L -8.1576 4.004 L -8.4304 2.42 Z M -6.4063997 2.42 L -4.18 2.42 L -3.9071999 4.004 L -6.1335998 4.004 L -6.4063997 2.42 Z M -3.4144 2.42 L -2.156 2.42 L -1.8831999 4.004 L -3.1416 4.004 L -3.4144 2.42 Z M -1.3903999 2.42 L 0.83599997 2.42 L 1.1087999 4.004 L -1.1176 4.004 L -1.3903999 2.42 Z M 1.6015999 2.42 L 2.86 2.42 L 3.1328 4.004 L 1.8744 4.004 L 1.6015999 2.42 Z "/>
</symbol>
<symbol id="g8A3CBEE574368E4667AFEC0912736A09" overflow="visible">
<path d="M 2.2792 5.676 L 1.2584 6.908 L 2.4728 6.908 L 3.4144 5.676 L 2.2792 5.676 Z "/>
</symbol>
<symbol id="gB85FB72A8970B6DBEE752810A5068D6E" overflow="visible">
<path d="M 2.1736 3.784 L 2.0592 5.0512 L 2.0592 6.424 L 3.1768 6.424 L 3.1768 5.0512 L 3.0712 3.784 L 2.1736 3.784 Z "/>
</symbol>
<symbol id="g9C13C898DD549E20A13D500F138C14A" overflow="visible">
<path d="M 1.3199999 -1.408 L 2.024 1.3288 L 3.432 1.3288 L 2.288 -1.408 L 1.3199999 -1.408 Z "/>
</symbol>
<symbol id="g17CDE7B7097BB8E04FFA74A95F21EFA9" overflow="visible">
<path d="M 0.7216 3.476 L 0.7216 4.488 L 4.5584 4.488 L 4.5584 3.476 L 0.7216 3.476 Z M 0.7216 1.3199999 L 0.7216 2.332 L 4.5584 2.332 L 4.5584 1.3199999 L 0.7216 1.3199999 Z "/>
</symbol>
<symbol id="gC6E1CC4D6C05065C5BE14EB8CD3CBEF1" overflow="visible">
<path d="M 1.232 2.3936 L 1.232 3.4144 L 4.048 3.4144 L 4.048 2.3936 L 1.232 2.3936 Z "/>
</symbol>
<symbol id="gC7504CBB3DEE9ABA7A46331F90CDBA52" overflow="visible">
<path d="M -4.576 3.476 L -4.576 4.488 L 4.576 4.488 L 4.576 3.476 L -4.576 3.476 Z M -4.576 1.3199999 L -4.576 2.332 L 4.576 2.332 L 4.576 1.3199999 L -4.576 1.3199999 Z "/>
</symbol>
<symbol id="gCB6A8C0589E950492D9221737405DF53" overflow="visible">
<path d="M 2.0856 -0.968 L 2.0856 7.304 L 3.1944 7.304 L 3.1944 -0.968 L 2.0856 -0.968 Z "/>
</symbol>
<symbol id="g18F2CC7D21B50B3D6254372B735CE06D" overflow="visible">
<path d="M 2.2792 7.128 L 1.2584 8.36 L 2.4728 8.36 L 3.4144 7.128 L 2.2792 7.128 Z "/>
</symbol>
<symbol id="g68CEB5E1F8B5DA62FED1AF3894A6DC39" overflow="visible">
<path d="M 0.528 -1.2144 L 0.528 -0.22 L 4.752 -0.22 L 4.752 -1.2144 L 0.528 -1.2144 Z "/>
</symbol>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -41,7 +41,7 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#0000ff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#ff00ff"/>
</g>
</g>
</g>
@ -90,8 +90,8 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#0000ff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="15.84" fill="#0000ff"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#ff00ff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="15.84" fill="#ff00ff"/>
</g>
</g>
</g>
@ -102,7 +102,7 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#00ffff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#0000ff"/>
</g>
</g>
</g>
@ -154,8 +154,8 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#0000ff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="26.400000000000002" fill="#0000ff"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#ff00ff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="26.400000000000002" fill="#ff00ff"/>
</g>
</g>
</g>
@ -166,7 +166,7 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#00ffff"/>
<use xlink:href="#gB89C091A677BB504765364DF9A4BB3CD" x="0" fill="#0000ff"/>
</g>
</g>
</g>
@ -218,9 +218,9 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="31.680000000000003" fill="#0000ff"/>
<use xlink:href="#gE0C378CF8E9F0B5C11D116F81E927A54" x="36.96" fill="#0000ff"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#ff00ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="31.680000000000003" fill="#ff00ff"/>
<use xlink:href="#gE0C378CF8E9F0B5C11D116F81E927A54" x="36.96" fill="#ff00ff"/>
</g>
</g>
</g>
@ -231,7 +231,7 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#gE0C378CF8E9F0B5C11D116F81E927A54" x="0" fill="#00ffff"/>
<use xlink:href="#gE0C378CF8E9F0B5C11D116F81E927A54" x="0" fill="#0000ff"/>
</g>
</g>
</g>
@ -280,11 +280,11 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="5.28" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="10.56" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="15.84" fill="#0000ff"/>
<use xlink:href="#g5EF07F0C0B3AEB5BF05F9CEC3D310957" x="26.400000000000002" fill="#0000ff"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#ff00ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="5.28" fill="#ff00ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="10.56" fill="#ff00ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="15.84" fill="#ff00ff"/>
<use xlink:href="#g5EF07F0C0B3AEB5BF05F9CEC3D310957" x="26.400000000000002" fill="#ff00ff"/>
</g>
</g>
</g>
@ -295,8 +295,8 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g68C69AA8561874B79EEEE55B329FCF2D" x="5.28" fill="#00ffff"/>
<use xlink:href="#gC6E1CC4D6C05065C5BE14EB8CD3CBEF1" x="10.56" fill="#00ffff"/>
<use xlink:href="#g68C69AA8561874B79EEEE55B329FCF2D" x="5.28" fill="#0000ff"/>
<use xlink:href="#gC6E1CC4D6C05065C5BE14EB8CD3CBEF1" x="10.56" fill="#0000ff"/>
</g>
</g>
</g>
@ -334,12 +334,12 @@
<g>
<g transform="translate(0 8.976)">
<g class="typst-text" transform="scale(1, -1)">
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#00ffff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="5.28" fill="#00ffff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="10.56" fill="#00ffff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="15.84" fill="#00ffff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="21.12" fill="#00ffff"/>
<use xlink:href="#g5EF07F0C0B3AEB5BF05F9CEC3D310957" x="31.680000000000003" fill="#00ffff"/>
<use xlink:href="#g6DFD4CB43BBA88802CBD8EAC7B58F918" x="0" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="5.28" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="10.56" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="15.84" fill="#0000ff"/>
<use xlink:href="#g68CEB5E1F8B5DA62FED1AF3894A6DC39" x="21.12" fill="#0000ff"/>
<use xlink:href="#g5EF07F0C0B3AEB5BF05F9CEC3D310957" x="31.680000000000003" fill="#0000ff"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -1,6 +1,6 @@
[package]
name = "pfetch-extractor"
version = "0.2.1"
version = "0.2.3"
authors = ["Gobidev"]
edition = "2021"
keywords = ["pfetch"]
@ -13,6 +13,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
pfetch-logo-parser = { version = "0.1.0", path = "../pfetch-logo-parser", features = ["proc-macro"] }
pfetch-logo-parser = { version = "0.1.1", path = "../pfetch-logo-parser", features = ["proc-macro"] }
proc-macro2 = "1.0.50"
quote = "1.0.23"

View File

@ -145,6 +145,18 @@ case ${1:-${PF_ASCII:-${distro:-$os}}} in
EOF
;;
[Cc]achy*)
read_ascii 2 <<- EOF
${c29} .##\\#####+ ${c37}o
${c29} /\\##"\\###\`
${c29} /',\\/ ${c37}+=
${c29} -==| ${c37}\`\` _
${c29} \\###\\ ${c37}###
${c29} \\#|/#####\\##+ \`
${c29} \`/########\`
EOF
;;
[Cc]el[Oo][Ss]*)
read_ascii 5 <<- EOF
${c5} .////\\\\\//\\.
@ -257,13 +269,13 @@ case ${1:-${PF_ASCII:-${distro:-$os}}} in
;;
[Ee]ndeavour*)
read_ascii 4 <<- EOF
${c1}/${c4}\\
${c1}/${c4}/ \\${c6}\\
${c1}/${c4}/ \\ ${c6}\\
${c1}/ ${c4}/ _) ${c6})
${c1}/_${c4}/___-- ${c6}__-
${c6}/____--
read_ascii 5 <<- EOF
${c1}/${c5}\\
${c1}/${c5}/ \\${c4}\\
${c1}/${c5}/ \\ ${c4}\\
${c1}/ ${c5}/ _) ${c4})
${c1}/_${c5}/___-- ${c4}__-
${c4}/____--
EOF
;;
@ -332,7 +344,7 @@ case ${1:-${PF_ASCII:-${distro:-$os}}} in
;;
([Gg][Nn][Uu]*|[Hh]urd*)
read_ascii 6 <<-EOF
read_ascii 7 <<-EOF
${c7} ---${c3}[ ]${c7}<----
${c7} v | |
${c3}[ ]${c7} --->${c3}[ ]${c7}|

View File

@ -1,6 +1,6 @@
[package]
name = "pfetch-logo-parser"
version = "0.1.0"
version = "0.1.1"
edition = "2021"
authors = ["Gobidev"]
license = "MIT"

View File

@ -96,7 +96,11 @@ impl Display for Logo {
self.logo_parts
.iter()
.fold("".to_string(), |a, LogoPart { color, content }| a
+ &format!("{color}{content}"))
+ &if !f.alternate() {
format!("{color}{content}")
} else {
format!("{content}")
})
)
}
}
@ -107,7 +111,7 @@ pub fn parse_logo(input: &str) -> Option<(bool, Logo)> {
if input.is_empty() {
return None;
}
let regex = Regex::new(r"^\(?(.*)\)[\s\S]*read_ascii *(\d)? *(\d)?").unwrap();
let regex = Regex::new(r"^\(?(.*)\)[\s\S]*read_ascii *(\d)?").unwrap();
let groups = regex.captures(&input).expect("Error while parsing logo");
@ -116,10 +120,7 @@ pub fn parse_logo(input: &str) -> Option<(bool, Logo)> {
Some(color) => color.as_str().parse::<u8>().unwrap(),
None => 7,
};
let secondary_color = match groups.get(3) {
Some(color) => color.as_str().parse::<u8>().unwrap(),
None => (primary_color + 1) % 8,
};
let secondary_color = (primary_color + 1) % 8;
let logo = input
.split_once("EOF\n")
.expect("Could not find start of logo, make sure to include the `<<- EOF` and to use tabs for indentation")

View File

@ -84,18 +84,17 @@ fn packages(
| PackageManager::Xbps
| PackageManager::Apk
| PackageManager::Portage
| PackageManager::Nix
| PackageManager::Opkg => get_macchina_package_count(
macchina_package_count,
&format!("{pkg_manager:?}").to_lowercase(),
)
.unwrap_or(0),
// macchina only supports sqlite database backend for rpm
PackageManager::Rpm => match get_macchina_package_count(
macchina_package_count,
&format!("{pkg_manager:?}").to_lowercase(),
) {
Some(count) => count,
// for other databases run `rpm` (slow), see Macchina-CLI/libmacchina#154
None => {
if !skip_slow {
run_and_count_lines("rpm", &["-qa"])
@ -132,23 +131,6 @@ fn packages(
0
}
}
PackageManager::Nix => {
if check_if_command_exists("nix-store") && !skip_slow {
run_and_count_lines(
"nix-store",
&["-q", "--requisites", "/run/current-system/sw"],
) + run_and_count_lines(
"nix-store",
&[
"-q",
"--requisites",
&format!("{}/.nix-profile", env::var("HOME").unwrap_or_default()),
],
)
} else {
0
}
}
}
}

View File

@ -63,7 +63,12 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
} else {
"".to_string()
};
let logo = logo.to_string();
let color_enabled = dotenvy::var("PF_COLOR").unwrap_or_default() != "0";
let logo = if color_enabled {
logo.to_string()
} else {
format!("{:#}", logo)
};
let mut logo_lines = logo.lines();
let raw_logo_lines: Vec<_> = raw_logo.lines().collect();
let logo_width = raw_logo_lines
@ -78,6 +83,7 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
.skip(1)
.map(|(_, line, _)| {
if line.starts_with("\x1b[4") {
// exclude palette from info1 width
0
} else {
line.len()
@ -103,8 +109,9 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
for l in 0..line_amount {
pfetch_str += &format!(
"{padding1}\x1b[1m{logo}{padding2}{color}{info1}\x1b[0m{separator}{padding3}{color2}{info2}\n",
"{padding1}{bold}{logo}{padding2}{color}{info1}{nobold}{separator}{padding3}{color2}{info2}\n",
padding1 = " ".repeat(padding1),
bold = if color_enabled {"\x1b[1m"} else {""},
logo = if logo_enabled {
logo_lines.next().unwrap_or("")
} else {
@ -114,8 +121,9 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
logo_width - raw_logo_lines.get(l).map_or(0, |line| line.chars().count())
+ if logo_enabled { padding2 } else { 0 }
),
color = info.get(l).map_or("".to_owned(), |line| line.0.to_string()),
color = if color_enabled {info.get(l).map_or("".to_owned(), |line| line.0.to_string())} else {"".to_string()},
info1 = info.get(l).map_or("", |line| &line.1),
nobold = if color_enabled {"\x1b[0m"} else {""},
separator = info.get(l).map_or("".to_string(), |line|
if ! &line.2.is_empty() {
dotenvy::var("PF_SEP").unwrap_or_default()
@ -125,7 +133,7 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
info1_width.saturating_sub(info.get(l).map_or(0, |(_, line, _)| line.len()))
+ padding3
),
color2 = match dotenvy::var("PF_COL2") {
color2 = if color_enabled {match dotenvy::var("PF_COL2") {
Ok(newcolor) => {
match Color::from_str(&newcolor) {
Ok(newcolor) => format!("{newcolor}"),
@ -133,18 +141,18 @@ fn pfetch(info: Vec<(Color, String, String)>, logo: Logo, logo_enabled: bool) {
}
},
Err(_) => "".to_string()
},
}} else {"".to_string()},
info2 = info.get(l).map_or("", |line| &line.2)
)
}
// if colors are disabled, remove them from string
if dotenvy::var("PF_COLOR").unwrap_or_default() == "0" {
pfetch_str = pfetch_str
.split("\x1b[")
.map(|chunk| chunk.chars().skip(3).collect::<String>())
.collect();
}
// if dotenvy::var("PF_COLOR").unwrap_or_default() == "0" {
// pfetch_str = pfetch_str
// .split("\x1b[")
// .map(|chunk| chunk.chars().skip(3).collect::<String>())
// .collect();
// }
// disable line wrap
crossterm::execute!(std::io::stdout(), crossterm::terminal::DisableLineWrap)

View File

@ -8,6 +8,7 @@ artix
bazzite
bedrock
buildroot
cachyos
celos
centos
crystallinux