Commit graph

902 commits

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