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

This commit is contained in:
Dylan Araps 2020-11-26 07:15:22 +02:00
commit 6dd85d67fc
1 changed files with 15 additions and 7 deletions

View File

@ -1569,9 +1569,13 @@ get_packages() {
} }
has nix-store && { has nix-store && {
manager=nix-system && tot nix-store -q --requisites /run/current-system/sw nix-user-pkgs() {
manager=nix-user && tot nix-store -q --requisites ~/.nix-profile nix-store -qR ~/.nix-profile
manager=nix-default && tot nix-store -q --requisites /nix/var/nix/profiles/default nix-store -qR /etc/profiles/per-user/"$USER"
}
manager=nix-system && tot nix-store -qR /run/current-system/sw
manager=nix-user && tot nix-user-pkgs
manager=nix-default && tot nix-store -qR /nix/var/nix/profiles/default
} }
# pkginfo is also the name of a python package manager which is painfully slow. # pkginfo is also the name of a python package manager which is painfully slow.
@ -1610,8 +1614,12 @@ get_packages() {
has pkgin && tot pkgin list has pkgin && tot pkgin list
has nix-store && { has nix-store && {
manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" nix-user-pkgs() {
manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" nix-store -qR ~/.nix-profile
nix-store -qR /etc/profiles/per-user/"$USER"
}
manager=nix-system && tot nix-store -qR /run/current-system/sw
manager=nix-user && tot nix-store -qR nix-user-pkgs
} }
;; ;;
@ -8562,7 +8570,7 @@ EOF
"NixOS"*) "NixOS"*)
set_colors 4 6 set_colors 4 6
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ▗██▙ ${c2}▜███▙ ▟██ ${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄
${c1} ▜███▙ ${c2}▜███▙ ▟███▛ ${c1} ▜███▙ ${c2}▜███▙ ▟███▛
${c1} ▜███▙ ${c2}▜███▙▟███▛ ${c1} ▜███▙ ${c2}▜███▙▟███▛
${c1} ▜███▙ ${c2}▜██████▛ ${c1} ▜███▙ ${c2}▜██████▛
@ -8581,7 +8589,7 @@ ${c2} ▜▛ ${c1}▟████▙ ${c2}▜█████████
${c1} ▟██████▙ ${c2}▜███▙ ${c1} ▟██████▙ ${c2}▜███▙
${c1} ▟███▛▜███▙ ${c2}▜███▙ ${c1} ▟███▛▜███▙ ${c2}▜███▙
${c1} ▟███▛ ▜███▙ ${c2}▜███▙ ${c1} ▟███▛ ▜███▙ ${c2}▜███▙
${c1} ▝██▛ ▜███▙ ${c2}▜██ ${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀
EOF EOF
;; ;;