1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Commit graph

6525 commits

Author SHA1 Message Date
Mauricio Wolff
bccfe1389c
updater: add --autostash to git pull (#7172)
If I have custom configs (like theme customizations) I have to stash my changes and get them back after the update. 

By adding the --autostash on upgrade.sh, if I have any changes not commited they'll be reapplied after the upgrade, allowing me to have temporary customizations without any harm to the upgrade process.
2020-02-27 17:06:20 +01:00
Marc Cornellà
6cb8ff391d vagrant: document aliases 2020-02-27 15:21:10 +01:00
Marc Cornellà
3c61bac9a1
vagrant: add common aliases (#3762) 2020-02-27 15:20:19 +01:00
wallace11
01bfb57446
zsh-interactive-cd: add vi-mode support (#8681) 2020-02-26 16:59:59 +01:00
Michael Dorst
1a880fdb9b
installer: add option to install without replacing .zshrc (#8209)
* Add option to install OMZ without replacing .zshrc

tools/install.sh respects REPLACE_RC environment variable
--noreplace-rc flag sets REPLACE_RC='no'

* Change REPLACE_RC=no to KEEP_ZSHRC=yes

Change --noreplace-rc to --keep-zshrc
2020-02-25 22:42:39 +01:00
Marc Cornellà
609890847d
npm: hardcode completion function and delete cached one (#8679)
Fixes #8665
2020-02-25 22:23:37 +01:00
Marc Cornellà
3e9e385d98 battery: remove redundant grep calls in battery_pct function 2020-02-25 15:41:17 +01:00
Marc Cornellà
d959283898 avit: fix prompt sequence (fixes #8678) 2020-02-25 12:21:06 +01:00
Yahav Itzhak
b72607bc8e
Add JFrog CLI plugin (#8250) 2020-02-25 12:00:25 +01:00
Marc Cornellà
7290a08bf6 battery: fix floating point output in macOS
Fixes #8676
2020-02-25 11:56:26 +01:00
Jonathan Chang
0e57142729
installer: remove redundant cp command (#8668) 2020-02-24 20:39:10 +01:00
Marc Cornellà
40b013f5f1 lib: delete upgrade lock in upgrade_oh_my_zsh
Provides a different solution to #8332 and #8333
2020-02-24 20:27:21 +01:00
Andy Pickle
f9a2d8cae3
vscode: add documentation for running in macOS (#8674) 2020-02-24 20:13:16 +01:00
Marc Cornellà
bc9fe7423f
Merge pull request #8651 from mcornella/random-theme-refactor
Add random theme and consolidate logic from init and themes plugin
2020-02-19 20:26:45 +01:00
Marc Cornellà
3d4890dcc0 Add blacklist variable for random theme
Co-authored-by: Fran Garcia <fran.miranda@gmail.com>
2020-02-19 20:00:22 +01:00
Marc Cornellà
f4b4a446ac Polish themes plugin and error out if theme not found 2020-02-19 19:41:02 +01:00
Marc Cornellà
b297bf9296 Add themes in $ZSH_CUSTOM to the pool of candidates
Also add comments and unset leftover variables, and print only the
name of the theme loaded.

When looking for $ZSH_CUSTOM themes, the chosen algorithm is to add
the theme names to the pool disregarding the path, and then source
whatever theme is selected with the same logic as the init script,
which is to source first custom themes even if there is another
default theme of the same name.

Co-authored-by: Mihai Serban <mihai.serban@gmail.com>
2020-02-19 19:34:16 +01:00
Willy Weiskopf
6adad5c300 Move random theme functionality into "random" theme
The statements for selecting a random theme in oh-my-zsh.sh and the themes
plugin are duplicate. Most people eventually settle on a theme, making those
lines in oh-my-zsh.sh superfluous. To address those, it may makes sense to put
the random theme functionality into a theme of its own (since themes are just
zsh scripts.
2020-02-19 18:20:28 +01:00
Marc Cornellà
d76258ff55 avit: add years since last commit if appropriate 2020-02-19 18:19:46 +01:00
Marc Cornellà
77813a330b avit: clean up theme code 2020-02-19 17:24:20 +01:00
Marc Cornellà
443ad88024 avit: replace custom prompt functions with OMZ ones
Fixes #8637
2020-02-19 16:53:32 +01:00
Marc Cornellà
c1b798aff3
agnoster: fix bzr prompt with breezy installed (#8646)
* Change indentation to 2 spaces in prompt_bzr function
* Check if in a bzr repository and optimize bzr calls in prompt_bzr
2020-02-19 00:16:54 +01:00
Sir Mobus Gochfulshigan Dorphin Esquire XXIII
eeb49bf5b0
systemd: add prompt function to show systemd units' status (#7657)
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
2020-02-18 23:04:14 +01:00
Marc Cornellà
de261bd29c af-magic: fix virtualenv prompt suffix 2020-02-18 22:28:58 +01:00
Ujwal Dhakal
e8609b857c
git: add grename to rename a local branch and in the origin remote (#8622)
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
2020-02-18 21:05:52 +01:00
Marc Cornellà
d49397a01d af-magic: fix dashed separator sizing and refactor
Fixes #8081
2020-02-18 19:18:23 +01:00
Kshitij Nikhal
47eae26bf6
web-search: add wolframalpha search engine (#8638) 2020-02-18 10:20:54 +01:00
Marc Cornellà
1381da15a4
arcanist: document aliases 2020-02-17 17:47:43 +01:00
Alexandre GOMES
fbbfd0f8a8
arcanist: add arc diff --create alias (#8610) 2020-02-17 17:44:48 +01:00
Harry
0bcecf2f63
dotnet: use official dotnet completion (#8518) 2020-02-15 19:19:57 +01:00
Roman
aa4146a9a4
git: add alias for git stash --include-untracked (#8617) 2020-02-15 18:28:02 +01:00
Manuel Silva
72168aec3d
cloudapp: fix copy-paste mistake in README (#8629) 2020-02-15 18:26:20 +01:00
Roey Darwish Dror
52f9238b16
fzf: support for NixOS and Void Linux (#8618) 2020-02-13 18:57:52 +01:00
Marco Seguri
4fc570b0d4
kubectl: avoid conflict with existing f aliases in kca alias (#8625) 2020-02-13 18:50:56 +01:00
Marc Cornellà
f17e0219fd dotenv: fix prompt newline 2020-02-13 18:33:24 +01:00
Maxime Richard
634a50936a
dotenv: add ZSH_DOTENV_PROMPT config (#8624) 2020-02-13 18:10:59 +01:00
Jonatan Ivanov
a6df94d2c6
gradle: run gradle command instead of alias (#8620)
- Similarly to the mvn plugin
- Without this fix, the shell crashes in some cases
2020-02-12 21:52:47 +01:00
Henry Chang
3ec04997eb Add zsh-interactive-cd plugin 2020-02-12 18:37:28 +01:00
Mazin Ahmed
e178ae39b4
dotenv: prompt before executing dotenv file (#8606)
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
2020-02-12 17:51:40 +01:00
Marc Cornellà
ebaccba6d8 battery: merge branch 'refactor-battery-plugin'
Closes #4726
Closes #4774
Closes #8275
2020-02-12 16:03:08 +01:00
GregoireW
15a03744a9 Remove invalid batteries (#8275) 2020-02-12 16:02:22 +01:00
Bruce Weirdan
b8b8762915 Report only active battery (#4726)
On a system with multiple batteries (like thinkpads) report percentage
and time remaining only for the active battery (the one being
discharged).

Ideally we should report all batteries, but acpi only shows time remaining
for the active battery. Also callers of these functions expect a single
return value. This is still better than reporting 596% remaining (like it
did on my laptop).

For the reference, the output of acpi command with multiple batteries looks
like this:

    Battery 0: Unknown, 5%
    Battery 1: Discharging, 86%, 03:14:04 remaining
2020-02-12 15:29:57 +01:00
Marc Cornellà
5f6f7b6e8d Various syntax fixes and function naming equivalence
- Fix code style
- Fix local definitions
- Don't declare unnecessary variables
- Use `command` before grep
2020-02-11 21:25:38 +01:00
Marc Cornellà
39e61614f2 Clean up Linux battery commands and syntax 2020-02-11 21:25:38 +01:00
Marc Cornellà
1bd7a7ad21 Fix calculation for battery percentage (#4774)
Co-authored-by: Michael Wolman <michael.s.wolman@gmail.com>
2020-02-11 21:25:38 +01:00
Marc Cornellà
17428f3c9a lib: load bash completion functions automatically
Fixes #8614
2020-02-11 20:16:43 +01:00
Marc Cornellà
561e7169ac jump: fix for `marks' and CTRL+G key binding
- marks printed an error when $MARKPATH didn't exist or didn't have any marks
  in it.
- The CTRL+G key binding overwrote an argument when it couldn't match it to
  an existing mark.
2020-02-11 20:12:01 +01:00
hqingyi
3c5bbcf5b9 jump: add support for directories starting with a dot (#4661)
Closes #4661
2020-02-11 19:51:56 +01:00
Marc Cornellà
bc67a55fe8 jump: fix issues in plugin and document CTRL+G key binding
- Fixes `readlink -e` dependency which isn't supported in macOS
  (fixes #3235).
- Uses native zsh wildcard expansion instead of calls to `ls`.
- Prepends commands with `command` and `builtin` to bypass aliases
  and functions.
- Documents CTRL+G key binding to substitute mark name in the command
  line with the mark path (https://github.com/ohmyzsh/ohmyzsh/pull/2045#issuecomment-22826540).
2020-02-11 19:41:43 +01:00
Umberto Nicoletti
9dffb3191d
vagrant: obey VAGRANT_CWD when completing vagrant commands (#7219) 2020-02-11 18:46:56 +01:00