From 58794067e8bcf6a954a0ddfa631a6705651d229b Mon Sep 17 00:00:00 2001 From: Daryl Ronningen Date: Mon, 1 Aug 2022 19:59:13 -0700 Subject: [PATCH] use neofetch fork --- .config/hyfetch.json | 1 + .config/neofetch/config.conf | 103 +++++++++++++++++++++-------------- .config/nvim | 2 +- .zshrc | 4 +- AUR | 2 +- picom.conf | 0 6 files changed, 68 insertions(+), 44 deletions(-) create mode 100644 .config/hyfetch.json delete mode 100644 picom.conf diff --git a/.config/hyfetch.json b/.config/hyfetch.json new file mode 100644 index 0000000..cf0ced3 --- /dev/null +++ b/.config/hyfetch.json @@ -0,0 +1 @@ +{"preset": "genderfluid", "mode": "rgb", "light_dark": "dark", "lightness": null, "color_align": {"mode": "horizontal", "custom_colors": [], "fore_back": null}} \ No newline at end of file diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 27aa607..71a87b4 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -21,12 +21,18 @@ print_info() { info "CPU" cpu info "GPU" gpu info "Memory" memory + info "Network" network + info "GPU Driver" gpu_driver # Linux/macOS only - info "CPU Usage" cpu_usage info "Disk" disk + # info "Battery" battery + # info "Power Adapter" power_adapter # macOS only info "Font" font info "Song" song [[ "$player" ]] && prin "Music Player" "$player" + info "Local IP" local_ip + # info "Public IP" public_ip + info "Users" users info "Locale" locale # This only works on glibc systems. info cols @@ -102,7 +108,7 @@ uptime_shorthand="off" # Memory -# Show memory pecentage in output. +# Show memory percentage in output. # # Default: 'off' # Values: 'on', 'off' @@ -351,6 +357,13 @@ public_ip_host="http://ident.me" # Flag: --ip_timeout public_ip_timeout=2 +# Local IP interface +# +# Default: 'auto' (interface of default route) +# Values: 'auto', 'en0', 'en1' +# Flag: --ip_interface +local_ip_interface=('auto') + # Desktop Environment @@ -449,8 +462,10 @@ disk_percent="on" # guayadeque # io.elementary.music # iTunes +# Music # juk # lollypop +# MellowPlayer # mocp # mopidy # mpd @@ -664,8 +679,7 @@ bar_color_total="distro" # # Default: 'off' # Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display +# Flags: --memory_display # --battery_display # --disk_display # @@ -674,7 +688,6 @@ bar_color_total="distro" # infobar: 'info [---=======]' # barinfo: '[---=======] info' # off: 'info' -cpu_display="off" memory_display="off" battery_display="off" disk_display="off" @@ -686,8 +699,10 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug', +# 'viu' + # Flag: --backend image_backend="ascii" @@ -715,42 +730,42 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, 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, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, -# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# NOTE: AIX, Asahi, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, +# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, +# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, +# Artix, Arya, Bedrock, BigLinux, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, +# Bodhi, bonsai, BSD, BunsenLabs, \"Cachy OS\", Calculate, CalinixOS, Carbs, CentOS, CenterOS, Chakra, ChaletOS, +# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, +# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, Elive, +# EndeavourOS, EncryptOS, Endless, EuroLinux, Exherbo, Fedora, Feren, Finnix, FreeBSD, +# FreeMiNT, Frugalware, Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, +# Glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra, +# HydroOS, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +# KSLinux, Kaisen_Linux, Kubuntu, LEDE, LangitKetujuh, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, +# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, +# Mer, Minix, MIRACLE_LINUX, Linspire, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +# Netrunner, Nitrux, NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD, +# openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, +# osmc, Oracle, Orchid, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +# TrueOS, PCLinuxOS, pearOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, +# Solus, Soda, Sulin, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, +# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-Kylin, Ubuntu Touch, Ubuntu-MATE, +# Ubuntu-Studio, Ubuntu-Sway, Ubuntu, Ultramarine, Univention, Uos, Venom, Void, yiffOS, VNux, semc, +# Obarun, wii-linux-ngx, whiite-linux, gc-linux, windows10, Windows7, Xubuntu, Zorin, 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. -# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, +# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, Ubuntu-Kylin # Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. -# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, -# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +# NOTE: "AOSC OS/Retro", Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, +# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, Orchid, android, +# Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, # Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, # Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, # postmarketOS, and Void have a smaller logo variant. @@ -823,6 +838,14 @@ crop_offset="center" # --size image_size="auto" +# Catimg block size. +# Control the resolution of catimg. +# +# Default: '2' +# Values: '1', '2' +# Flags: --catimg_size +catimg_size="2" + # Gap between image and text # # Default: '3' diff --git a/.config/nvim b/.config/nvim index 99dec78..8b5ec5d 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 99dec78f89b7ce447ee6566a001108a425f06494 +Subproject commit 8b5ec5d4f428e81b94c48d5bf35df4c9566f3c6a diff --git a/.zshrc b/.zshrc index 24732cd..2c491c8 100644 --- a/.zshrc +++ b/.zshrc @@ -46,7 +46,7 @@ alias tree="exa -laFghHUumRT@ --sort name --group-directories-first --git --icon alias rr="curl -s -L http://bit.ly/10hA8iC | bash" alias cat="bat" alias parrot="curl parrot.live" -alias neofetch="neofetch | lolcat" +alias neofetch="hyfetch" alias man="batman" alias gitdiff="batdiff" @@ -118,4 +118,4 @@ eval $(thefuck --alias) eval "$(starship init zsh)" # Neofetch cuz its cool -neofetch | lolcat +hyfetch diff --git a/AUR b/AUR index bd4ae63..0f052e8 160000 --- a/AUR +++ b/AUR @@ -1 +1 @@ -Subproject commit bd4ae637eb3901bd699ffcc19cc7888500791c66 +Subproject commit 0f052e8802830e6b01a3c49504f7757a4287c290 diff --git a/picom.conf b/picom.conf deleted file mode 100644 index e69de29..0000000