Commit graph

220 commits

Author SHA1 Message Date
Ethan Edwards
f5fd574501 Merge branch 'master' of https://github.com/dracula/tmux into freebsd_support 2020-09-03 15:43:07 -04:00
Ethan Edwards
c09e371d6d
Merge pull request #62 from playonverbs/master
Add flag for dd/mm date format that works with military time.
2020-09-03 15:43:25 -04:00
Niam Patel
cb27ca216d
Merge branch 'master' into master 2020-09-03 20:39:36 +01:00
Ethan Edwards
8f235a8b09 Merge branch 'master' of https://github.com/dracula/tmux into freebsd_support 2020-09-03 15:11:15 -04:00
Ethan Edwards
7f8bb35543
Merge pull request #58 from jaywonchung/better-gpu-usage
Support multi-gpu environment
2020-09-03 15:11:04 -04:00
Ethan Edwards
e602d9b4eb
Merge pull request #63 from gaganpreet/locale-aware-parsing
Specify numeric locale for parsing top output
2020-09-03 13:02:22 -04:00
Ethan Edwards
1ebeaa6afd
Merge pull request #60 from ethancedwards8/refresh_rate
Adding ability to change the refresh rate of whole status bar
2020-09-03 12:44:16 -04:00
Ethan Edwards
92912edd3e
Merge pull request #57 from osdamv/master
Option to remove the time
2020-09-03 12:42:34 -04:00
Ethan Edwards
3ccb5359ac added battery support 2020-09-02 12:41:30 -04:00
Ethan Edwards
47fe175441 Merge branch 'master' of https://github.com/ethancedwards8/tmux into freebsd_support 2020-09-01 21:40:47 -04:00
Ethan Edwards
f0e928f222 Merge branch 'freebsd_support' of https://github.com/ethancedwards8/tmux into freebsd_support 2020-09-01 21:39:39 -04:00
Ethan Edwards
ae51792d19 Merge branch 'freebsd_support' of github.com:ethancedwards8/tmux into freebsd_support 2020-09-01 21:36:30 -04:00
Ethan Edwards
a2874eed95 Revert "adding the option to turn off time on powerline"
This reverts commit 288cdc5a99.

Revert "Option to remove the time"

This reverts commit c933dae67e.
2020-09-01 21:36:05 -04:00
Ethan Edwards
e5550a61d2 Revert "adding the option to turn off time on powerline"
This reverts commit 288cdc5a99.
2020-09-01 21:31:28 -04:00
Ethan Edwards
e2004baa51 added ram support 2020-09-01 21:24:39 -04:00
Gaganpreet
33703eb2d3 specify numeric locale for parsing top output 2020-08-31 11:41:45 +02:00
Niam Patel
a4581712bc Add flag for dd/mm date format that works with military time. 2020-08-25 17:29:28 +01:00
Ethan Edwards
b662f2e10d documentation 2020-08-10 08:04:51 -04:00
Ethan Edwards
e290571fee added the refresh rate by pulling from the .tmux.conf file and running
the get_tmux_option function and using that as the variable for the
refresh rate on sleep
2020-08-10 07:57:48 -04:00
Ethan Edwards
f5f8dedb9f Merge branch 'master' of https://github.com/osdamv/tmux into refresh_rate 2020-08-09 01:50:44 -04:00
Ethan Edwards
695a67531f init for refresh_rate NOT WORKING 2020-08-09 01:50:07 -04:00
osdamv
882b16d1e7
Merge pull request #1 from ethancedwards8/master
adding the option to turn off time on powerline
2020-08-07 07:02:16 -06:00
Ethan Edwards
288cdc5a99 adding the option to turn off time on powerline 2020-08-06 19:05:43 -04:00
Jaewon Chung
14ad891d3d Support multi-gpu environment 2020-08-07 00:56:00 +09:00
osdamv
c933dae67e
Option to remove the time
A simple if to remove the time option, I do not like it because I already have a huge watch in my desktop environment
2020-08-06 08:22:03 -06:00
Dane Williams
fbc02789b4
Merge pull request #56 from xunoaib/master
Prevent multiple instances of sleep_weather.sh from running simultaneously
2020-08-02 17:52:06 -07:00
Collin Simpson
eeb19aba41 Prevent multiple instances of sleep_weather.sh from running at once 2020-08-02 19:00:54 -04:00
Dane Williams
4f3bf8a9be
Merge pull request #54 from ReagentX/master
Fix #53: report MacOS memory correctly
2020-08-01 16:38:43 -07:00
Dane Williams
fcd8a5589d
Merge pull request #55 from aapit/master
added option to hide timezone
2020-08-01 16:38:07 -07:00
David Spreekmeester
bc8530a14a added option to hide timezone 2020-08-01 16:02:50 +02:00
Christopher Sardegna
8d52547025
Update ram_info.sh
Fix brace
2020-07-23 23:12:23 -04:00
Christopher Sardegna
15a078a7dd
Fix typo in shebang 2020-07-23 10:47:18 -04:00
Christopher Sardegna
633ab4776b
Fix reporting negative memory usage on MacOS 2020-07-23 10:45:49 -04:00
Dane Williams
60c2017fb0
Merge pull request #50 from ethancedwards8/master
Adding GPU usage.
2020-07-05 10:39:57 -07:00
Ethan Edwards
dcb6f48a4d added gpu usage 2020-06-29 22:44:51 -04:00
Dane Williams
a68dcc7d88 t push origin masterMerge branch 'ethancedwards8-master' 2020-06-28 15:51:01 -07:00
Dane Williams
393b4fa5a2 removed swp file 2020-06-28 15:48:24 -07:00
Ethan Edwards
0516471e72 mac compatability is working 2020-06-28 13:34:08 -04:00
Ethan Edwards
ac2f789ff4 Fixed reviews 2020-06-13 21:42:27 -04:00
Ethan Edwards
e41cabee1c Changed naming of some things 2020-06-07 19:36:26 -04:00
Ethan Edwards
420eed6fd4 dont mind the commits, Im testing it on a mac, and editing and pushing
it from my desktop
2020-06-07 19:21:46 -04:00
Ethan Edwards
eeff7ec82d Trying to get this to work 2020-06-07 19:19:52 -04:00
Ethan Edwards
167260211a Found a nice lil trick 2020-06-07 19:16:55 -04:00
Ethan Edwards
8ba9b20152 realized the command i was trying to use was depreciated 2020-06-07 19:08:55 -04:00
Ethan Edwards
4cf72d94c3 I hope this works lol 2020-06-06 22:41:30 -04:00
Ethan Edwards
3ec3f2f08b Fixed weird spacing on session/window/smiley on left side 2020-06-04 12:01:53 -04:00
Ethan Edwards
833baa9616 I think this will add Mac/Darwin support 2020-06-04 00:33:47 -04:00
Ethan Edwards
410902b6d8 forgot to add a file 2020-06-03 23:46:33 -04:00
Ethan Edwards
fbbc1c2232 Merge branch 'master' of https://github.com/dracula/tmux 2020-06-03 23:45:31 -04:00
Ethan Edwards
3d5a3cbb8f Added ram percentage support 2020-06-03 23:44:17 -04:00