Commit graph

338 commits

Author SHA1 Message Date
Nuno Sá
eedd33771f git: add remote info support
With this new option, we get information about which remote branch we're
tracking. On top of this, we'll get information about ahead/behind
commits when we diverged from remote. The output format will be in the
form:

'local...remote +ahead -behind',

where ahead and behind are the number of commits ahead and behind.

This functionality is controlled by a new option called
'@dracula-git-show-remote-status'.

Note that for this to be properly displayed, we need to increase the
size of the right status bar when the git plugin is enabled.

In order to be easier to introduce the change, getMessage() was also a
bit changed in order to be easier to append the remote info.

Signed-off-by: Nuno Sá <noname.nuno@gmail.com>
2022-10-26 11:04:30 +02:00
Ethan Edwards
79521cc737
Merge pull request #169 from nunojsa/dev/git-no-untracked-files 2022-10-25 07:27:15 -04:00
Nuno Sá
e9f46f76ca scripts: git: add '--no-optional-locks' option
As stated in 'git status --help':

"By default, git status will automatically refresh the index, updating
the cached stat information from the working tree and writing out the
result. Writing out the updated index is an optimization that isn’t
strictly necessary (status computes the values for itself, but writing
them out is just to save subsequent programs from repeating our
computation). When status is run in the background, the lock held during
the write may conflict with other simultaneous processes, causing them to
fail. Scripts running status in the background should consider using git
--no-optional-locks status (see git(1) for details)."

This was actually happen during rebasing whith the following error:

"error: Unable to create '/home/nsa/work/linux/.git/index.lock': File
exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue."

This change fixes the above...

Signed-off-by: Nuno Sá <noname.nuno@gmail.com>
2022-09-06 14:36:47 +02:00
Nuno Sá
135637745d scripts: git: add option for untracked files
By default 'git status' will look for untracked files and the script will
always detect that the local tree has changes if untracked files are
present. That is not always optimal since sometimes we might have, for
example, some custom build scripts (for some project) that is always
present and we don't want the status bar to always indicate changes.

Hence, add an option to disable this behavior by adding the '-uno' flag
to 'git status'. The default behavior is still maintained.

Signed-off-by: Nuno Sá <noname.nuno@gmail.com>
2022-09-05 16:07:43 +02:00
Ethan Edwards
150daf31e1
Merge pull request #166 from jihedmastouri/patch-1 2022-08-10 12:31:44 -04:00
Jihed Mastouri
8012d2164a
Battery Status for Fedora 36 2022-08-10 14:14:17 +01:00
Ethan Edwards
d7b836ad27
Merge pull request #156 from rojosinalma/tmux_doc_options 2022-07-13 12:18:22 -04:00
Ethan Edwards
5b282b043f
Merge pull request #157 from pholawat-tle/master 2022-05-12 15:04:13 -04:00
Pholawat
95d3aa8144
include @dracula-battery-label option in INSTALL.md 2022-05-11 15:58:58 +07:00
Pholawat
49f212207e
import utils.sh in battery.sh 2022-05-11 15:53:37 +07:00
Rojo
42eaf7a950
No defaults 2022-03-27 23:31:33 +02:00
Rojo
7706970741
Update docs to include weather options 2022-03-27 23:28:41 +02:00
Lucas de França
bb92bb5e64 📝 Update readme 2022-03-20 22:37:01 -03:00
Ethan Edwards
a966029b99
Merge pull request #144 from adrianmihalko/master
Ping plugin
2021-12-23 09:58:01 -05:00
adrianmihalko
a0987b8b96 Update network_ping.sh 2021-12-23 00:55:35 +01:00
adrianmihalko
45ad8cdafd Update dracula.sh 2021-12-23 00:51:47 +01:00
adrianmihalko
41d32c0af3 Ping plugin 2021-12-23 00:50:24 +01:00
Ethan Edwards
257bc1f199
Merge pull request #143 from adrianmihalko/master
Add load average support
2021-12-22 17:47:40 -05:00
adrianmihalko
5535270397 Update docs
Add detailed explanation
2021-12-22 23:32:41 +01:00
adrianmihalko
cf68dcc762
Merge branch 'dracula:master' into master 2021-12-22 23:12:15 +01:00
adrianmihalko
2dbd75cadf Add load average support 2021-12-22 23:11:09 +01:00
Ethan Edwards
a098a4f364
Merge pull request #141 from adrianmihalko/master
Enable custom location for weather plugin
2021-12-22 14:32:27 -05:00
adrianmihalko
b06419366c Enable custom location for weather plugin 2021-12-03 18:49:34 +01:00
Ethan Edwards
78869c38cc
Merge pull request #139 from alecho/battery-label
Add battery icon option
2021-10-30 02:25:54 -04:00
Andrew Lechowicz
9b2cadc8e1
Add battery icon option 2021-10-24 20:49:23 -04:00
Ethan Edwards
952e02222e
Merge pull request #135 from xiao0yy/patch-1
Support for top version of procps-ng
2021-10-23 12:25:26 -04:00
xiao0yy
7592fdd0fd
Reduce the execution time of top command 2021-10-15 16:56:54 +08:00
Ethan Edwards
cce69791b6
Merge pull request #133 from foxtrot/step-bandwidth-units
Show network bandwidth in gB/s and mB/s when required
2021-10-14 14:38:09 -04:00
Ethan Edwards
0b4954180c
Merge pull request #130 from ethancedwards8/cleanup-ram
Cleanup RAM file
2021-10-14 14:18:07 -04:00
xiao0yy
16aa5f080c
Support for top version procps-ng 2021-10-13 16:56:34 +08:00
Ethan Edwards
a92fc1913b
Merge pull request #131 from foxtrot/add-git-to-website 2021-10-10 07:25:14 -04:00
Marc
2f96680973
Show bandwidth in gB/s and mB/s when required 2021-10-10 04:44:40 +01:00
Marc
26c3123817
Add missing git feature to INSTALL.md plugin list 2021-10-10 02:27:26 +01:00
Ethan Edwards
874374444c
Merge pull request #123 from foxtrot/fix-bandwidth-typo
Fix typos in network_bandwith -> network_bandwidth
2021-10-09 19:56:10 -04:00
Ethan Edwards
67f7e5ecf8 Cleanup RAM file 2021-10-09 19:48:10 -04:00
Marc
b3f05ca19d
Merge branch 'master' of github.com:dracula/tmux into fix-bandwidth-typo 2021-10-10 00:25:43 +01:00
Ethan Edwards
6110aac167
Merge pull request #127 from mklbravo/feature/network-bandwidth-format
Enhancement: Network Bandwidth display format
2021-10-09 18:49:13 -04:00
Mikel Bravo
4eaa335c7c
Shows leading 0. on network bandwidth values 2021-09-22 16:46:53 +02:00
Marc
c558b6b024
Fix typos in network_bandwith -> network_bandwidth 2021-09-13 22:00:18 +01:00
Ethan Edwards
afd4d17996
rename workflow 2021-08-26 16:27:14 -04:00
Ethan Edwards
13fe1ca5c5
Merge pull request #120 from joeperri95/master
Add bash script syntax check
2021-08-26 16:22:38 -04:00
joeperri95
f6842fae34 Add bash script syntax check 2021-08-25 01:40:24 -04:00
Ethan Edwards
ee73724f02
Merge pull request #119 from arturts/fix-ram-info-for-different-page-sizes
Fix $used_mem when page size is not 4Kb
2021-08-24 20:40:01 -04:00
Artur Tsuda
d075e4d048
Fix $used_mem when page size is not 4Kb 2021-08-10 17:02:34 -03:00
Ethan Edwards
a66adddfc7
Merge pull request #112 from aug0stus/fix-right-status-spacing
Fix right status spacing
2021-07-30 14:31:08 -04:00
August Feng
f863305ef8 Fix spacing between status elements
Only the most right status element seemed to be padded with a space, for
the non-powerline configuration. The powerline configuration seems to
embed padding by the seperator, and thus requires a pad on the last
element.

This commit moves the padding next to the seperator to the script
output instead.

Remove trailing newline

Uniformalizes to the other scripts.
2021-07-30 14:19:52 -04:00
Ethan Edwards
9705766ba2
Merge pull request #104 from joeperri95/master
Issue #67 Add git functionality
2021-07-29 14:21:12 -04:00
Ethan Edwards
c5f46a5d47
Merge pull request #114 from codeeno/fix-time-color-configuration
Fix incorrect color option being read for the time module
2021-07-29 13:53:04 -04:00
joeperri95
e0203af1ed Update to new plugin scheme 2021-07-26 22:57:16 -04:00
eeno
8ea687e327 fix incorrect color option being read for the time colors 2021-07-26 23:30:03 +02:00