Commit graph

3225 commits

Author SHA1 Message Date
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)