Commit graph

499 commits

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