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 |
|