Commit Graph

36 Commits

Author SHA1 Message Date
Carlo Sala dcff7a7f08
fix(theme-and-appearance): make bsd `ls` to be default 2023-05-09 12:05:15 +02:00
Carlo Sala c5208867f1 feat(theme-and-appearance): allow disabling gnu-ls in bsd
To disable gnu-ls (`gls`) even if it's installed in freeBSD and macOS
you can set it up with:
```zsh
zstyle ':omz:lib:theme-and-appearance' gnu-ls no
```

Closes #11647
2023-05-06 13:39:01 +02:00
Marc Cornellà 72732a224e
fix(lib): set equivalent LS_COLORS and LSCOLORS variables
As reported by https://geoff.greer.fm/lscolors

Fixes #11554
2023-03-12 15:47:58 +01:00
Marc Cornellà d342b353e3
fix(init): set completion colors on theme load, not with `precmd`
This fixes an edge case where the user actually sets

  zstyle ':completion:*' list-colors

in their zshrc, but the previous code used a precmd hook, which would
override the user changes. With this change our modifications will be
set in the init script, after the theme loads, so that later changes
can affect our defaults.

Note that this will not be run for users on plugin managers, as these
don't generally run our init script.
2023-03-07 18:54:06 +01:00
Marc Cornellà 95d0c4b603
refactor(theme-and-appearance): reorganize and clean up logic (#11529)
Co-authored-by: Andrew Janke <janke@pobox.com>
Co-authored-by: Marcelo Parada <marcelo.parada@axoninsight.com>
Co-authored-by: Uy Ha <hchanuy@gmail.com>
Co-authored-by: Valentin Uveges <valentin.uveges@gmail.com>
2023-03-03 14:38:50 +01:00
Marc Cornellà 277f38212a
refactor: reorganize setopts in lib folder 2023-02-24 20:55:31 +01:00
Carlo Sala aca048814b
fix(theme-and-appearance): avoid infinite recursion 2023-02-22 15:35:12 +01:00
Carlo Sala 8a68bf6772
fix(theme-and-appearance): test color ls with $ZSH directory
Fixes #11500
2023-02-16 12:54:23 +01:00
Carlo Sala 657ad0523d fix(theme-and-appearance): fix `diff` completion in macOS
Closes #11416
Closes #11454
2023-01-25 18:12:20 +01:00
michael-yuji f82aa81931
fix(lib): fix `diff --color` argument check for BSD systems (#10269) 2021-10-10 19:15:24 +02:00
Marc Cornellà d0d01c0bbf lib: prefix diff call with command to bypass diff aliases
See https://github.com/ohmyzsh/ohmyzsh/pull/8807#issuecomment-652697704
2020-07-06 17:17:40 +02:00
Monson Shao 62648d71bb
lib: enable diff color (#8807) 2020-07-01 20:51:13 +02:00
Andrew Janke 299cd4777a Themes: switch to using ruby_prompt_info()
Changes themes displaying RVM or other Ruby version info to use the central
ruby_prompt_info function. This supports more Ruby versioning mechanisms,
reduces copy-and-paste code, and avoids "zsh: no such file or directory: rvm-prompt"
when run on machines that do not have RVM installed.

Changes the prefix/suffix variable names to ZSH_THEME_RUBY_PROMPT_PREFIX and
ZSH_THEME_RUBY_PROMPT_SUFFIX, since they apply to all Ruby versioning mechanisms,
not just RVM.

Allows empty ZSH_THEME_RUBY_PROMPT_PREFIX and ZSH_THEME_RUBY_PROMPT_SUFFIX.
2019-05-08 08:45:34 +02:00
Yannis Mitsos cfd30e9e5c Colored ls output in FreeBSD #7565 2019-04-22 17:24:48 +03:00
Marc Cornellà 30594886bf
lib: delete PS1 default
A default PS1 doesn't make sense: the user will either choose a theme or not
care about a default prompt since they can set it themselves.

Fixes #7054
2019-04-08 23:01:55 +02:00
mingang.he 0b340bc3a5 Fix #5604: No DIR ( directory ) colors (#5605) 2016-11-03 14:10:08 +01:00
Eduardo Cuomo 40544a1d5d Fix invalid "ls -G" alias. 2016-11-02 15:42:38 +01:00
Marc Cornellà 1b799e9762 Check dircolors settings before using gls on darwin (#5570)
`gls` seems to be installed by default or on most macOS systems, but its
default color scheme sucks. This fix will make sure to only use it if it
has been customised prior to running OMZ.

Related: #5516, #5520.
2016-11-02 15:39:28 +01:00
Marc Cornellà c24dfa1ab4 Fix ls coloring in MacOS if gls is not installed
Fixes #5520.
2016-10-11 09:24:43 +02:00
rossmcf 628d0bb106 Fix ls colouring for Darwin. (#5516) 2016-10-10 23:08:54 +02:00
Hong a56eac7a71 Use OSTYPE instead of uname whenever possible for better speed. (#5496) 2016-10-10 22:24:30 +02:00
Hong 98cd3973d2 Take advantage of LS_COLORS for the color of completion if GNU ls is used. (#5510) 2016-10-10 20:40:17 +02:00
Marc Cornellà c2e3a410ea Fix style of theme-and-appearance.zsh 2016-10-04 01:30:01 +02:00
Marc Cornellà 6304a789ab Only set default LS_COLORS if not set before
Also, force the use of Bourne-style shell syntax with `dircolors -b`.
2016-10-04 01:29:47 +02:00
Marc Cornellà 6c08286c8e Use `$commands[]` to check for command existence 2016-10-04 01:27:19 +02:00
Hong Xu efa7c7b7ff set better default colors for GNU ls instead of none.
GNU coreutils ship a color setup command by default which can be used to
set a good default color theme for ls:

  https://www.gnu.org/software/coreutils/manual/html_node/dircolors-invocation.html
2016-10-04 01:06:36 +02:00
Marc Cornellà cc36063cfd Cleanup theme-and-appearance.zsh 2016-05-12 13:23:46 +02:00
Marc Cornellà ed484dfaf6 Delete cdablevars option by default
Fixes weird autocompletion of directories and named users.
Fix #4864
2016-05-12 13:22:27 +02:00
Robby Russell 5e45c16701 Merge pull request #2751 from drm00/fix-openbsd-colorls
add check for colored ls on openbsd. (retry of #2225)
2015-09-19 08:46:13 -07:00
Marc Cornellà 2193135ebc Clean up appearance lib file and redundant `colors` calls in other files 2015-02-10 19:22:50 +01:00
drm00 f516b7c7f5 add check for colored ls on openbsd. (retry of #2225) 2014-04-25 14:15:14 +02:00
Petter Abrahamsson a7540844d5 Add support for colored ls output on OpenBSD 2013-11-14 07:06:54 -05:00
Cosmin Lu?ă e5736d3910 Fixed coding style 2013-01-03 14:44:17 +02:00
Cosmin Lu?ă fa355a798c Fixed issue with NetBSD's ls 2012-12-31 14:02:22 +02:00
Robby Russell 452eeed890 Merge branch 'nicoulaj-theme' of https://github.com/nicoulaj/oh-my-zsh into nicoulaj-nicoulaj-theme 2011-02-21 21:45:00 -08:00
Julien Nicoulaud f624889aa4 Rename appearance.zsh so that it gets loaded after spectrum.zsh.
Allows to use 256 colors in prompt themes.
2010-11-20 18:06:23 +01:00
Renamed from lib/appearance.zsh (Browse further)