Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a 'theme' for OMP, so the internal themes don't clash with it. #2100

Merged
merged 7 commits into from
Mar 6, 2022

Conversation

ira-bv
Copy link
Contributor

@ira-bv ira-bv commented Mar 1, 2022

Description

oh-my-posh is a shell theme tool written in golang, and invoking it clashes with the internal themes of bash-it, so this is my proposed way of integrating them.

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

see #2099

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

Copy link
Member

@NoahGorny NoahGorny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ira-bv, I had a couple of comments :)

themes/oh-my-posh/oh-my-posh.theme.bash Outdated Show resolved Hide resolved
themes/oh-my-posh/oh-my-posh.theme.bash Outdated Show resolved Hide resolved
themes/oh-my-posh/default.omp.json Outdated Show resolved Hide resolved
docs/themes-list/index.rst Outdated Show resolved Hide resolved
docs/themes-list/index.rst Outdated Show resolved Hide resolved
…omp-theme

* 'master' of https://github.com/bash-it/bash-it:
  Fix knife completion (Bash-it#2098)
  plugin/battery: fix tests
  Remove executable bit.
  lib/helpers: `_bash-it-find-in-ancestor()`
  lib/utilities: `_bash-it-component-item-is-enabled()`
  lib: rename `_bash-it-clean-component-cache()`
  lib/utilities: use `$XDG_CACHE_HOME` properly
  lib/utilities: `_bash-it-component-item-is-enabled()`
  lib/utilities: >|
  lib/helpers: fix extraneous quotes from `_bash-it-grep()`
  bash-it update: show change log once
  lib/theme: handle undefined parameter
  lib/helpers: the last remnants of the `$OSTYPE` have been swept away
  lib/search: fix variable scope
  lib/helpers: handle unbound parameters
  lib/helpers: cleanup `_bash-it-profile-load-parse-profile()` a bit
  lib/helpers: handle unbound positional parameters
  fix wrong function name in `helpers.bash`
@ira-bv ira-bv requested a review from NoahGorny March 2, 2022 07:50
Copy link
Member

@NoahGorny NoahGorny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ira-bv
I approve the PR, yet I am still unsure whether we should merge the warnings into one or not

themes/oh-my-posh/oh-my-posh.theme.bash Outdated Show resolved Hide resolved
…omp-theme

* 'master' of https://github.com/bash-it/bash-it: (52 commits)
  lib/command_duration: tests & whitespace
  lib/command_duration: adopt `_bash_it_library_finalize_hook`
  lib/command_duration: rename `theme/command_duration.theme`
  plugin/cmd-returned-notify: Rewrite to match/use `lib/command_duration`
  lib/command_duration: Refactor using `$EPOCHREALTIME`
  lib/command_duration: dynamic clock hand
  lib/command_duration: remove temporary files
  lib/appearance: export `$CLICOLOR` instead of `$LSCOLOR`
  lib/appearance: `shellcheck` && `shfmt`
  plugin/battery: fix handling of multiple batteries with `upower`
  Revert dc380e9
  test/battery: fix tests…
  test/base: lose old TravisCS skip
  lib/theme: use `_command_exists()` in `rbenv_version_prompt()`
  lib/theme: `local hg_root` in `hg_prompt_vars()`
  lib/theme: improve performance of `scm()`
  lib/theme: export `$LS_COLORS` et al
  lib/theme: parameter cleanup
  lib/theme: eliminate a lot of subshells
  lib/theme.githelpers: remove dead code
  ...
@ira-bv ira-bv requested a review from NoahGorny March 6, 2022 08:11
@NoahGorny NoahGorny merged commit ec6d371 into Bash-it:master Mar 6, 2022
DaiTengu pushed a commit to DaiTengu/bash-it that referenced this pull request Mar 9, 2022
…ash-it#2100)

* Add a 'theme' for OMP, so the internal themes don't clash with it.

* Add theme to clean_files

* Add screenshot to the docs

* Correct the name of the default theme in the docs.

* keeping it cleaner

Co-authored-by: Ira Abramov <github@ira.abramov.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants