kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1934 commits 1 branch 37 tags 16 MiB
Commit graph

692 commits

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