Commit graph

2531 commits

Author SHA1 Message Date
Dylan Araps
5cede165cf WM Theme: Use double quotes 2016-11-02 15:56:00 +11:00
Dylan Araps
e8ab7ea88d Remove stray newline 2016-11-02 15:49:52 +11:00
Dylan Araps
2705f23248 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-11-02 14:41:57 +11:00
Dylan Araps
0c28f8c3f6 WM Theme: Don't print Mutter (Budgie) wm theme 2016-11-02 14:41:39 +11:00
Dylan Araps
a687096bc2 Merge pull request #411 from konimex/master
Various updates for Android/Termux
2016-11-02 13:29:29 +11:00
Herdiansyah
ebf5f6345a Android (Termux): Fixed ASCII not appearing 2016-11-02 08:21:15 +07:00
Dylan Araps
651d38c949 Theme: Misc fixes 2016-11-02 10:16:16 +11:00
Dylan Araps
1505ed5d68 Theme: [Budgie] Fix incorrect GTK Theme/Icons 2016-11-02 10:10:40 +11:00
Dylan Araps
013e9d6652 Termfont: [Linux] Fix whitespace issue 2016-11-02 09:52:46 +11:00
Dylan Araps
453a38d79f Images: Fix Division by 0 error. Closes #410 2016-11-02 09:44:25 +11:00
Dylan Araps
7b2dcea117 Termfont: [Termite] Fix incorrect font choses. Closes #409 2016-11-02 09:39:37 +11:00
Dylan Araps
462d4c594a prin: Fix bold not working, Add prin tests to travis 2016-11-02 00:54:52 +11:00
Dylan Araps
00f22df3c8 prin: Revert bold fix 2016-11-02 00:41:52 +11:00
Dylan Araps
6ada4c7fb8 prin: Fix bold not working, Fix color breakage. Closes #407 2016-11-02 00:37:54 +11:00
Dylan Araps
e0fff44cce Distro: [Linux] Fallback only print first line 2016-11-01 23:23:11 +11:00
Dylan Araps
dcdf6190c8 Distro: [Linux] Fix incorrect quoting 2016-11-01 23:09:21 +11:00
Dylan Araps
b1b6226189 Distro: [Linux] Fix fallbacks not working 2016-11-01 23:05:30 +11:00
Dylan Araps
29ccbb2a31 Remove stray line 2016-11-01 23:00:14 +11:00
Dylan Araps
d45002ca15 Distro: [Linux] Also look in /usr/lib/*ease 2016-11-01 22:47:27 +11:00
Dylan Araps
f8f50f6b1d Distro: [Linux] Source /etc/*ease files 2016-11-01 22:43:22 +11:00
Dylan Araps
a37a3eec31 Update docs 2016-11-01 17:57:08 +11:00
Dylan Araps
921f0975f1 General: Red Star OS fixes 2016-11-01 11:43:06 +11:00
Kim Myung-ki
85eef19406 레드 스타 OS에 대한 도움 탐지
친애하는 지도자 김정일의 위대한 후계자가 김정은이 프로그램 neofetch에
영광스러운 붉은 별의 검출을 추가 요구했다, 당신은 더 나은 자신의
명령을주의 나 기회가 될!

Signed-off-by: Korea Computer Center <admin@kcc.net.kp>
2016-10-31 23:22:51 +07:00
Muhammad Herdiansyah
c47d095a38 Expanded distro_shorthand to *BSDs 2016-10-31 20:47:32 +07:00
Dylan Araps
dcf51866ec Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-10-31 14:57:22 +11:00
Dylan Araps
194c7b500d Images: Use \033[14t before falling back to external programs 2016-10-31 14:57:04 +11:00
Muhammad Herdiansyah
2f46385cf0 GPU: Used FreeBSD's method for DragonFlyBSD and PacBSD 2016-10-30 23:40:52 +07:00
Dylan Araps
e408e6f8d7 Kernel: Remove kernel_shorthand tiny 2016-10-30 20:55:14 +11:00
Dylan Araps
c667fca505 Kernel: Hardcode kernel_shorthand=tiny on BSD systems 2016-10-30 17:40:43 +11:00
Dylan Araps
5959cb1b93 Image: If terminal size is less than or equal to 10 fallback to ascii mode 2016-10-30 14:20:01 +11:00
Dylan Araps
0be5f01291 Image: If terminal width is 0, fallback to ascii mode 2016-10-30 14:08:48 +11:00
Dylan Araps
0a2c9a5a6b Misc: Don't uppercase Terminal and WM output 2016-10-29 16:50:48 +11:00
Dylan Araps
ec0ed23d11 Term: Add a fallback to ps. 2016-10-29 16:02:24 +11:00
Dylan Araps
a06329db1b getterm: Use /proc/$PPID/comm instead of ps 2016-10-29 15:19:04 +11:00
Dylan Araps
7c327683a8 Kernel: Print kernel name by default 2016-10-29 14:33:36 +11:00
Dylan Araps
0871c362ef Windows 10 (bash): Fix battery 2 2016-10-29 11:47:00 +11:00
Dylan Araps
7735fb02a5 Windows 10 (bash): Fix battery usage 2016-10-29 11:41:50 +11:00
Dylan Araps
63198a2209 Uptime: Remove 'up' 2016-10-27 09:45:55 +11:00
Dylan Araps
51354b2235 Merge pull request #322 from dylanaraps/android2
Add Android support 2
2016-10-27 09:30:23 +11:00
Dylan Araps
b8502a8b44 Ascii: Fix colors on light terminals 2016-10-27 08:20:20 +11:00
Dylan Araps
e8e859b590 Merge master 2016-10-27 08:09:08 +11:00
Dylan Araps
785a22520b Merge pull request #398 from dylanaraps/gpu
GPU: [Linux] Rewrite GPU
2016-10-26 23:50:57 +11:00
Dylan Araps
64b8e02812 Fix 2016-10-26 23:50:54 +11:00
Dylan Araps
8cbf7e7feb Remove GPU shorthand 2016-10-26 23:41:17 +11:00
Dylan Araps
4e7955bc94 Cache GPU output 2016-10-26 23:22:08 +11:00
Dylan Araps
b2d17711f9 GPU: Add brand 2016-10-26 23:16:57 +11:00
Dylan Araps
0177837f69 GPU: Start rewrite 2016-10-26 22:48:20 +11:00
Dylan Araps
eee8ac7f8e Merge pull request #396 from dylanaraps/song
Song: Rewrite song function
2016-10-26 21:20:05 +11:00
Dylan Araps
6f41167eb5 Song: Fix iTunes 2 2016-10-26 21:18:46 +11:00
Dylan Araps
9889ba14cb Song: Fix iTunes 2016-10-26 21:04:58 +11:00
Dylan Araps
314c254794 Docs: misc 2016-10-26 18:24:37 +11:00
Dylan Araps
bf67d5be11 Docs: Remove battery options 2016-10-26 18:23:15 +11:00
Dylan Araps
43ac9dfcb2 Docs 2016-10-26 18:22:08 +11:00
Dylan Araps
0c41c285a7 Fix processes with paths in name' 2016-10-26 18:09:59 +11:00
Dylan Araps
b23ccd6709 Battery: [Linux] Rewrite battery 2016-10-26 17:56:50 +11:00
Dylan Araps
931660d31a Remove pointless if
"
2016-10-26 15:38:45 +11:00
Dylan Araps
efa55b28b0 Rewrite getsong 2016-10-26 15:18:11 +11:00
Dylan Araps
252d56ab49 Reduce sise of iOS GPU function 2016-10-26 11:29:46 +11:00
Dylan Araps
fa312af1ee Misc fixes/changes 2016-10-26 11:18:37 +11:00
Dylan Araps
cc9095ccd5 Refactor GPU 2016-10-25 10:39:56 +11:00
Dylan Araps
ab1de702f9 Distro: Simplify shorthand for lsb_release 2016-10-25 10:30:41 +11:00
Dylan Araps
192014ca9f Model: Remove useless use of cat 2016-10-25 10:25:10 +11:00
Muhammad Herdiansyah
e92e691751 SUSE: Changed ASCII behavior
In SUSE's `lsb_release`, they have different behavior for `-ir` and
`-d`, one output will be `openSUSE Leap 42.1` and the other will be
`SUSE LINUX 42.1`. This new behavior would also extend compatibility
with SUSE Linux Enterprise.
2016-10-24 22:09:57 +07:00
Dylan Araps
c869e81e3b Fix w3m-img being used even when images were off 2016-10-24 08:53:54 +11:00
Muhammad Herdiansyah
24e7216777 Solaris: Strip out crap from getdistro output 2016-10-23 18:51:12 +07:00
Muhammad Herdiansyah
d39bebb2a4 Solaris: Unified package detection with Linux
Some OpenSolaris/illumos-based distribution used various Linux package
managers such as dpkg, rpm, and portage (see more at
http://wiki.illumos.org/display/illumos/Distributions). It would make
sense for Solaris' case to be unified with Linux.

However, Linux's `pkg` detection (I don't know which distro is that) are
vastly different from Oracle Solaris/OpenIndiana's `pkg`, so a
workaround is used.
2016-10-23 18:51:04 +07:00
Dylan Araps
09a4ac132e Simplify cursor positioning 2016-10-23 14:08:45 +11:00
Dylan Araps
d09cf58790 Cursor Position: Fix issues when using URxvt+Padding 2016-10-23 13:47:49 +11:00
Dylan Araps
5dddaa0b26 GPU: Remove duplicate substitutions 2016-10-23 11:22:17 +11:00
Dylan Araps
f4b266b5c6 CPU Speed: Don't use read 2016-10-23 11:13:40 +11:00
Dylan Araps
49cdb2f95c Linux: Correctly calculate memory usage 2016-10-23 11:03:46 +11:00
Dylan Araps
664556d137 Test mode: Show CPU temp 2016-10-23 09:51:16 +11:00
Dylan Araps
3ef6aeea42 Linux: Add CPU temperature 2016-10-23 09:45:03 +11:00
Dylan Araps
6457b3276f Windows: Print DE 2016-10-23 09:07:04 +11:00
Dylan Araps
a59cf169e4 Cmus: Fix broken output, closes #389 2016-10-22 23:14:54 +11:00
Dylan Araps
fe8e15d5d6 Simplify cursor position 2016-10-22 20:25:41 +11:00
Dylan Araps
17d17f4480 Theme: Fix gtk2/3 comparison when whitespace is involved 2016-10-22 19:59:25 +11:00
Dylan Araps
919da27716 Added support for Porteus, closes #388 2016-10-22 15:19:56 +11:00
Dylan Araps
0fb2b661ba Song: Add support for Audacious. @ncmprhnsbl 2016-10-22 15:11:52 +11:00
Dylan Araps
92595e8bc6 Fix cursor artifacts in termux 2016-10-22 10:20:14 +11:00
Dylan Araps
ad3a90219a Fix cursor artifcats in termux 2016-10-22 10:18:38 +11:00
Dylan Araps
fd957835b7 Merge branch 'master' into android2 2016-10-22 10:16:10 +11:00
Dylan Araps
79392d75a9 Sigh 2016-10-22 10:15:47 +11:00
Dylan Araps
d1ef3ab4e8 Merge branch 'master' into android2 2016-10-22 10:11:38 +11:00
Dylan Araps
ad2b18ef07 Count line breaks when calculating cursor position 2016-10-22 10:11:18 +11:00
Dylan Araps
8bc6b2d183 Merge branch 'master' into android2 2016-10-22 09:52:26 +11:00
Dylan Araps
50f87a4233 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:51:58 +11:00
Dylan Araps
0b5d25d9b5 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:49:59 +11:00
Dylan Araps
bb01418dca Merge master 2016-10-22 01:39:31 +11:00
Dylan Araps
a34d64b43b Revert color blocks change as it caused issues in tty 2016-10-22 01:35:28 +11:00
Dylan Araps
bcb51ee7aa Add more deprecated flags to checkoldflags() 2016-10-22 01:27:39 +11:00
Dylan Araps
60beb88def w3m-img: Add -bg support 2016-10-22 01:14:02 +11:00
Dylan Araps
b12e5b1f56 Fix yoffset bug 2016-10-22 01:05:47 +11:00
Dylan Araps
a564b19aeb Fix cursor bugs and use yoffset in calculations 2016-10-22 00:42:34 +11:00
Dylan Araps
76f7b4025e w3m-img: Draw the image twice 2016-10-22 00:06:51 +11:00
Dylan Araps
5270e97943 Merge branch 'master' into img 2016-10-22 00:03:05 +11:00
Dylan Araps
d9e15e3597 Merge pull request #380 from dylanaraps/uptime-fix
Rewrite uptime for Linux/Windows/Solaris to match macOS/BSD
2016-10-21 23:45:25 +11:00
Dylan Araps
6c50efa75b term: Don't print output of busybox ps 2016-10-21 21:48:17 +11:00
Dylan Araps
4619eba654 Don't do any dynamic prompt stuff in image off mode 2016-10-21 21:45:32 +11:00
Dylan Araps
6a37a9bb11 Merge pull request #381 from dylanaraps/cores
Add option to hide/show hyperthreaded cpu cores.
2016-10-21 21:35:00 +11:00
Dylan Araps
c804f7835e Image mode: Add support for terminal emulators that don't support \033[14t 2016-10-21 21:25:43 +11:00
Muhammad Herdiansyah
e4c7f1926a Solaris: Rewritten uptime
Solaris' uptime will now show the second mark only so we don't have 2
case instances.
2016-10-21 16:29:31 +07:00
Dylan Araps
3123548c18 Update docs 2016-10-21 20:29:16 +11:00
Dylan Araps
9882165617 Add support for Solaris 2016-10-21 20:27:35 +11:00
Dylan Araps
7b62b8091c revert old logo 2016-10-21 19:01:25 +11:00
Dylan Araps
edb6920df9 New android logo 2016-10-21 18:54:37 +11:00
Dylan Araps
5f4e9e5d8e merge master 2016-10-21 18:42:25 +11:00
Dylan Araps
e11d40cd00 solaris: Fix term 2016-10-21 18:37:59 +11:00
Dylan Araps
ad47e456e3 Fix term on solaris 2016-10-21 18:36:32 +11:00
Dylan Araps
5a96327fa3 Only use zero width space in image mode 2016-10-21 18:35:17 +11:00
Dylan Araps
6e47608bc5 Don't do any dynamic prompt stuff in image off mode 2016-10-21 18:09:25 +11:00
Dylan Araps
b13da1d999 Fix C locale padding issues 2016-10-21 18:02:04 +11:00
Dylan Araps
7bdf5f1168 Fix bug with block chars 2016-10-21 17:19:03 +11:00
Dylan Araps
93abca7185 Make note about support 2016-10-21 16:54:05 +11:00
Dylan Araps
bd44f1ea12 Fix grammar error 2016-10-21 16:40:58 +11:00
Dylan Araps
66100fc351 Use cpu_cores 2016-10-21 16:38:02 +11:00
Dylan Araps
dc32c0b71c Add option to hide/show hypertheaded cpu cores 2016-10-21 16:26:34 +11:00
Dylan Araps
1a8734bf46 macOS: Show hyperthreaded cores 2016-10-21 15:16:02 +11:00
Dylan Araps
e5359dc314 Fix terminal output on android 2016-10-21 14:45:36 +11:00
Dylan Araps
99d43ff257 Add seconds when uptime is below 1 min 2016-10-21 10:37:40 +11:00
Dylan Araps
c2e6f6534d Fix errors on large uptimes 2016-10-21 10:20:28 +11:00
Dylan Araps
fb7b3c146e Rewrite uptime 2016-10-21 10:00:09 +11:00
Dylan Araps
7862e3af5a Fix bugs 2016-10-21 09:15:03 +11:00
Dylan Araps
7a661b3966 Fix bugs 2016-10-20 17:32:29 +11:00
Dylan Araps
0e87355eb0 merge master 2016-10-19 20:54:30 +11:00
Dylan Araps
d1b2b2828f Remove path from terminal name 2016-10-18 08:23:03 +11:00
Dylan Araps
805b7d2e84 Fix bug 2016-10-17 23:59:54 +11:00
Dylan Araps
2abdbfc2bc Condense osx_version 2016-10-17 23:48:30 +11:00
Dylan Araps
03e6e8c992 Fix 2016-10-17 19:55:41 +11:00
Dylan Araps
20de28779d Fix 2016-10-17 19:52:31 +11:00
Dylan Araps
a76bd6b913 Fix 2016-10-17 19:51:00 +11:00
Dylan Araps
2a4f82a317 Show bbLean instead of Blackbox 2016-10-17 19:47:48 +11:00
Dylan Araps
14bba15f9a Show explorer theme for other Wms/Shells 2016-10-17 19:22:15 +11:00
Dylan Araps
1799ad84b8 Fix path errors 2016-10-17 19:15:42 +11:00
Dylan Araps
1136ca820c Fix path errors 2016-10-17 19:14:19 +11:00
Dylan Araps
3ab1b9326b wmtheme: Add support for Blackbox 2016-10-17 19:02:53 +11:00
Dylan Araps
2d9dbaa4bb Merge pull request #373 from dylanaraps/winwm
wm: Add support for Windows WMs and Shells
2016-10-17 18:45:07 +11:00
Dylan Araps
4be66e94bd wm: Add support for Windows WMs and Shells 2016-10-17 18:39:56 +11:00
Andrew Titmuss
21144eb973
fix iTunes automatically opening 2016-10-17 16:53:30 +11:00
Dylan Araps
71ece3de5b Fix disk output on MacOS 2016-10-17 08:07:04 +11:00
Dylan Araps
48819dc592 Fix glitched line endings on long lines 2016-10-17 00:07:30 +11:00
coypoop
04685755c1 physmem is 32bit on netbsd, physmem64 for 64bit 2016-10-16 09:01:16 +03:00
Muhammad Herdiansyah
294b5f34e7 Added support for Bitrig 2016-10-16 09:50:22 +07:00
Dylan Araps
f275d53fa6 Fix broken block_width 2016-10-16 10:44:05 +11:00
Dylan Araps
a9f74d9d01 Add support for Sparky Linux 2016-10-16 09:38:56 +11:00
Andrew Titmuss
2010d11328
shorten if statement for retina check 2016-10-16 00:45:27 +11:00
Andrew Titmuss
52e0884250
remove test from if statement 2016-10-16 00:43:20 +11:00
Andrew Titmuss
6f004a244f
macOS: add @2x label for retina resolutions 2016-10-16 00:39:07 +11:00
Dylan Araps
084541fe34 Merge pull request #364 from iandrewt/hyperthreading-fix
fix macOS to show physical cores
2016-10-15 23:56:41 +11:00
Andrew Titmuss
85d1c31dce
change all references to Mac OS X to macOS 2016-10-15 23:20:25 +11:00
Andrew Titmuss
50a2bdcc95
fix macOS to show physical cores 2016-10-15 22:57:45 +11:00
Dylan Araps
5e167e4c02 Uppercase without function 2016-10-15 22:07:12 +11:00
Dylan Araps
30d808c52d Fix function in bash 3 2016-10-15 22:01:15 +11:00
Dylan Araps
a8ccdf6a65 Uppercase first letter of info 2016-10-15 21:45:19 +11:00
Muhammad Herdiansyah
710fd49887 Added function to check if old flags is still present on configs 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah
fe6588d8b6 Expanded distro_shorthand to Solaris 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah
ed41c15c6a Expanded distro_shorthand to Mac OS X 2016-10-15 13:19:49 +07:00
Dylan Araps
cce254d338 Fix incorrect font name on XFCE 2016-10-13 23:47:35 +11:00
Dylan Araps
3e9c3d648c Fixed rendering issues with URxvt and XFT fonts, thanks Konimex 2016-10-12 21:19:40 +11:00
Dylan Araps
ee3630af40 Fix image off prompt location 2016-10-12 17:55:51 +11:00
Muhammad Herdiansyah
b7256fb48a Removed "Windows" from os_arch description.
To preserve accuracy, os_arch's description will be changed accordingly
so there will be no notion that os_arch is Windows' exclusive.
2016-10-07 17:44:39 +07:00
Muhammad Herdiansyah
aa7e185d17 Solaris: Better awk without gsub 2016-10-05 22:06:54 +07:00
Dylan Araps
e86ce55822 GPU: Cleanup substitutions 2016-10-05 09:29:54 +11:00
Dylan Araps
abf9b5d257 Fix incorrect cursor position when using small ascii art 2016-10-05 08:15:20 +11:00
Dylan Araps
7f5f05b441 Remove stray line 2016-10-04 21:30:03 +11:00
Dylan Araps
934b08b6f8 Re-add w3m-img line wrap fix 2016-10-04 21:29:06 +11:00
Dylan Araps
be2d486c41 Fix broken progress bars 2016-10-04 09:43:51 +11:00
Dylan Araps
8ea306652d Fix issues with single args 2016-10-04 08:48:33 +11:00
Dylan Araps
06281daed8 Fix merge conflicts 2016-10-04 08:39:00 +11:00
Dylan Araps
dfb8a94303 Finish documentation for scrot upload 2016-10-04 08:26:31 +11:00
Dylan Araps
e9a08a074d Merge pull request #349 from dylanaraps/img-fix
Add a tiny sleep to fix image flashing and not drawing properly
2016-10-04 07:55:18 +11:00
Dylan Araps
31ae13d296 Merge pull request #350 from dylanaraps/logo-mode
Logo mode - Only print ascii art.
2016-10-03 21:51:56 +11:00
Dylan Araps
598056b4a1 Logo mode documentation 2016-10-03 21:51:42 +11:00
Dylan Araps
9a0aa9938a Fix weird prompt issues 2016-10-03 21:47:29 +11:00
Dylan Araps
83fd93e4fb Add new mode which only prints the ascii art 2016-10-03 20:53:08 +11:00
Dylan Araps
8a1eb28987 Add --image_size as an alias to --size 2016-10-03 18:13:16 +11:00
Dylan Araps
b33cf57c16 Remove useless block 2016-10-03 18:11:00 +11:00
Dylan Araps
83acc08ae1 Add comment explaining fix 2016-10-03 18:08:47 +11:00
Dylan Araps
a3e65eb120 Add a tiny sleep to fix image flashing and not drawing properly 2016-10-03 17:59:56 +11:00
Dylan Araps
22ae5a5bba Term: better handling of tmux 2016-10-03 17:20:20 +11:00
Dylan Araps
e31e9a400e Term Font (Termite): Ignore comments 2016-10-03 17:09:01 +11:00
Dylan Araps
830cf0ec3b Wallpaper: Replace %20 with space 2016-10-03 10:03:41 +11:00
Dylan Araps
cc520e42b6 Move scrot args to a separate function 2016-10-02 23:58:08 +11:00
Dylan Araps
3eebc07f2a better arg handling 2016-10-02 23:51:59 +11:00
Dylan Araps
d656639728 Fix quotes 2016-10-02 23:46:22 +11:00
Dylan Araps
83dcdb42f4 Add args to --upload and --su 2016-10-02 22:49:30 +11:00
Dylan Araps
c08fc74607 Add error handling 2016-10-02 22:46:51 +11:00
Dylan Araps
64693058a7 Check that curl is installed before attempting to upload anything 2016-10-02 22:03:17 +11:00
Dylan Araps
fb3cd92b96 Added support for imgur using my own api key 2016-10-02 21:57:52 +11:00
Dylan Araps
194d37df09 Fix missing battery bug 2016-10-02 20:45:56 +11:00
Dylan Araps
4bd83edf8f Added flag for image host 2016-10-02 20:28:35 +11:00
Dylan Araps
94cbd6bb02 Added working teknik support and new flags 2016-10-02 20:23:02 +11:00
Dylan Araps
269e903e64 Fix teknik 2016-10-02 19:51:44 +11:00
Dylan Araps
20490a53e3 Fix GNOME showing wrong wm theme 2016-10-02 19:30:56 +11:00
Dylan Araps
56997e6bc3 initial support 2016-10-02 19:29:13 +11:00
Dylan Araps
9b411604e0 DE: Add cinnamon version 2016-10-02 18:51:34 +11:00
Dylan Araps
46b4920a9c Remove stray newline 2016-10-02 18:29:42 +11:00
Dylan Araps
26fe57d376 Add gpu_brand to enable/disable gpu brand in output 2016-10-02 18:26:50 +11:00
Dylan Araps
b60f281119 Update version 2016-10-02 14:17:51 +11:00
Dylan Araps
dcceeb7a13 Merge pull request #339 from dylanaraps/promptfix
Don't clear the screen in 'Ascii' and 'No Image' modes. Fixes #335
2016-10-02 13:43:26 +11:00
Muhammad Herdiansyah
461c826b70 Fixed various indentation 2016-10-02 09:12:48 +07:00
Dylan Araps
75a7d2c1b4 swap case for ifs 2016-10-02 12:23:12 +11:00
Dylan Araps
6ede242b1c Fix blank model output on Windows 2016-10-02 12:01:22 +11:00
Dylan Araps
e590ddc10f Fix blank oem info on Windows 2016-10-02 11:58:28 +11:00
Dylan Araps
d77bbd9619 Fix empty cpu speed on windows 2016-10-02 11:40:00 +11:00
Dylan Araps
515f5e0fe6 Fix ascii color 2016-10-02 11:33:31 +11:00
Dylan Araps
be9fadf7c4 Fix ascii colors on Windows 10 2016-10-02 11:27:24 +11:00
Dylan Araps
8f822c9366 Merge pull request #334 from konimex/subsystem
Initial support for Windows 10 Linux subsystem
2016-10-02 10:19:36 +11:00
undrskr
59a7120196 Change the ascii colors for Solus 2016-10-01 18:16:10 +03:00
Muhammad Herdiansyah
3dff1947b5 Initial support for Windows 10 Linux subsystem 2016-10-01 18:00:32 +07:00
Dylan Araps
070843d2bf Clear screen later 2016-10-01 12:57:54 +10:00
Dylan Araps
2b7ff346db Fix garbage in prompt 2016-10-01 12:55:31 +10:00
Dylan Araps
b112ac9715 Cleanup 2016-10-01 12:33:30 +10:00
Dylan Araps
70fa77b64b Faster math 2016-10-01 12:30:59 +10:00
Dylan Araps
402abf90a8 Remove cursor pos line 2016-10-01 12:28:21 +10:00
Dylan Araps
823cce5893 Add comments 2016-10-01 11:42:18 +10:00
Dylan Araps
c4e881c9f1 No longer clear screen 2016-10-01 11:35:23 +10:00
Dylan Araps
580b5fd3f0 Neofetch no longer clears the screen in ascii/off modes 2016-10-01 11:12:29 +10:00
Dylan Araps
8f9b320e99 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-10-01 10:50:12 +10:00
Dylan Araps
534ffd671c Fix typo 2016-10-01 10:49:56 +10:00
Dylan Araps
79b8ad83bc Fix #336 2016-10-01 10:35:52 +10:00
Muhammad Herdiansyah
42048570d4 Added support for deadbeef 2016-09-11 23:37:23 +07:00
Muhammad Herdiansyah
7a7e7aeb1f Added support for Amarok 2016-09-07 23:33:05 +07:00
Muhammad Herdiansyah
fb4638f1af Added support for Banshee Music Player 2016-09-07 22:10:13 +07:00
Muhammad Herdiansyah
8c459ba781 Added support for Rhythmbox Music Player 2016-09-07 22:07:51 +07:00
Muhammad Herdiansyah
f45951a147 Fixed percent not displaying in cpu_display 2016-09-03 14:46:59 +07:00
Dylan Araps
d1bab99b00 Merge pull request #327 from konimex/distro_shorthand
Expanded distro_shorthand to support non-LSB solutions
2016-09-03 02:17:42 +10:00
Muhammad Herdiansyah
e51f6cf836 OpenBSD's battery status get back into the BSD case
Maybe the original commiter forgot the * so s/he decided to get OpenBSD's
case nest into the `$os` instead of `$distro`.

I suspect the original reason that because OpenBSD's `$distro` output
is `OpenBSD $(uname -m)` instead of just `OpenBSD` so the results didn't
appear.

Anyway, for consistency, I decided to bring OpenBSD's battery case back
to the `$distro` case, add a very little fix (which is the *) and the
problem should be fixed.
2016-09-02 21:12:02 +07:00
Muhammad Herdiansyah
e2af2772fe Expanded distro_shorthand to support non-LSB solutions 2016-09-01 20:28:57 +07:00
Muhammad Herdiansyah
444c860e61 Fixed Android uptime 2016-08-30 23:13:59 +07:00
Dylan Araps
0a56836343 Merge pull request #323 from konimex/lsb
Added distro_shorthand to simplify lsb_release output
2016-08-30 19:53:26 +10:00
Muhammad Herdiansyah
7372e56d50 Added distro_shorthand to simplify lsb_release output 2016-08-30 11:18:30 +07:00
Muhammad Herdiansyah
b3dcfe820c Changed case 2016-08-30 07:26:13 +07:00
Muhammad Herdiansyah
c0b53c0606 Added distro detection 2016-08-29 21:36:57 +07:00
Muhammad Herdiansyah
7889c093b2 Added and changed some Android commands
Included:
- Added model support for Android
- Changed CPU command to use native Android ones
2016-08-29 21:20:46 +07:00
Dylan Araps
26de54e555 Fix new issues 2016-08-29 14:22:10 +10:00
Dylan Araps
0a2fa2b558 Better uptime command that will work accross uptime versions 2016-08-28 12:03:23 +10:00
Dylan Araps
bd7ebdfe4b Fix CPU name on android 2016-08-28 11:47:56 +10:00
Dylan Araps
76cc33f95f Fix padding on android 2016-08-28 11:41:27 +10:00
Dylan Araps
5444ecdf6d Fix padding on Android 2016-08-28 10:49:35 +10:00
Dylan Araps
12ba2f925a Add previous PR 2016-08-28 09:03:40 +10:00
Dylan Araps
71f0575b2b Add ascii art and distro detection 2016-08-28 08:59:11 +10:00
Muhammad Herdiansyah
06a3f809cc Added support for GuixSD 2016-08-27 15:42:56 +07:00
Dylan Araps
f7353a6b64 Model: Add checks for more files 2016-08-27 08:48:43 +10:00
Dylan Araps
198fa7bcd9 Merge pull request #310 from dylanaraps/model2
Add new `model` function to print device model name
2016-08-26 22:16:12 +10:00
Dylan Araps
e3c5bbd8a2 Fix disk on OS X and FreeBSD 2016-08-26 13:03:22 +10:00
Dylan Araps
f5bd9a7841 test 2016-08-26 12:28:33 +10:00
Dylan Araps
93715fb4a9 Simplify cpu core 2016-08-26 12:21:32 +10:00
Dylan Araps
5e32fc6461 Openwrt count packages 2016-08-26 12:17:58 +10:00
Dylan Araps
8250f5052a Fix disk usage and user 2016-08-26 12:07:26 +10:00
Dylan Araps
d41d805f1a read: Use -s flag instead of stty 2016-08-26 11:27:58 +10:00
Dylan Araps
db8aebd216 Swap stty for -s 2016-08-26 11:22:54 +10:00
Dylan Araps
e53e82c9c4 Supress prompt erors 2016-08-26 11:15:27 +10:00
Dylan Araps
2dea28ea2a Fix awk bug on openwrt 2016-08-26 11:10:55 +10:00
Dylan Araps
ad53cc8bfc OpenWRT uptime 2016-08-26 10:19:05 +10:00
Dylan Araps
377b5a048d Fix distro on openwrt 2016-08-25 22:26:22 +10:00
Dylan Araps
c1a867ad22 getcpu: Remove prin usage 2016-08-19 23:05:39 +10:00
Dylan Araps
4420a2cb38 Remove stdout mode 2016-08-19 23:01:18 +10:00
Dylan Araps
595c14a2e4 Fix merge conflicts 2016-08-19 22:47:46 +10:00
Dylan Araps
065b0d21a0 Model (Linux): Use cat to fix issues 2016-08-19 11:25:17 +10:00
Dylan Araps
4b4b0437d9 Also include product name 2016-08-19 11:15:13 +10:00
Dylan Araps
26af24dcc6 Merge branch 'model2' of https://github.com/dylanaraps/neofetch into model2 2016-08-19 10:39:57 +10:00
Dylan Araps
a96420e067 Model: Add BSD support 2016-08-19 10:39:12 +10:00
Dylan Araps
81577799c7 Use stty instead of tput 2016-08-19 10:29:27 +10:00
Dylan Araps
f4e96993d5 Move functions around 2016-08-19 10:09:35 +10:00
Dylan Araps
e254274c24 Cleanup 2016-08-19 10:07:24 +10:00
Dylan Araps
e25a48e1f8 Check OS earlier in the script 2016-08-19 10:05:45 +10:00
Dylan Araps
fa8a1e82ec Cleanup 2016-08-19 10:03:33 +10:00
Dylan Araps
b2ea12d77e Added support for Rosa 2016-08-18 08:10:50 +10:00
Dylan Araps
00215fcbd1 Added OpenWrt ascii art 2016-08-17 10:08:25 +10:00
Muhammad Herdiansyah
346bff1c52 Added Solaris support for model 2016-08-14 17:41:09 +07:00
Dylan Araps
3461b2a029 Model: Added Windows support 2016-08-14 15:23:19 +10:00
Andrew Titmuss
27ebe9a6a7
fixed macOS codename function 2016-08-14 14:33:36 +10:00
Dylan Araps
f805623171 Add model to travis test mode 2016-08-14 14:16:25 +10:00
Andrew Titmuss
53d2cf6661
made PR two lines shorter :) 2016-08-14 14:09:28 +10:00
Andrew Titmuss
8d2db93545
added macOS support for model name 2016-08-14 14:01:31 +10:00
Dylan Araps
6b9abdb9d6 Add new model function to print device model name 2016-08-14 13:26:30 +10:00
Dylan Araps
7500bfc757 Remove travis readonly vars 2016-08-14 13:14:18 +10:00
Dylan Araps
ba569f78cd Fix config issues 2016-08-14 13:13:21 +10:00
Dylan Araps
e0ac5c14c8 Fix broken color blocks on iOS 2016-08-14 11:04:25 +10:00
Dylan Araps
1686dd141b Fix quotes in subtitles on iOS 2016-08-14 10:55:01 +10:00
Dylan Araps
ba7ed6280b Fix terminal emulator on iOS over ssh 2016-08-14 10:41:42 +10:00
Dylan Araps
f388c222c5 Remove whitespace 2016-08-13 21:39:36 +10:00
Dylan Araps
66749c58ab Move OS detection to a function and cleanup comments 2016-08-13 21:28:23 +10:00
Dylan Araps
256205aaea Move some blocks to separate functions 2016-08-13 19:42:31 +10:00
Dylan Araps
793bcbcc7d Simplify ascii distro auto 2016-08-13 19:28:21 +10:00
Dylan Araps
ada00c9bb9 Combine escape sequences 2016-08-13 18:39:06 +10:00
Dylan Araps
7ea4aa2e82 Simplify CPU commands 2016-08-12 23:46:46 +10:00
Dylan Araps
bcec8c65da Consistent function brackets 2016-08-12 20:53:04 +10:00
Dylan Araps
7a774dd48d Move the commands near the bottom of the script to a function called main 2016-08-12 20:36:48 +10:00
Dylan Araps
2511511174 Remove stray comment 2016-08-12 17:08:22 +10:00
Dylan Araps
cb9e7fac4c Move comment 2016-08-12 17:05:14 +10:00
Dylan Araps
d8a1165694 Add missing ascii_distro config option 2016-08-12 16:52:51 +10:00
Dylan Araps
56325786d2 Simplify err 2016-08-12 16:45:36 +10:00
Dylan Araps
9a31740184 Simplify default config 2016-08-12 11:38:32 +10:00
Dylan Araps
1b336f912e Added verbose messages for confog sourcing 2016-08-12 11:25:59 +10:00
Dylan Araps
7480d5c30d Source default config before we source User config 2016-08-12 11:20:32 +10:00
Dylan Araps
216c18cd03 Stop progress bars from being overidden 2016-08-12 10:48:10 +10:00
Dylan Araps
a9829cf1e5 Fix missing progress bars travis 2016-08-12 10:41:52 +10:00
Dylan Araps
800870f21b More travis fixes 2016-08-12 10:33:21 +10:00
Dylan Araps
602629b7dd Travis use verbose mode 2016-08-12 10:06:53 +10:00
Dylan Araps
2c9c741329 -v: Show where we sourced the default config from 2016-08-12 09:55:35 +10:00
Dylan Araps
b22f6fc44c Source the default config file 2016-08-12 09:47:09 +10:00
Dylan Araps
2c6d048b1c Swap ascii colors around 2016-08-12 09:26:59 +10:00
Muhammad Herdiansyah
52b3f02ea3 Updates on ASCII logos and colors
Included:
* Added Oracle logo (and color)
* Small color tweak on OpenIndiana's logo (and colors)
2016-08-12 00:25:22 +07:00
Dylan Araps
517eef2db6 PacBSD: Add color and fix padding issue 2016-08-11 22:11:16 +10:00
Dylan Araps
d9fbadb009 Merge pull request #304 from vendion/master
Adding PacBSD support to neofetch
2016-08-11 22:04:01 +10:00
Adam Jimerson
f310d757d4 Switch from if -> case for BSD package counts
Signed-off-by: Adam Jimerson <vendion@gmail.com>
2016-08-11 06:48:34 -04:00
Dylan Araps
fd2ab61e2e Merge pull request #303 from konimex/solaris
Added Solaris support
2016-08-07 21:51:42 +10:00
Muhammad Herdiansyah
2e64ff37cd Added Solaris support 2016-08-07 18:42:56 +07:00
Adam Jimerson
01ce345c33 Adding PacBSD support to neofetch
Signed-off-by: Adam Jimerson <vendion@gmail.com>
2016-08-05 16:01:48 -04:00
Dylan Araps
6d3bf930c9 Simplify Tavis ascii 2016-08-05 10:37:13 +10:00
Dylan Araps
bb995a21c2 Only 1 newline below cols 2016-08-04 10:25:49 +10:00
Dylan Araps
edf6ba0e60 Merge pull request #299 from dylanaraps/prompt
Fix prompt location issues in image mode
2016-08-04 09:30:34 +10:00
Dylan Araps
c34759b2da Merge pull request #298 from dylanaraps/ascii
Custom ascii art: Use same format as distro ascii
2016-08-04 09:30:22 +10:00
Dylan Araps
2b41dafe66 Fix issues with prompt location calculation in image mode 2016-08-04 09:20:42 +10:00
Dylan Araps
62e52dd2f6 Eval colors in custom ascii files 2016-08-04 08:34:52 +10:00
Dylan Araps
68f6524a57 Keep old format behaviour 2016-08-02 23:50:05 +10:00
Dylan Araps
59147b9974 Enfore max line length in 'prin' 2016-08-02 23:44:10 +10:00
Dylan Araps
91b9fae44d Remove checks for $line_wrap 2016-08-02 23:21:49 +10:00
Dylan Araps
a39592cdc5 Line wrap changes 2016-08-02 23:11:00 +10:00
Dylan Araps
d21285c75b CPU Cores (iOS): Fixed backslashes in output 2016-07-29 21:35:32 +10:00
Dylan Araps
3c29c41b55 Add support for GalliumOS 2016-06-27 10:19:52 +10:00
Dylan Araps
1e486850d8 Shorten refresh rate output 2016-06-25 10:56:23 +10:00
Dylan Araps
08223e8a5d Merge branch 'xrandr' of https://github.com/dylanaraps/neofetch 2016-06-25 10:53:59 +10:00
Dylan Araps
95706b101d Fix awk typo 2016-06-24 11:48:18 +10:00
Dylan Araps
c8439c4bf9 Fix xrandr output on systems not using gawk 2016-06-24 11:44:22 +10:00
Vincent Aranega
e2b14b26ad Fix potential errors from a missing escaped char in regex 2016-06-16 16:11:00 +02:00
Vincent Aranega
f5a9393d4b Enhanced font detection for terminology
As 'grep -B' is a GNU extension, a more portable solution is preferable. The most direct and simple solution would be using 'awk':

    awk '/^font.name$/{print a}{a=$0}'

But a sed solution could also be applied:

    sed -n '/^font\.name$/{g;1!p;};h'
2016-06-16 15:39:30 +02:00
Vincent Aranega
90c46651d6 Add terminal font detection support for terminology
Support for terminology font name detection is based on the terminology config file. This file is always located here: `~/.config/terminology/config/standard/base.cfg` (30cb65625b/src/bin/config.c (L216)) and is in a data/binary format. The only way I found (beside coding a dedicated extractor) is to use `strings`. The font name seems to be placed right before the `font.name` string.

    strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1

Here are results that could be output:

    $ strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1
    6x13.pcf
    --> (for a bitmap font) and with another font selected
    $ strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1
    Inconsolata:style=Regular

These results are easily "parseable" in order to extract the font name for display.
2016-06-16 12:14:05 +02:00
Dylan Araps
65c2854caf Make --image off behave like other modes 2016-06-16 17:19:00 +10:00
Dylan Araps
c13c17888e Fix #289 2016-06-16 17:09:24 +10:00
Dylan Araps
5f2f1aaeae Merge pull request #287 from iandrewt/refresh_osx-2
improved refresh_rate fix, now actually works on OS X...
2016-06-15 21:24:51 +10:00
Andrew Titmuss
df1e73a6b0
better way that works in multi monitor setups 2016-06-15 21:02:33 +10:00
Andrew Titmuss
cd51987f17
improved refresh_rate fix, now actually works on OS X... 2016-06-15 20:18:57 +10:00
Dylan Araps
9e49e31bba Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-06-14 17:10:14 +10:00
Andrew Titmuss
f61dde03b0
missed the other brackets... 2016-06-14 17:07:35 +10:00
Andrew Titmuss
47a850a305
changed double bracket 2016-06-14 17:04:22 +10:00
Dylan Araps
517bde1ce3 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-06-14 17:02:29 +10:00
Dylan Araps
50ff116b64 Remove regex matching from disk usage 2016-06-14 17:02:14 +10:00
Andrew Titmuss
1d6f99b0d4
better test for 0Hz 2016-06-14 17:01:04 +10:00
Andrew Titmuss
3d52a73e3a
fixed refresh rate on OS X 2016-06-14 11:46:41 +10:00
Andrew Titmuss
9eea0ac869 Add support for macOS Sierra 2016-06-14 08:08:09 +10:00
Dylan Araps
5e0c15a352 Merge pull request #281 from dylanaraps/usage
Fix CPU Usage
2016-06-13 22:37:47 +10:00
Dylan Araps
9f28c025bb Condense awk command 2016-06-13 22:33:34 +10:00
Dylan Araps
758f883eb9 Update comments 2016-06-13 22:22:59 +10:00
Dylan Araps
e54ebf8367 Fix incorrect info color when barinfo is used. Closes #282 2016-06-13 21:59:54 +10:00
Dylan Araps
57a0ed4d5d Update usage 2016-06-13 21:42:53 +10:00
Dylan Araps
1be5423b1d Fix usage on BSD 2016-06-13 21:21:32 +10:00
Dylan Araps
d3c2216f48 Add CPU Usage comments 2016-06-13 20:46:13 +10:00
Dylan Araps
82143f4712 Fuck wmic 2016-06-13 20:42:16 +10:00
Dylan Araps
4a3de0c8ae Fixed whitespace for realsies this time 2016-06-13 20:40:31 +10:00
Dylan Araps
dd82e6de24 Fix whitespace take 2 2016-06-13 20:32:20 +10:00
Dylan Araps
ac9c0a80c7 Fix whitespace on Windows 2016-06-13 20:28:31 +10:00
Dylan Araps
8e8ac505ca Fix spacing on windows 2016-06-13 20:26:21 +10:00
Dylan Araps
c3ddcaa331 --test: Include cpu usage 2016-06-13 20:23:57 +10:00
Dylan Araps
c69a8f2418 Move CPU Usage to its own function 2016-06-13 20:22:38 +10:00
Dylan Araps
24fde4f6a6 Fix prompt issues 2016-06-13 19:50:20 +10:00
Dylan Araps
d65aa4bc6b Fix cpu usage 2016-06-13 19:40:54 +10:00
Dylan Araps
efcc7e8273 Fix image mode in tmux 2016-06-13 19:25:09 +10:00
Dylan Araps
c5beb9f0dc Remove comment at the top of the script about dependencies 2016-06-13 19:18:47 +10:00
Dylan Araps
ec8e4f5d5b Remove image_position 2016-06-13 19:08:03 +10:00
Dylan Araps
43d4e1e865 Add comment 2016-06-13 17:29:25 +10:00
Dylan Araps
64ed65fbf0 Uncomment functions 2016-06-13 17:28:01 +10:00
Dylan Araps
6f8dc8ad64 Remove prompr_height 2016-06-13 17:25:10 +10:00
Dylan Araps
c6c0b78d04 Unset extglob 2016-06-13 16:14:03 +10:00
Dylan Araps
79fccfa930 Remove bc usage from OpenBSD battery 2016-06-12 17:23:11 +10:00
Dylan Araps
15c6720c26 OS X memory: Remove the need for 'bc' 2016-06-12 17:13:26 +10:00
Dylan Araps
8b02c2de37 Disk usage: Remove need for 'bc', fix syntax errors 2016-06-12 17:06:31 +10:00
Dylan Araps
6dcb4e2c38 Fix merge conflicts 2016-06-12 16:40:42 +10:00
Dylan Araps
9d84ede7dc Fix merge conflicts 2016-06-12 16:26:34 +10:00
Dylan Araps
ff7ab26d6d Remove all '! -z' 2016-06-12 16:18:49 +10:00
Dylan Araps
b9e318decd It turns out that you can't quote these 2016-06-12 16:12:21 +10:00
Dylan Araps
899d3bc55e Fix error with string 2016-06-12 16:02:28 +10:00
Dylan Araps
d707df39dc Quote all the things 2016-06-12 15:51:48 +10:00
Dylan Araps
67a0879a3a Fix lint errors 2016-06-12 14:35:29 +10:00
Dylan Araps
00b45307bc Supress xprop errors if xprop isn't installed 2016-06-12 13:18:16 +10:00
Dylan Araps
ba78e2c888 Quote trim command 2016-06-12 12:10:10 +10:00
Dylan Araps
5d4e65ad54 Trim '$ascii_distro' variable 2016-06-12 12:06:30 +10:00
Dylan Araps
34c89c05cc Fix windows ascii logo 2016-06-12 11:59:21 +10:00
Dylan Araps
64182e6ef7 Whitespace trim, handle multiline strings 2016-06-12 11:57:10 +10:00
Dylan Araps
dac32f3ab1 Remove another pointless substitution 2016-06-12 11:45:33 +10:00
Dylan Araps
8b0d6a2095 GTK Theme: Group subsitutions 2016-06-12 11:41:25 +10:00
Dylan Araps
52a8cd4916 Readd a substitution that shouldn't have been removed 2016-06-12 11:11:34 +10:00
Dylan Araps
f855ae2432 Move all whitespace trimming to an external function 2016-06-12 11:06:35 +10:00
Dylan Araps
f18c315697 Fix whitespace in Windows OS line 2016-06-12 10:18:35 +10:00
Vincent Aranega
8334fba313 Fix for terminology: does not fallback on ascii when no wallpaper is found
When no image is set and there is no background image (or a `.xml` is detected) and the image option is set to `wall` (default), neofetch does not fallback on ascii mode.
The issue comes from the line 2310:

    if [ ! -f "$img" ] || [ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]; then

as `||` and `&&` have the same priority, bash does not evaluate `[ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]` first.

Solution is simply this

    if [ ! -f "$img" ] || ([ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]); then
2016-06-10 16:47:06 +02:00
Dylan Araps
470afe9509 Image shuffle: path no longer requires a '/' - @aranega 2016-06-10 23:10:54 +10:00
Dylan Araps
6723d54078 Merge pull request #273 from dylanaraps/terminology
Add terminology image support 2
2016-06-10 19:47:01 +10:00
Dylan Araps
067c200b71 Simplified image shuffle, thanks @aranega 2016-06-10 19:46:00 +10:00
Dylan Araps
e747943c08 Remove stray newlines 2016-06-10 18:34:47 +10:00
Dylan Araps
442c5d936b Reduce size of term_size format block 2016-06-10 18:31:19 +10:00
Dylan Araps
f09890ff33 Reduce read count to 1 2016-06-10 18:11:47 +10:00
Dylan Araps
0825e282cd Add terminology support 2016-06-10 17:58:24 +10:00
Dylan Araps
0527469643 Remove stray newline 2016-06-09 16:10:05 +10:00
Dylan Araps
d5c32a1805 Fix color blocks bug 2016-06-09 16:09:20 +10:00
Dylan Araps
80a73320ae Merge pull request #271 from iandrewt/cmus-fix
fixed cmus properly, now works regardless of output order
2016-06-05 09:19:51 +10:00
Andrew Titmuss
e2e74f1de3
cmus now works with only 1 call for entire block 2016-06-05 09:07:47 +10:00
Andrew Titmuss
8d88fe172e
fixed cmus properly, now works regardless of output order 2016-06-05 08:03:50 +10:00
Dylan Araps
e2e0811116 Merge pull request #252 from dylanaraps/term_font
Terminal and Terminal Font detection.
2016-06-03 18:27:21 +10:00
Dylan Araps
c5b88c68a9
If the parent process is python, exit the function 2016-06-03 18:08:19 +10:00
Dylan Araps
c1450f8288
Fix trailing '-' with gnome-terminal 2016-06-02 21:14:19 +10:00
Dylan Araps
4a431b40f8
Remove '' variable since it was pointless 2016-06-02 21:11:33 +10:00
Dylan Araps
0e4c74e913 Merge pull request #269 from iandrewt/gpmdp-remote-migration
migrate from gpmdp to gpmdp-remote
2016-06-01 21:06:52 +10:00
Andrew Titmuss
84a3425be4
migrate from gpmdp to gpmdp-remote 2016-06-01 21:04:22 +10:00
Dylan Araps
db1e466b78 Changed color order so that the title is now much more colorful 2016-06-01 17:43:44 +10:00
Dylan Araps
df5164efae Add support for Devuan 2016-06-01 17:19:40 +10:00
Dylan Araps
0a803041b2 '--ascii_distro mac' now works correctly 2016-05-31 13:28:49 +10:00
Dylan Araps
af8646fe66 Merge pull request #266 from dylanaraps/size_none
Add '--size none' to disable cropping / resizing the images.
2016-05-31 12:12:44 +10:00
Dylan Araps
c3164b7cfe Remove comments 2016-05-31 12:09:21 +10:00
Dylan Araps
3636abd2ac Disable OS X font width changes 2016-05-31 12:01:26 +10:00
Dylan Araps
4716bb7d0d Add --version and update docs 2016-05-30 15:14:16 +10:00
Dylan Araps
cf95f70f85 Fix issues with color blocks adding random newlines to the terminal 2016-05-29 10:03:18 +10:00
Dylan Araps
51aa7d01cd Fix wrong value for block width 2016-05-28 19:51:21 +10:00
Andrew Titmuss
543da69eb1
fixed iTunes song output 2016-05-28 15:24:40 +10:00
Dylan Araps
70aa01aebb Move comparison to inside if statement 2016-05-28 14:07:19 +10:00
Dylan Araps
77fe15cb29 Move comment to right place 2016-05-28 14:04:52 +10:00
Dylan Araps
7023a37658 Fixed wrong order 2016-05-28 14:02:32 +10:00
Dylan Araps
a98d96eb8c Halve font width on iTerm2 2016-05-28 14:01:44 +10:00
Dylan Araps
37e7d8e4b3 Condense term function 2016-05-28 11:38:41 +10:00
Dylan Araps
a7f7218b24 More Travis fixes 2016-05-28 11:35:20 +10:00
Dylan Araps
a846076807 Fix some travis issues 2016-05-28 11:31:15 +10:00
Dylan Araps
64d2680278 Add term and termfont to --test 2016-05-28 11:28:41 +10:00
Dylan Araps
79f8d55a56 Shorten terminal title 2016-05-28 11:22:34 +10:00
Dylan Araps
f2eb877bae Remove all whitespace from terminal name 2016-05-28 11:19:24 +10:00
Dylan Araps
5a99cb5237 term: Add support for tty 2016-05-28 11:16:13 +10:00
Dylan Araps
fd30321120 Update ascii changes 2016-05-28 11:05:29 +10:00
Dylan Araps
ec1705835c Revert last two commits 2016-05-28 10:27:58 +10:00
Dylan Araps
8d33b4051f Fix incorrect OS value 2016-05-28 10:24:35 +10:00
Dylan Araps
aed6e9a40f Merge branch 'term_font' of github.com:dylanaraps/neofetch into term_font 2016-05-28 10:15:24 +10:00
Dylan Araps
91b66052f1 Remove needless split between blocks 2016-05-28 10:14:45 +10:00
Dylan Araps
7f2f83039b Add '--block_height' / '$block_height' to change the height of the color blocks 2016-05-28 09:53:35 +10:00
Dylan Araps
ac2fcf7d77 Fix double space in theme output 2016-05-27 15:25:45 +10:00
Dylan Araps
bd070d5059 Update docs 2016-05-27 15:23:02 +10:00
Dylan Araps
37519f42b1 Fix issue with auto sized images 2016-05-27 15:13:37 +10:00
Dylan Araps
348117efb8 Add '--size none' to use the image's original size 2016-05-27 14:56:09 +10:00
Andrew Titmuss
aae23dc6d1
fixed songo output for cmus
Previously would print `"song name" "song artist" -`
2016-05-23 16:28:50 +10:00
Andrew Titmuss
184149c302
added apple terminal font support 2016-05-23 12:35:47 +10:00
John Bertagnolli
fdf299ee01 Set bc scale for memory calculation.
If $HOME/.bcrc has the scale option set (scale = 8), the memory
calculation will result in a string like "16384.00000000MB". This fix
should result that by setting the scale to 0.
2016-05-20 20:27:27 -06:00
John Bertagnolli
3a41060c10 Add support for fish shell version. 2016-05-20 19:16:53 -06:00
Dylan Araps
d504968041 termfont: Parse xrdb instead of .XresourceS 2016-05-21 00:33:48 +10:00
Dylan Araps
eeefd05b8e Fix bug with ascii size, the pure bash solution counted the file a little weirdly causing issues for some ascii art 2016-05-18 17:07:55 +10:00
Dylan Araps
9d63edcbf7 Fix bug with ascii size, the pure bash solution counted the file a little weirdly causing issues for some ascii art 2016-05-18 17:05:32 +10:00
Dylan Araps
8d87b786c2 termfont: mintty support 2016-05-18 16:39:05 +10:00
Dylan Araps
f8e6dd980b CYGWIN and it's not standard ps... 2016-05-18 15:51:25 +10:00
Dylan Araps
8b9a3ce90e Enable Terminal and Terminal font by default 2016-05-18 15:27:34 +10:00
Dylan Araps
d4adbecf9e Terminal detection, add screen support: 2016-05-18 15:22:50 +10:00
Dylan Araps
d17eee816e Remove global parsing 2016-05-18 14:20:49 +10:00
Dylan Araps
3f2d51ae5a revert iterm2 profile parsing 2016-05-17 21:12:38 +10:00
Dylan Araps
7ed11db606 termfont: iTerm2 profile aware font 2016-05-17 20:46:32 +10:00
Dylan Araps
1fa9324ca9 termfont: iTerm2 support 2016-05-17 18:53:47 +10:00
Dylan Araps
31dbdaa85a Add support for OS X terminals 2016-05-17 17:20:19 +10:00
gabe565
3b5938a631 Image directory randomization can go out of bounds
Need to subtract 1 from the total number of files in a directory or else sometimes it will have to fallback to ascii art.
2016-05-17 00:06:59 -05:00
Dylan Araps
bbbc7aca04 Do a case insensitive grep instead of duplicating awk commands 2016-05-17 06:54:57 +10:00
dar-irl
f754c3fe21 Support screen resolution on Windows 10
Edited the WMIC command used so that the screen resolution can be obtained on Windows 10.
2016-05-16 15:45:42 -04:00
Dylan Araps
5438078888 termfont: xterm support 2016-05-17 00:38:07 +10:00
Dylan Araps
abb110b57f termfont: Add URxvt support, Ignore commented lines in config files 2016-05-17 00:30:11 +10:00
Dylan Araps
2bf353eaab Merge branch 'term_font' of github.com:dylanaraps/neofetch into term_font
specially if it merges an updated upstream into a topic branch.
2016-05-17 00:08:03 +10:00
Dylan Araps
d8214dd0cd termfont: Terminator support 2016-05-17 00:07:22 +10:00
Dylan Araps
6a96072efe iTerm2 detection 2016-05-16 22:41:40 +10:00
Dylan Araps
e223b034ef Find ppid of tmux 2016-05-16 22:29:08 +10:00
Dylan Araps
8032f6ca7a termfont: Add termite support 2016-05-16 21:52:22 +10:00
Dylan
b1402c0372 Foundations for terminal font support 2016-05-16 21:35:29 +10:00
Dylan Araps
b17c923433 Merge pull request #249 from williamkray/cmus-noartistsort
prevent 'tag artistsort' from showing up in song title
2016-05-16 19:08:25 +10:00
Dylan
b6a178ab01 Use fg color for title if white. Fixes #250 2016-05-16 19:05:54 +10:00
William Kray
9faeffef12 prevent 'tag artistsort' from showing up in song title 2016-05-15 12:13:07 -07:00
Dylan
b6f69aede8 Fix spelling mistake in comment 2016-05-15 09:34:49 +10:00
Dylan
3d467ff678 Misc fixes 2016-05-15 09:28:08 +10:00
Dylan
8a55245442 Pure bash solution to getting ascii size, don't run tput in ascii mode and supress config and script dir errors 2016-05-15 09:10:37 +10:00
Dylan
3293714633 Faster math syntax for index variables 2016-05-15 09:03:58 +10:00
Dylan Araps
46893fd463 Merge pull request #246 from hashhar/bold_ascii
Added better Ubuntu-GNOME ascii art
2016-05-15 01:16:37 +10:00
Dylan
f63b3f3597 Add ascii_bold which allows you to bold the ascii art 2016-05-15 01:13:33 +10:00
Ashhar Hasan
e6857b5549 Added better Ubuntu-GNOME ascii art 2016-05-14 20:37:25 +05:30
Dylan
134146399a Merge branch 'master' of github.com:dylanaraps/neofetch 2016-05-15 01:00:35 +10:00
Dylan
644aafcadb Fix padding issues with ascii art and \\\ 2016-05-15 00:59:37 +10:00
Dylan Araps
2ecab3c91b Update neofetch 2016-05-14 23:08:55 +10:00
Dylan Araps
c07cac6847 Update neofetch 2016-05-14 23:07:30 +10:00
Dylan Araps
754fd26448 Merge pull request #241 from dylanaraps/bsd
Add support for DragonFly BSD, PC BSD and unhardcode BSD support.
2016-05-14 15:47:28 +10:00
Dylan
7b8f4a1f90 PCBSD: Use FreeBSD logo 2016-05-14 15:44:05 +10:00
Dylan
3def1d5ea6 Fix PCBSD filename 2016-05-14 15:24:18 +10:00
Dylan
77867e1671 Fix PCBSD detection 2016-05-14 15:19:09 +10:00
Dylan
26b5db822a Fix bold option not working 2016-05-14 10:54:53 +10:00
Dylan
6c7164f396 suffix dragonfly with bsd 2016-05-13 10:27:23 +10:00
Dylan
c8694fa53a Fix disk usage 2016-05-13 10:26:04 +10:00
Dylan
0a2a94c914 Safer comparison 2016-05-13 10:23:07 +10:00
Dylan
fcb128faac Check /proc/meminfo on NetBSD 2016-05-13 10:21:53 +10:00
Dylan
239cede221 Make NetBSD use the linux memory function 2016-05-13 10:18:49 +10:00
Dylan
33bb8ff4d3 We grabbed the wrong field 2016-05-13 10:15:59 +10:00
Dylan
f3c4181d6d BSD revised memory function 2016-05-13 10:04:27 +10:00
Dylan
987c67fdd5 Fix memory usage for all BSD distros we support 2016-05-13 09:57:40 +10:00
Dylan
b379106e35 Forgot to divide the total memory by 1000 2016-05-13 09:37:19 +10:00
Dylan
7a62379cec Simplify BSD memory function 2016-05-13 09:35:44 +10:00
Dylan
11c869b50e Fix blank cpu speed on DragonFlyBSD 2016-05-13 09:22:44 +10:00
Dylan
5a87bed817 NetBSD fix stray percent sign in battery output 2016-05-13 09:14:02 +10:00
Dylan
33c3a21f37 Fix stray percent sign on NetBSD battery 2016-05-13 09:13:16 +10:00
Dylan
8aa2c0168c Disable disk function on NetBSD 2016-05-13 09:11:34 +10:00
Dylan
454546be5e Revert NetBSD memory fix 2016-05-13 09:09:56 +10:00
Dylan
ea1ed4d216 Fix memory output on NetBSD 2016-05-13 09:06:51 +10:00
Dylan
f48f5e92ab Fix CPU output on NetBSD 2016-05-13 09:02:44 +10:00
Dylan Araps
3489526637 Fix GPU whitespace issue 2016-05-12 20:39:00 +10:00
Dylan Araps
2147ff9c05 Fix whitespace issues with BSD GPu suppot 2016-05-12 20:36:46 +10:00
Dylan Araps
2b72944289 Fix CPU speed on BSD 2016-05-12 20:34:36 +10:00
Dylan Araps
db2824a8e1 Format CPU output on BSD 2016-05-12 20:31:36 +10:00
Dylan Araps
e67d6609d1 Turns out that BSD version number was incorrect 2016-05-12 20:29:01 +10:00
Dylan Araps
83a2bd968c DragonFly BSD ascii art 2016-05-12 20:21:27 +10:00
Dylan Araps
be63101894 Add support for Dragonfly BSD and PC BSD 2016-05-12 19:49:08 +10:00
Dylan Araps
65f8053ede Don't assume that user is running MATE if marco wm is detected. ref https://github.com/KittyKatt/screenFetch/issues/287 2016-05-12 09:01:51 +10:00
Dylan
0b0ce4f00c Merge branch 'master' of github.com:dylanaraps/neofetch 2016-05-09 01:28:31 +10:00
Dylan Araps
ed6c04e3cd Merge pull request #237 from dylanaraps/ios
Add iOS Support
2016-05-08 15:27:35 +10:00
Dylan
55092808b4 Change case formatting and only call uname once 2016-05-09 01:17:18 +10:00
Dylan
2943dd56e0 Windows 8: Use modern ascii logo 2016-05-08 20:00:15 +10:00
Andrew Titmuss
09660208ec
removed unneeded variable 2016-05-08 14:50:19 +10:00
Andrew Titmuss
a57c320065
moved csv into neofetch file directly 2016-05-08 14:44:15 +10:00
Andrew Titmuss
94430374cb
only call uname -m once, might fix awk 2016-05-08 13:46:19 +10:00
Andrew Titmuss
3376a7d697
oops, forgot a quote 2016-05-08 13:40:55 +10:00
Andrew Titmuss
5e7563042c
added CPU/GPU table for iOS 2016-05-08 13:32:44 +10:00
Dylan
68cb460f78 Fix model bug for realsies this time 2016-05-08 11:41:45 +10:00
Dylan
7089189521 Test? 2016-05-08 11:35:22 +10:00
Dylan
59eae428dd revert previous commit 2016-05-08 11:33:32 +10:00
Dylan
7682be5522 Remove model name from distro output 2016-05-08 11:31:14 +10:00
Dylan
784b2bb63c Add support for Trinity DE 2016-05-08 11:30:14 +10:00
Dylan
421f1ad52d Fix iOS version 2016-05-08 11:00:13 +10:00
Dylan
7c24e19264 Use awk instead for sw_vers 2016-05-08 10:25:12 +10:00
Dylan
2cd662d21e Unfixable 2016-05-08 10:19:02 +10:00
Dylan
e8f9f44091 Fix iphone model appearing in distro output 2016-05-08 10:17:17 +10:00
Dylan
e4a55b8d76 Possible fix for model appearing in output 2016-05-08 10:11:37 +10:00
Dylan
2fd316eb9c Fix iphone model appearing in distro output 2016-05-08 10:06:49 +10:00
Dylan
38f9ebcb4c Fix CPU output on ios 2016-05-07 13:32:47 +10:00
Dylan
609005874a Remove CPU block 2016-05-07 12:45:09 +10:00
Dylan
16f395c462 Don't print CPU if it's empty 2016-05-07 12:42:36 +10:00
Dylan
0e0df9d03e Add birthday support to iOS 2016-05-07 11:29:55 +10:00
Dylan
4d54c5a8d9 Add ascii art for iOS 2016-05-07 21:22:00 +10:00
Dylan
b4144d8299 Add localip support to iOS 2016-05-07 21:20:03 +10:00
Dylan
da6add25ad Fix capitalization 2016-05-07 21:18:03 +10:00
Dylan
ae4573066d Add memory support to iOS 2016-05-07 21:14:46 +10:00
Dylan
928ffa1cf2 Add disk support and memory total to iOS 2016-05-07 21:12:24 +10:00
Dylan
f947031e38 Add uptime and packages support for iOS 2016-05-07 20:48:47 +10:00
Dylan
90447980bd Better OS detection and distro detection 2016-05-07 20:39:00 +10:00
Dylan
ffab8e2f75 Move iOS detection to the top of the block 2016-05-07 20:33:00 +10:00
Dylan
55a907b454 Fix wildcarded BSD detection 2016-05-07 20:27:31 +10:00
Dylan
bf3b1c1e2e Add iOS detection 2016-05-07 20:22:39 +10:00
Dylan
1bb9115944 Use memavail when available 2016-05-06 18:35:09 +10:00
Dylan
90925a35ef Correct kogaion colors 2016-05-06 10:21:15 +10:00
Dylan
f00eb22c15 Use glxinfo for all BSD versions 2016-05-06 03:44:09 +10:00
Dylan
87b6580619 Fixed string search 2016-05-06 03:41:07 +10:00
Dylan
21242e1fd8 GPU support for OpenBSD 2016-05-06 03:39:28 +10:00
Dylan
7165bea474 Added support for Kogaion 2016-05-06 03:24:48 +10:00
Dylan
70ea2093c3 Update default config to match Screenfetch 2016-04-29 17:51:12 +10:00
Dylan
32197e9e49 Update usage 2016-04-29 17:45:51 +10:00
Dylan
b48eb75bb1 Update documentation 2016-04-29 17:41:21 +10:00
Dylan
e29a3c2a5f GPU substitution 2016-04-29 15:58:22 +10:00
Dylan
ac46be44cf Made gettitle more reliable 2016-04-29 14:50:16 +10:00
Dylan
1c9f19fd21 Fix shorthand uptime 2016-04-29 10:39:07 +10:00
Dylan
7eaf3f3b4d Revert back to more reliable function 2016-04-29 10:27:43 +10:00
Dylan
d47c126144 Cleaner rewrite 2016-04-29 10:25:46 +10:00
Dylan
08e8113c8b Better comma hanfling 2016-04-29 10:19:09 +10:00
Dylan
ecdc3ff9b4 Remove commas 2016-04-29 10:15:41 +10:00
Dylan
1c78fb1343 Fix issues with 0 2016-04-29 10:14:55 +10:00
Dylan
11d80dd284 Change mins to minutes 2016-04-29 10:13:45 +10:00
Dylan
9b6e7782dc Rewrite uptime 2016-04-29 10:12:46 +10:00
Dylan
f1cc911e02 Fix comma issues 2016-04-29 10:08:56 +10:00
Dylan
cec15d9fb2 Uptime fixes 2016-04-29 10:05:35 +10:00
Dylan
9871e65148 Easy way to find start of string 2016-04-29 10:00:48 +10:00
Dylan
382a018fb4 Revert fixeS 2016-04-29 09:58:16 +10:00
Dylan
a899ea97c2 Uptime formatting 2016-04-29 09:57:22 +10:00
Dylan
bef0e37984 Fix error with hours 2016-04-29 09:54:02 +10:00
Dylan
a2712b6333 New uptime formatting 2016-04-29 09:52:47 +10:00
Dylan
b193b9e5d5 Add verbose output 2016-04-29 09:46:47 +10:00
Dylan
0a5e676b74 Revert fixes 2016-04-29 09:44:24 +10:00
Dylan
f8c350cbff Fix issues with uptime on OSX and BSD 2016-04-29 09:42:58 +10:00
Dylan Araps
dc579d3fb3 Merge pull request #229 from dylanaraps/pkg_fix
Fix issues with users having more than one package manager installed.
2016-04-26 17:38:37 +10:00
Dylan
22e888ed48 Reduce size of package manager function 2016-04-26 17:31:13 +10:00
Dylan
51ca0128a1 Remove dual-core and quad-core from cpu output 2016-04-26 17:05:08 +10:00
Dylan
0130c3929c Swap to faster math syntax 2016-04-26 16:47:01 +10:00
Dylan
2d59b695fa getpackages now works with multiple package managers at once 2016-04-26 16:39:22 +10:00
Dylan
6c29941b89 Fix issues with users having more than one package manager installed 2016-04-26 16:26:36 +10:00
Dylan
188c1b1dbb Small openbsd ascii art 2016-04-25 11:59:29 +10:00
Dylan
a5b6b2718b GPU substitution 2016-04-25 09:05:47 +10:00
Dylan
33638b9a43 Fixed bug with --underline on/off not working 2016-04-24 22:07:04 +10:00
Dylan
91683321ea GPU substitution 2016-04-24 22:00:33 +10:00
Dylan Araps
cda09a2ca9 Merge pull request #227 from dylanaraps/bar_changes
Made progress bars more customizable
2016-04-24 20:36:11 +10:00
Dylan
550185fa7e Made progress bars more customizable 2016-04-24 18:30:57 +10:00
Dylan
9a0c126d33 Fix exit status 2016-04-24 14:27:24 +10:00
Dylan
2c6a95b63f Fixed bug with error message and changelog 2016-04-24 14:22:26 +10:00
Dylan
6e288c0789 Cleanup 2016-04-24 14:16:38 +10:00
Dylan
2e3e327190 Added error message support 2016-04-24 14:14:35 +10:00
Dylan
ce3567b2f6 --colors use color 7 instead of foreground. Adds 'fg' as new value for colors 2016-04-24 11:10:57 +10:00
Dylan
3abf47908d Merge branch 'master' of github.com:dylanaraps/neofetch 2016-04-24 09:34:16 +10:00
Dylan
cd60eed15f Neofetch can now use all 256 terminal colors when using --color or the color array 2016-04-24 09:34:02 +10:00
Dylan Araps
9f5178687e Removed unused math, speeds up script a tiny bit 2016-04-23 23:02:17 +10:00
Dylan
497f653d5c KDE Neon ascii art 2016-04-21 09:05:11 +10:00
Dylan
8a99de2284 Added verbose option 2016-04-13 15:38:04 +10:00
Dylan
45ccd8a010 Fixes #224 2016-04-13 15:31:53 +10:00
Dylan
28c7314c89 Remove weird case 2016-04-12 15:50:19 +10:00
Dylan
9b5c252cfd Fixes #221 2016-04-12 11:17:21 +10:00
Dylan
d0dbe0325e Better verbose mode instructions 2016-04-12 11:04:45 +10:00
Dylan
e38c90f938 Add verbose comment 2016-04-12 10:21:11 +10:00
Dylan
71a94a5511 Cleanup 2016-04-05 01:00:29 +10:00
Dylan
f6b6a28149 Moved getdistro to a seperate function take 2 2016-04-05 00:59:04 +10:00
Dylan
a8cf5600f8 Use uname to get arch 2016-04-05 00:49:21 +10:00
Dylan
f306506c57 Fix xprop error in DE detection 2016-04-04 22:30:49 +10:00
Dylan
49c9d78d55 Revert setting change 2016-04-04 22:22:41 +10:00
Dylan
8b69b26e60 Fix broken if syntax 2016-04-04 22:21:17 +10:00
Dylan
8d67097a32 Fix broken cpu speed on NetBSD 2016-04-04 22:20:15 +10:00
Dylan
b07d18d6d0 Use 32-bit and 64-bit for arch 2016-04-04 22:16:54 +10:00
Dylan
e75a67f92b Use uname to get the architecture 2016-04-04 22:12:45 +10:00
Dylan
8520104000 os_arch, off by default 2016-04-04 22:10:13 +10:00
dylan
fd1c8199ff Remove pointless matching 2016-04-04 21:35:56 +10:00
dylan
37e9ac5d0f Nove formatting bloc down 2016-04-04 21:25:42 +10:00
dylan
d1c3f30ba7 Rewrite cpu function to fix issues with speeds lowe than 1ghz 2016-04-04 21:18:17 +10:00
Dylan
c143910fe9 Add wmtheme to --test 2016-04-03 12:11:40 +10:00
Dylan
ce7684a7f7 Reduced size of case statement 2016-04-03 12:01:25 +10:00
Dylan
ed8c729df2 Fixed bug when color blocks wrap to the next line 2016-04-03 11:58:43 +10:00
Dylan
a295181a5b Fix bug in WM Theme detection 2016-04-03 11:57:10 +10:00
Dylan
e37d5c61c7 GPU substitutions 2016-04-02 13:57:36 +11:00
Dylan
e23446b653 More GPU substitutions 2016-04-02 13:16:58 +11:00
Dylan
ca3ab8e47c Underlining now works for all the info 2016-04-02 12:52:21 +11:00
Dylan
caf507e8b6 Fix prin usage within the script 2016-04-02 11:44:08 +11:00
Dylan
5ec79cf617 Prin format changes 2016-04-02 11:34:04 +11:00
Dylan
0f61ac53e3 Remove TODO line 2016-04-02 02:29:56 +11:00
Dylan
baf86efb95 Fix matching error 2016-04-02 02:27:25 +11:00
Dylan
88be4fc541 Add support for XFCE 2016-04-02 02:26:31 +11:00
Dylan
dda95387de Remove 'X-' from de name 2016-04-02 02:22:08 +11:00
Dylan
87589110b3 Add support for Muffin 2016-04-02 02:17:36 +11:00
Dylan
7e5863dd83 Don't hardcode theme/wallpaper detection to XDG_CURRENT_DESKTOP, instead use '' 2016-04-02 01:59:46 +11:00
Dylan
22f50e634f Add KDE support to xprop DE detection 2016-04-02 01:55:31 +11:00
Dylan
8937f07daa Base DE detection 2016-04-02 01:51:32 +11:00
Dylan
12ea7591dc Add cmus support for OS X 2016-04-02 01:39:20 +11:00
Dylan Araps
4ca2a14cd8 Merge pull request #209 from dylanaraps/wmtheme
Implement Window Manager Theme
2016-04-01 20:37:40 +11:00
Dylan
9e420a9b27 Guess we can't reduce the size of this 2016-04-01 19:55:18 +11:00
Dylan
e2e3e4fd77 Fix detection on deepin 2016-04-01 18:46:37 +11:00
Dylan
82e4fce63b Fix Linux Mint detection 2016-04-01 18:34:06 +11:00
Dylan
3bcfe6691b Cleanup 2016-04-01 18:27:00 +11:00
Dylan
45e632e2bc Openbox detection, Add support for LXDE 2016-04-01 18:12:43 +11:00
Dylan
399747a5e2 Fix a distro detection bug when '/etc/*ease' doesn't use quotes 2016-04-01 18:01:24 +11:00
Dylan
4184c17507 Better implementation of envar check 2016-04-01 17:38:06 +11:00
Dylan
50d8a44a6d Don't hardcode '/home/dyl/.config', use '' if available 2016-04-01 09:47:48 +11:00
Dylan
68c5fdb37e Add wildcards to dix wm matching 2016-04-01 09:40:28 +11:00
Dylan
4c54da56b7 Move windows theme to wmtheme 2016-04-01 14:53:31 +11:00
Dylan
c8e8cf5f99 Add support for kwin 2016-04-01 14:50:15 +11:00
Dylan
1ce7a904d1 Wmtheme add support for more window managers 2016-04-01 14:42:38 +11:00
Dylan
d8f2dd2286 Add support for FluxBox 2016-04-01 11:47:16 +11:00
Dylan
dd5a5f02db Move OS X detection to the bottom 2016-04-01 11:44:20 +11:00
Dylan Araps
47132728da Merge pull request #210 from iandrewt/wmtheme_osx
added OS X support to wmtheme
2016-04-01 11:43:20 +11:00
Dylan
95bda4827c Add E17 support for wmtheme 2016-04-01 11:41:49 +11:00
Andrew Titmuss
8d602f1afe added OS X to wmtheme 2016-04-01 11:41:27 +11:00
Dylan
a1047bd3d1 Added support for E16 2016-04-01 11:39:53 +11:00
Dylan
7f3c7f07e5 Add support for Deepin 2016-04-01 11:36:19 +11:00
Dylan
6446660155 Add support for more WM themes 2016-04-01 11:35:26 +11:00
Dylan
3c22c86e38 Add support for more WMs 2016-04-01 11:33:14 +11:00
Dylan
dda8d6cb20 Better approach 2016-04-01 11:28:56 +11:00
Dylan
3f3487764c Case wm theme 2016-04-01 11:26:59 +11:00
Dylan
ebcf6fb0fc WM theme base 2016-04-01 11:23:23 +11:00
Dylan
134cbfc958 Revert bar changes 2016-03-31 22:26:34 +11:00
Dylan
ea2482c7d7 Added hardcoded DE detection for OS X 2016-03-31 20:26:20 +11:00
Dylan
a9d92d3def Travis also print 7 2016-03-31 20:05:36 +11:00
Dylan
676710ca72 Fix color blocks in Travis and older terminal emulators' 2016-03-31 19:57:57 +11:00
Dylan
2d9764baff Suppress errors in output 2016-03-31 19:43:11 +11:00
Dylan
4da69c6f40 Changes to the public ip function 2016-03-31 19:37:18 +11:00
Dylan
292ba8fc52 Fixes #204 2016-03-31 10:35:56 +11:00
Dylan Araps
96e19a59cf Merge pull request #201 from dylanaraps/cache
Implement caching for info.
2016-03-30 22:16:31 +11:00
Dylan
aa18135b24 Revert CPU cache 2016-03-30 19:43:38 +11:00
Dylan
7c6fcb789f Add cache support for CPU 2016-03-30 19:39:03 +11:00
Dylan
c2557873fc "--clean" remove cache folder and files 2016-03-30 19:30:37 +11:00
Dylan
8ef9c1b4c3 Move cache to /Library/Caches on OS X 2016-03-30 19:24:03 +11:00
Andrew Titmuss
f341c8163d made maths part smaller 2016-03-30 19:11:46 +11:00
Andrew Titmuss
5ca8f8cc81 made OS X packages SUPER fast 2016-03-30 18:50:24 +11:00
Dylan
90fd0cf1be Move more lines into the cache block 2016-03-30 14:14:51 +11:00
Dylan
53505207eb Only cache OS X GPU output 2016-03-30 14:13:40 +11:00
Dylan
ab09bf9670 Implement cache function and add caching for GPU 2016-03-30 14:00:13 +11:00
Dylan
aff2e634c4 Line wrap is now disabled by default 2016-03-30 11:40:38 +11:00
Dylan Araps
88e11de4ed Merge pull request #200 from dylanaraps/image_fixes
Image fixes
2016-03-30 10:25:19 +11:00
Dylan
f62994a49c Remove 'image_backend' as we now detect it automatically 2016-03-30 10:22:29 +11:00
Dylan
d7bf5da48e Hardcode iterm2 mode to iterm2 2016-03-30 10:20:06 +11:00
Dylan
ec9bfefbf3 Fix lint errors 2016-03-30 10:14:34 +11:00
Dylan
e55680a010 Remove broken fallback 2016-03-30 09:57:27 +11:00
Dylan
c9e6e7ada0 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-30 09:45:09 +11:00
Dylan
97f0b601c7 If intel gpu is detected change gpu to 'Intel Integrated Graphics' 2016-03-30 09:44:46 +11:00
Dylan
b731234be6 Trying to find a fallback for iterm2 image rendering 2016-03-30 09:41:43 +11:00
Dylan Araps
8dd6e98c93 Merge pull request #198 from dylanaraps/misc_fixes
Misc fixes
2016-03-30 09:31:20 +11:00
Dylan Araps
b3dc18799c Merge pull request #197 from dylanaraps/color_func
Use color function instead of harcoding escape sequences
2016-03-29 23:47:14 +11:00
Dylan
a83062f1bb Tweaks 2016-03-29 23:31:08 +11:00
Dylan
38e316733b Misc fixes 2016-03-29 23:14:35 +11:00
Dylan
1c715109fd Fixed issues when progress colors weren't set to 'distro' 2016-03-29 23:02:23 +11:00
Dylan
e7b6d90754 Fix broken cursor height in image mode 2016-03-29 22:57:33 +11:00
Dylan Araps
3a5f63c242 Merge pull request #196 from dylanaraps/ascii
Use awk to get ascii size.
2016-03-29 22:41:37 +11:00
Dylan
9d20bb67cd Fix progress bars 2016-03-29 22:36:40 +11:00
Dylan
bfac607589 Use color function instead of harcoding escape sequences 2016-03-29 21:04:31 +11:00
Dylan
c9bb5988da Color ascii logos using the forground color too 2016-03-29 19:54:09 +11:00
Dylan
1fd6cd5b00 If the title color is white then use foreground color 2016-03-29 19:48:25 +11:00
Dylan
864795da7d Reset highlighting before coloring progress bars 2016-03-29 19:32:46 +11:00
Dylan
9b58b7cdb7 Clear highlighting before setting colors 2016-03-29 18:28:26 +11:00
Dylan
3ea3451417 Add travis condition 2016-03-29 18:25:11 +11:00
Dylan
feb2a32db1 Remove pointless brackets 2016-03-29 18:20:48 +11:00
Dylan
213f23c7c4 Add +1 to the height 2016-03-29 18:19:34 +11:00
Dylan
47eba49457 Swap to a portable way of getting the ascii size' 2016-03-29 18:17:30 +11:00
Dylan
a1d409046a Rename variables so they're clearer 2016-03-29 18:04:36 +11:00
Dylan
5c6b680a1e Get ascii size in a single wc call 2016-03-29 17:57:22 +11:00
Dylan
059eb0eec0 Don't get CPU usage if we're not going to use it 2016-03-29 17:11:36 +11:00
Dylan
97fc5f34b7 Don't use as many ps flags 2016-03-29 10:04:59 +11:00
Dylan
d1a8fb9037 Fix OS X wallpaper detectiob 2016-03-29 11:40:30 +11:00
Dylan
2c881c11f5 Fix broken terminal 2016-03-29 11:11:28 +11:00
Dylan
e0e4ec46b2 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-29 11:06:41 +11:00
Dylan
12d7162a2e Use stty instead of read \-s 2016-03-29 11:06:29 +11:00
Andrew Titmuss
64dc636e48 fixed resolution output when refresh rate not available 2016-03-28 17:19:06 +11:00
Dylan
9a7a21d18a More gpu substitutions 2016-03-28 14:32:00 +11:00
Dylan
f358f25e8a Add 2 dummy numbers to mem function 2016-03-28 09:47:38 +11:00
Dylan
e2ae78c898 Merge Windows/Linux memory functions 2016-03-28 09:41:53 +11:00
Dylan
a6bcaab30a Remove highlight reset from progress bars and rebase 2016-03-27 21:42:26 +11:00
Dylan
35d120c25d Restrict progress bar colors to darker shades' 2016-03-27 21:34:41 +11:00
Dylan
951ed1169c Use '' instead of '' for coloring since '' has a lower chance of being white 2016-03-27 21:34:41 +11:00
Dylan
3ac52b1717 Don't let total bar be white 2016-03-27 21:34:41 +11:00
Dylan
c51f7cdac3 Color progress bars based on distro logo colors 2016-03-27 21:34:41 +11:00
Dylan
200faf2e1d Default text colors now work on bright colorschemes 2016-03-27 21:33:11 +11:00
Dylan
f19617cef9 Don't clear highlighting 2016-03-27 21:07:57 +11:00
Dylan
3bb8ee2ae4 Enable more options for test mode and fix bug with memory bar on linux 2016-03-27 20:28:43 +11:00
Andrew Titmuss
a0d409f15e made OS X resolution block smaller 2016-03-27 20:13:32 +11:00
Andrew Titmuss
9779e91672 made resolution way faster on OS X 2016-03-27 19:50:09 +11:00
Dylan Araps
9161b8a1a1 Merge pull request #187 from dylanaraps/cpu_whitespace
Fix huge whitespace in CPU output
2016-03-27 15:22:25 +11:00
Dylan
0805fb5e3a Fix bugs with OpenBSD 2016-03-27 15:21:11 +11:00
Dylan
19b3c22b37 Fix windows whitespace 2016-03-27 15:09:59 +11:00
Dylan
8298f64394 Fix windows displaying a blank battery output when no battery is found 2016-03-27 15:05:43 +11:00
Dylan
3496c85248 Fix stray + sign in birthday output' 2016-03-27 15:04:44 +11:00
Dylan
df945f51a9 Revert tab changes 2016-03-27 14:59:49 +11:00
Dylan
ea1d2d2341 Also remove trailing tab characters 2016-03-27 14:56:43 +11:00
Dylan
5f2047fd0b More reliable whitespace removal 2016-03-27 14:50:00 +11:00
Dylan
423af0cd48 Use extended globbing instead of tr 2016-03-27 14:13:27 +11:00
Dylan
6296cf7410 Use tr on OSX to trim whitespace 2016-03-27 14:05:22 +11:00
Dylan
2edad96936 Fix huge whitespace in CPU output 2016-03-27 13:51:21 +11:00
Dylan Araps
65b7c2fc50 Merge pull request #184 from dylanaraps/cleanup
Info function cleanup
2016-03-27 12:22:59 +11:00
Dylan
2656aa5563 Battery remove 'None' value 2016-03-27 12:22:01 +11:00
Dylan
aa86f8ada2 Revert all whitespace fixes for OSX 2016-03-27 12:15:40 +11:00
Dylan
16f47e2f4e I hate whitespace right now 2016-03-27 12:12:25 +11:00
Dylan
9acf6d9554 Fixed whitespace issue for realsies this time 2016-03-27 12:09:52 +11:00
Dylan
d80d7e8c17 Added echo to debug 2016-03-27 12:06:33 +11:00
Dylan
13f439502b Revert whitespace fix for OSx 2016-03-27 12:03:40 +11:00
Dylan
eacce05f3a Fixed broken CPU speed on linux when /sys/ wasn't available 2016-03-27 11:59:01 +11:00
Dylan
0c5869da38 Fix weird whitespace issues with cores 2016-03-27 11:52:24 +11:00
Dylan
f847d9ee22 Fix whitespace in OS X xeon cpu 2016-03-27 11:15:12 +11:00
Dylan
d537b35695 Fix whitespace in OS X xeon cpu 2016-03-27 11:11:41 +11:00
Luke Street
6741dd3d4e Correct NVIDIA capitalization 2016-03-26 19:39:55 -04:00
onespaceman
4b8e2c5e1b Use $GTK2_RC_FILES for GTK2 config if set 2016-03-26 15:04:59 -04:00
Dylan
912295d821 Remove all 'Unknown' printing when a command fails, instead we display nothing 2016-03-26 23:36:37 +11:00
Dylan
b4f19e8a3d Cleanup CPU function 2016-03-26 23:17:27 +11:00
Dylan
95c744f0f8 Merge Windows and Linux uptime blocks since they're the same 2016-03-26 22:46:07 +11:00
Dylan
3584ebcf76 Fix issues with Puppy Linux 2016-03-26 22:32:31 +11:00
Dylan Araps
9b5cf28793 Merge pull request #175 from dylanaraps/memory_legacy
Rewrite memory function to work on older linux kernel versions.
2016-03-26 22:31:25 +11:00
Dylan
8311d3f2e3 Cleanup distro detection 2016-03-26 22:13:03 +11:00
Dylan
967e8eca8b More travis output improvements 2016-03-26 19:14:27 +11:00
Dylan
ed469eee06 Travis output improvementS 2016-03-26 19:12:33 +11:00
Dylan
424d6e6c0b Added Travis CI ascii art 2016-03-26 15:22:24 +11:00
Dylan
bdfeb7c3a3 Travis, fix a hang on OSX 2016-03-26 14:52:30 +11:00
Dylan
5a4a4cb147 Travis don't use color blocks 2016-03-26 14:24:13 +11:00
Dylan
1442216ded Fix '+' sign in date output 2016-03-26 14:22:10 +11:00
Dylan
f2253afbfa Fix travis overlap 2016-03-26 14:20:28 +11:00
Dylan
51d773dc52 Move cursor to bottom in test mode 2016-03-26 14:13:02 +11:00
Dylan
70b59ac1ef Fix refresh_rate output 2016-03-26 13:56:58 +11:00
Dylan
f153e8d2e4 Add a quicker timeout for terminals that support it 2016-03-26 13:53:54 +11:00
Dylan
fe2c6e1e49 Fix integer error 2016-03-26 13:44:03 +11:00
Dylan
5d4212853c Fix hang with travis 2016-03-26 13:41:49 +11:00
Dylan
87d104414b Travis, use makefile 2016-03-26 12:13:31 +11:00
Andrew Titmuss
044ee72619 fixed if statement for linux resolution 2016-03-26 11:49:43 +11:00
Dylan Araps
d8fa3824e4 Merge pull request #160 from iandrewt/refresh_rate
display refresh rate after each monitor (optional)
2016-03-26 11:38:07 +11:00
Andrew Titmuss
c58a95854f added note about not being supported on windows 2016-03-26 11:34:35 +11:00
Dylan
806a54224c Don't show GPU output on unsupported OS 2016-03-26 10:29:21 +11:00
Dylan Araps
40eb97a48a Merge pull request #179 from dylanaraps/openbsd_fixes
OpenBSD fixes
2016-03-26 10:15:26 +11:00
Dylan
218c159c0c Don't print 'up' until the end 2016-03-26 10:07:04 +11:00
Dylan
1c8b71fb90 Fix bug with 0 amount 2016-03-26 10:06:08 +11:00
Dylan
eefca64248 Simplify uptime for OSX / BSD 2016-03-26 10:04:23 +11:00
Dylan Araps
631ca50505 Merge pull request #178 from dylanaraps/color_fixes
Fix colors in older versions of Mac OS X, OpenBSD etc
2016-03-26 09:53:50 +11:00
Dylan
36ca05dba5 Remove OpenBSD detection from FreeBSD memory function 2016-03-26 09:53:08 +11:00
Dylan
030263465f Fix memory output on OpenBSD 2016-03-26 09:45:46 +11:00
Dylan
17cd68ba6b Fixed CPU output on OpenBSD 2016-03-26 09:40:35 +11:00
Dylan Araps
0eff00c3ff Merge pull request #174 from dylanaraps/shuffle
Remove shuffledir in favor of '--image path/to/dir/'
2016-03-26 09:28:34 +11:00
Dylan
5708b949a4 Swap colors to a more portable escape sequence 2016-03-26 09:15:29 +11:00
Dylan
b829a1a5e5 Swap shuf for a more universal alternative 2016-03-26 09:10:20 +11:00
Dylan
4a06a4a1e2 Reset colors before setting them 2016-03-26 08:54:33 +11:00
Andrew Titmuss
0d64fac031 added xrandr without refresh rate 2016-03-26 08:51:39 +11:00
Andrew Titmuss
c5f22dacb3 added check for whether user wants refresh rate for linux 2016-03-26 08:36:00 +11:00
Andrew Titmuss
b971e214e6 added Linux support 2016-03-26 07:59:24 +11:00
Dylan
8745dce02a Show state with progress bars 2016-03-26 01:26:42 +11:00
Dylan
b15a9b4463 Fix battery progress bars when not charging 2016-03-26 01:25:41 +11:00
Dylan
602be3a6c0 Fix incorrect state output 2016-03-26 01:24:08 +11:00
Dylan
04b35027c7 Fix battery state when used with progress bars 2016-03-26 01:06:03 +11:00
Dylan
ab356239f3 Added new disk display mode called 'perc' 2016-03-26 01:02:01 +11:00
Dylan
1463b8f336 Rename battery_status to battery_state 2016-03-26 00:24:18 +11:00
Dylan
88d279e1f9 Changes to the battery state stuff 2016-03-26 00:18:16 +11:00
Dylan Araps
f5ec035e18 Merge pull request #168 from dawidd6/battery_status
added battery status for linux and freebsd (only one battery)
2016-03-26 00:14:29 +11:00
dawidd6
2c7696fdd0 cosmetical changes according to @dylanaraps suggestions 2016-03-25 13:50:49 +01:00
Dylan
4cf43fecc0 Don't print resolution if detection fails 2016-03-25 22:20:19 +11:00
Dylan
2984687018 Only print cpu cores if they're found 2016-03-25 22:17:54 +11:00
Dylan
5d7ed48661 Small nitpick 2016-03-25 22:13:39 +11:00
Dylan
5939c27b60 Rewrite memory function to work on older linux kernel versions 2016-03-25 21:51:21 +11:00
Dylan
5d03e007af Remove shuffledir in favor of '--image path/to/dir/' 2016-03-25 21:22:58 +11:00
Dylan
70fb4e9597 Added support for Qubes OS 2016-03-25 19:34:05 +11:00
Dylan Araps
3e2c4c3b53 Merge pull request #173 from iandrewt/google-play-music
Added Google Play Music Desktop Player as a song output source
2016-03-25 13:46:10 +11:00
Andrew Titmuss
9537be0e94 changed with new gpmdp function 2016-03-25 13:44:15 +11:00
Dylan Araps
769a2cddb6 Merge pull request #167 from dawidd6/master
fix for mpc detection
2016-03-25 10:03:27 +11:00
Andrew Titmuss
1d04de9c1d added support for Google Play Music Desktop Player
also adds an optional dependancy of `gpmdp-bash`
2016-03-25 09:54:32 +11:00
Dawid
7aa3bd8fea changed mpc according to @dylanaraps suggestion 2016-03-24 19:31:10 +01:00
Andrew Titmuss
ef0dd5f096 fixed with @dylanaraps suggestions from #1 2016-03-21 17:22:38 +11:00
Andrew Titmuss
913e14a8ae added OS X support, fixed capitalisation 2016-03-21 12:19:52 +11:00
dawidd6
5bcaa342a8 fixed battery_status to show only charging status + added battery_status to FreeBSD 2016-03-20 15:26:23 +01:00
dawidd6
85a0e2cc80 added power status for single battery 2016-03-20 15:26:23 +01:00
dawidd6
d75ce880d4 fix for mpc detection 2016-03-20 12:02:55 +01:00
Dylan Araps
32f27dec1e Merge pull request #163 from iandrewt/public_ip_opendns
Made publicip function faster by using dig
2016-03-19 16:49:49 +11:00
Dylan Araps
0998d629d2 Merge pull request #162 from dylanaraps/scrot_fixes
Fixed bugs with scrot usage
2016-03-19 16:31:57 +11:00
Dylan Araps
60ce0d14e5 Merge pull request #164 from iandrewt/osx_uptime
changed osx_uptime parsing of seconds from case to if
2016-03-19 16:31:25 +11:00
Andrew Titmuss
5b9466cfec made publicip function faster by using dig 2016-03-19 13:38:48 +11:00
Andrew Titmuss
bb95137f01 changed case to if, shaves 0.1 seconds from run time 2016-03-19 13:32:33 +11:00
Dylan
c120a4daa6 Fix typo in function namne 2016-03-19 10:58:03 +11:00
Dylan
cf3418d994 Fixed bugs with scrot usage 2016-03-19 09:37:29 +11:00
Andrew Titmuss
daf4284f7f added refresh rate option for OS X 2016-03-18 16:28:26 +11:00
Camille
c4af2cf4ce Update CRUX distro name
CRUX has a binary called crux that print the distro name and the version (CRUX version 3.2 for example).
2016-03-17 14:32:57 +01:00
Dylan Araps
098a962b59 Merge pull request #156 from dylanaraps/stdout_fix
Fix stdout mode when used with the cpu function.
2016-03-17 16:44:17 +11:00
Dylan
a48d997bf4 Fix stdout mode when used with multiple batteries 2016-03-17 16:20:21 +11:00
Dylan
176fe42f03 Fix stdout mode with getsong 2016-03-17 16:16:15 +11:00
Dylan Araps
608a47dd06 Merge pull request #155 from iandrewt/battery_index
fixed first battery when multiple batteries
2016-03-17 16:10:59 +11:00
Dylan
c02619616f Fix stdout mode when used with cpu 2016-03-17 16:10:16 +11:00
Andrew Titmuss
0228c5966c fixed first battery when multiple batteries 2016-03-17 16:07:53 +11:00
Dylan
45b2d7f748 Linux memory, fix read causing hang on older systems 2016-03-17 14:57:25 +11:00
Dylan
8c4895c053 Added ascii logos for ubuntu flavors 2016-03-17 14:16:30 +11:00
Matthew Treadwell
e1de9ec0b7 fixed wallpaper error that occurs when using more than one monitor/wallpaper with nitrogen 2016-03-16 16:38:36 -07:00
Andrew Titmuss
151eb544f4 moved /usr/share to before /etc in gtk theme 2016-03-16 17:27:45 +11:00
Andrew Titmuss
0fca1ff3c7 added /usr/share as a gtk theme directory 2016-03-16 17:12:21 +11:00
Dylan
e61ef6042d Add missing arg for cpu_cores' 2016-03-15 20:15:24 +11:00
Andrew Titmuss
c98d8f1196 added CPU cores to CPU output 2016-03-15 18:55:35 +11:00
Andrew Titmuss
26c04cf753 changed to awk command, added netbsd and windows 2016-03-15 18:24:12 +11:00
Andrew Titmuss
890d44c518 added cpu cores so the usage bar doesn't go crazy above 100% 2016-03-15 18:09:07 +11:00
Dylan
b5c76c0dc3 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-15 19:00:07 +11:00
Dylan
c8cf1f3e6c Added another gpu substitution 2016-03-15 18:01:14 +11:00
Andrew Titmuss
faeed8771f fixed osx_buildver option 2016-03-15 17:15:56 +11:00
Dylan Araps
f17220c04a Merge pull request #146 from iandrewt/disk_display_fix
fixed output of disk bar when gigabytes are used of a terabyte disk
2016-03-14 21:43:45 +11:00
Dylan
f17dc0bd5d Remove all echo usage 2016-03-14 22:31:40 +11:00
Andrew Titmuss
a7806d6c09 changed to 1 line if statements 2016-03-14 21:41:14 +11:00
Andrew Titmuss
712500a170 moved removal of '.'* to the actual printing of infobar 2016-03-14 21:39:02 +11:00
Andrew Titmuss
c0a6886dcc changed from echo to printf 2016-03-14 21:33:14 +11:00
Andrew Titmuss
34f145b7b1 made the if statements shorter 2016-03-14 21:29:48 +11:00
Andrew Titmuss
3cb804f95b oops there was a debug line... 2016-03-14 21:26:04 +11:00
Andrew Titmuss
2ae20041ba fixed output of disk bar when gigabytes are used of a terbyte disk 2016-03-14 21:21:43 +11:00
Dylan Araps
1aa4c64f5d Merge pull request #145 from dylanaraps/osx_codename
OSX Codename support
2016-03-13 22:40:20 +11:00
Dylan
ff2183680c Keep the full version in output 2016-03-13 23:35:43 +11:00
Dylan
9d40beb186 Drop the .XX from OSX version 2016-03-13 23:23:10 +11:00
Dylan
28f936e03f Update docs 2016-03-13 23:12:58 +11:00
Dylan
64d90f8a4a Add config option and fix bugs with codename output 2016-03-13 23:08:08 +11:00
Dylan
c400e44c2f Fix double whitespace when build version is enabled 2016-03-13 22:54:51 +11:00
Dylan
3ead0bf5c5 Removed hardcoded string from testing 2016-03-13 22:53:33 +11:00
Dylan
7783aaa8c5 Remove stray line from other branch 2016-03-13 22:51:33 +11:00
Dylan
24d1b76fac Remove stray line from other branch 2016-03-13 22:50:52 +11:00
Dylan
b60f73efb3 Add ability to set osx_codename 2016-03-13 22:49:37 +11:00
Dylan
31ea9fd6f4 iterm2 xoffset take a pixel value instead of terminal cells 2016-03-13 10:59:22 +11:00
Dylan
f954552baf xoffset now pushes text over too 2016-03-13 10:51:30 +11:00
Dylan
81337b5a2e xoffset now also moves the text 2016-03-13 10:49:57 +11:00
Dylan
ffb2e0afbf Added xoffset 2016-03-13 09:55:10 +11:00
Dylan
e857b6cee5 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-13 09:43:51 +11:00
Dylan
6a284975fc Fix song_shorthand when songs have more than one '-' in their name 2016-03-13 09:43:06 +11:00
Dylan
308a5557cd Remove duplicate pgrep lines in getsong 2016-03-13 09:30:53 +11:00
Dylan
d543f7f9e2 Update manpage and changelog 2016-03-13 09:14:56 +11:00
Dylan
80e91fdaa5 Fixed merge conflicts 2016-03-13 08:55:35 +11:00
Dylan
bf4bd9a10b Fix missing index line causing battery titles to not display correctly 2016-03-13 08:50:21 +11:00
Dylan
2d5f151b7e Add progress bar support for multiple batteries on linux 2016-03-13 08:48:50 +11:00
Dylan
cc6319bc1c Remove stray cpu usage stuff and update docs 2016-03-13 08:42:22 +11:00
Dylan
6485476ae7 Various progress bar fixes 2016-03-13 08:37:33 +11:00
Andrew Titmuss
5080f0fda4 fixed issues and added usage info 2016-03-13 07:58:46 +11:00
Andrew Titmuss
fec784019e made battery_bar easier to use 2016-03-13 00:05:48 +11:00
Andrew Titmuss
2ac5c9e791 made memory_bar easier to use 2016-03-13 00:00:02 +11:00
Andrew Titmuss
78e78a08f2 made disk_bar easier to use 2016-03-12 23:43:16 +11:00
Andrew Titmuss
8cce81c47e made cpu_bar easier to use 2016-03-12 23:01:20 +11:00
Andrew Titmuss
d37dd86cb5 fixed a few issues with the progress bars 2016-03-12 20:38:53 +11:00
Dylan
edd87f4cfe Fix bug where i3 would show up as a desktop environment and a window manager 2016-03-12 19:11:17 +11:00
Dylan Araps
2b2ef7591e Merge pull request #138 from iandrewt/osx_songs
OSX: Added Itunes/Spotify support to getsong
2016-03-12 18:56:24 +11:00
Andrew Titmuss
f105207d01 fixed output for spotify 2016-03-12 18:53:55 +11:00
Andrew Titmuss
be2831dc5a spotify support added 2016-03-12 18:48:01 +11:00
Andrew Titmuss
1616bf1341 itunes support added 2016-03-12 18:16:22 +11:00
Andrew Titmuss
74f5f76569 fixed spacing between time and AM/PM 2016-03-12 10:25:19 +11:00
Andrew Titmuss
641470ccd7 added working birthday function for OS X 2016-03-12 10:17:26 +11:00
Andrew Titmuss
3ed4c43636 fixed bash dependency in preamble
it still read `Bash 4.0+`, changed to `Bash 3.0+`
2016-03-11 21:10:21 +11:00
Dylan Araps
679346df39 Merge pull request #133 from iandrewt/gpu_shorthand-tiny
added tiny option to --gpu_shorthand
2016-03-11 20:59:22 +11:00
Andrew Titmuss
75a5f3f41a added tiny option to --gpu_shorthand
removes 'Graphics', 'GeForce' and 'Radeon' from output
2016-03-11 20:48:06 +11:00
Dylan
5f68746508 Update dependencies inside script 2016-03-11 15:20:34 +11:00
Dylan
211b326e2c Update 2016-03-11 13:59:22 +11:00
Andrew Titmuss
467ca792c9 fixed duplicate case 2016-03-11 10:39:05 +11:00
Andrew Titmuss
d1f7c47e0c changed cpu_frequency outputs with @dylanaraps suggestions 2016-03-11 10:33:37 +11:00
Andrew Titmuss
5b6196f182 added ability to shorten cpu output
usage: --cpu_shorthand (name, model, name_model, speed)
also edited config file to suit
2016-03-11 08:27:00 +11:00
Dylan
1b63672d35 Remove stray backslash 2016-03-10 18:48:41 +11:00
Dylan
77a8f89f16 Changed default gap to 2 spaces 2016-03-10 14:36:49 +11:00
Dylan
ebcf31c777 Added support for SteamOS 2016-03-10 14:36:02 +11:00
Dylan
076db2b68d Disk usage: Limit usage to local disks. Closes #128 2016-03-10 08:57:21 +11:00
Dylan
404c955e8f Added support for Alpine Linux 2016-03-09 22:43:52 +11:00
Dylan
1fd64f5bea Add options to hide info when printing progress bars 2016-03-07 23:15:54 +11:00
Dylan
b00904adaf Another gpu substitution 2016-03-06 14:10:08 +11:00
Dylan
52605060d1 Shorten if statement 2016-03-06 10:01:57 +11:00
Dylan
6d01e1c82d Added '--birthday_format' to format the output of Birthday 2016-03-06 09:56:46 +11:00
Dylan
256bdf4b75 Fix incorrect theme bug with Cinnamon 2016-03-06 09:14:44 +11:00
Dylan
88b5430cac Update docs 2016-03-06 09:08:59 +11:00
Dylan
17c421b03d Intel gpu substitiution 2016-03-05 23:33:05 +11:00
Dylan
237836b56f Fix issue with color blocks ending up on the same line as the prompt 2016-03-05 16:05:30 +11:00
Dylan
2de3d68894 Merge 'text colors' and 'text formatting' headings in help, makefile and readme 2016-03-05 09:30:53 +11:00
Dylan
59d3d7aa38 Reimplement 'color' function 2016-03-04 13:15:03 +11:00
Dylan
73b0e4c786 [Linux] Added spotify support to getsong 2016-03-04 12:32:06 +11:00
Dylan
2a327bde3b Fix double space 2016-03-04 09:10:55 +11:00
Dylan
554d65de82 Remove duplicate resolution line 2016-03-04 08:48:16 +11:00
Dylan Araps
08118a9375 Merge pull request #120 from dylanaraps/separator
Reimplement '--stdout_separator'
2016-03-04 07:54:19 +11:00
Dylan
670fb2238e Simplified sdtout function 2016-03-03 16:35:24 +11:00
Dylan
9ebfaf40bb Remove pointless variable 2016-03-03 15:23:14 +11:00
Dylan
b587c3f7c9 Fix issues with progress bar and memory usage 2016-03-03 14:14:02 +11:00
Dylan
ae144ceee8 Added disk support to progress bars 2016-03-03 11:52:39 +11:00
Dylan
fe3e78d211 Disable progress bars by default 2016-03-03 11:29:28 +11:00
Dylan
2c90455f38 Disable progress bars in stdout mode 2016-03-03 11:28:30 +11:00
Dylan
a16e446455 Add progress bar support for multi battery systems 2016-03-03 11:24:28 +11:00
Dylan
6dc4277b4f Cleanup the battery function 2016-03-03 11:18:28 +11:00
Dylan
e3dc2b9a38 Progress bar support for battery usage 2016-03-03 11:09:40 +11:00
Dylan
5c374d28a2 Add missing args 2016-03-03 11:03:19 +11:00
Dylan
f24f7ad9b7 Added progress bar support to memory output 2016-03-03 11:00:47 +11:00
Dylan
639641a159 Changelog 2016-03-03 10:41:13 +11:00
Dylan
da5d912774 Added new info function 'cpu usage' to get the cpu usage 2016-03-03 10:37:18 +11:00
Dylan
d142efe2db Added base support for progress bars 2016-03-03 10:12:21 +11:00
Dylan
1fd7ed07fe Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-03 09:40:39 +11:00
Dylan
bdcb1058b3 Optimized all ascii art and fixed any leading whitespace issues 2016-03-03 09:40:16 +11:00
Dylan
c9157fbd67 Remove whitespace 2016-03-02 17:58:48 +11:00
Dylan
3a826e16cc Made the separator in stdout mode configurable with '--stdout_separator' and '$stdout_separator' 2016-03-02 17:56:28 +11:00
dylan
7dc4b4120c Added another gpu substitution for intel gpus 2016-03-01 07:55:23 +11:00
Dylan
dc54ca530d Added another gpu substitution 2016-02-29 06:56:10 +11:00
Dan Church
258d49755f
Fix help message text
Fixes "Which Distro\'s ascii art to print" in output when running
`--help`

Caused by a rogue backslash in the heredoc.
2016-02-28 13:38:01 -06:00
Dylan Araps
4641a929c6 Merge pull request #111 from dylanaraps/small_logo
Add small ascii logo variants for Arch, Crux and Gentoo.
2016-02-28 21:35:22 +11:00
Dan Church
4920d70b77
Fix 0 package count in Slackware
Fixes #112.

Rationale:
- By default in Slackware, /sbin and /usr/sbin aren't part of the user's
  PATH. (It's been this way since I started using it in 2004, version
  9.1)
- `type -p /path/to/binary` works just like it was used with a bare
  binary name.
2016-02-28 00:35:35 -06:00
Dylan
5aacff5e57 Remove pointless check 2016-02-28 17:02:05 +11:00
Dylan
f06d9a9e6e Added another substitution for amd GPUs 2016-02-28 15:05:14 +11:00
Dylan
535d220e1a Fix bug with not creating config in stdout mode 2016-02-28 13:16:48 +11:00
Dylan
052e53d4e7 Add small ascii logos for Arch, Crux and Gentoo 2016-02-28 13:07:10 +11:00
Dylan
76a3b1156d Rename fetch to neofetch 2016-02-28 11:44:45 +11:00
Renamed from fetch (Browse further)