The comment at the top of git-and-tools/default.nix said:
/* All git-relates tools live here, in a separate attribute set so that users
* can get a fast overview over what's available.
but unfortunately that hasn't actually held up in practice.
Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing. In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).
So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix. This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.
The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before. I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
With the default configure flags, zsh compiles in a reference to the
"site function" directory that's outside the store path. Under the
right (wrong) circumstances, other builds using zsh can be affected by
these functions.
The required gitstatus version compatible with zsh-powerlevel10k has
been pinned, as even though it is written by the same author, gitstatus
has received updates which are not yet compatible with zsh-p10k.
Fixes: #101946
Related:
- 9fc5e7e473
- 593e11fd94
- 508ae42a0f
Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).
Here's the new script I used:
```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
| jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
| sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
I will also add this script to `maintainers/scripts`.
- use fetchFromGitHub instead of fetchgit
- indent the `installPhase` properly
- remove unused `pathsToLink`
- don't hardcode `phases` to allow patching
- don't copy from $src, but . to allow patching
Changes since the last release
New and changed parameters
POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER can now be set to last (equivalent to true from older versions) or first (new feature).
Bug fixes
gitstatus once again works on 32-bit ARM Linux (armv6l and armv7l).
Changes since the last release
Bug fixes
Configuration wizard no longer redraws screen every second
Configuration wizard no longer prints spurious errors before the charset screen
Configuration wizard once again honors prompt frame selection
Changes since the last release
Wizard
Configuration wizard now reacts to terminal size changes in real time and can function at much smaller terminal dimensions.
Configs with prompt_char now have vi_mode disabled by default.
Generated configs now unset DEFAULT_USER.
Classic and Rainbow configs now set POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND. This makes it easier to define 3-line prompt.
New parameters
If POWERLEVEL9K_CONFIG_FILE is set, configuration wizard will write configs to the specified location instead of the default ${ZDOTDIR:-~}/.p10k.zsh.
gitstatus
Support older macOS versions (at least El Capitan; even older versions might work).
Support Linux on armv6, i386 and i686.
Support cygwin and msys2 on i686.
macOS builds now use iconv from Homebrew.
gitstatusd binaries are now being built with https://github.com/romkatv/gitstatus/blob/release/mbuild.
Misc
The default icon for proxy segment is now ↔ instead of ⮂. The old icon is missing in many fonts.
Bug fixes
gitstatus once again works on 64-bit Linux without glibc.
Instant prompt no longer gets gradually slower over time when XDG_HOME_CACHE is on a slow filesystem.
Instant prompt no longer prints spurious erros when XDG_HOME_CACHE is on NTFS.
The old-style (and discouraged) custom prompts now work on zsh 5.3.1.
Configuration wizard once again presents "extra icons" and "fluent prompt" options when using 12-hour time format.
Changes since the last release
New and changed parameters:
Two additional parameters are available in gcloud: P9K_GCLOUD_CONFIGURATION and P9K_GCLOUD_PROJECT_NAME.
gcloud segment can now be in two states: PARTIAL and COMPLETE. See documentation.
Wizard:
The screen asking whether to display current time now offers a choice between two formats: 24-hour and 12-hour.
os_icon is no longer bold.
Slanted and flat separators are now using glyphs from Box Drawing Unicode block. They should look much better in fonts with correctly sized Box Drawing glyphs.
gcloud now displays project name instead of project id whenever possible.
Bug fixes:
Powerlevel10k no longer resolves symbolic links when calling commands that might act differently depending on argv[0].
java_version now works properly when using AdoptOpenJDK.
Misc:
Arch Linux users can now install Powerlevel10k with pacman. See instructions.
There is a new version of MesloLGS NF (the recommended font) with better alignment of powerline glyphs and 44% larger icons (by area). iTerm2 users can upgrade by typing p10k configure. Users of other terminals can follow manual installation instructions.
Changes since the last release
New prompt segments:
package: shows npm name and version from package.json (disabled by default).
New and changed parameters:
P9K_OS_ICON: set by Powerlevel10k on initialization; can be used in user-defined prompt segments and *_EXPANSION parameters.
POWERLEVEL9K_ICON_PADDING: when set to moderate, some icons will have an extra space after them. This is meant to avoid icon overlap when using non-monospace fonts. When set to none, spaces are not added.
Performance improvement:
detect_virt prompt segment is now 50% faster.
Bug fixes:
Many terminal escape sequences are now terminated with BEL instead of ST. BEL is the standard terminator according to ECMA-48 §8.3.89 but Konsole doesn't understand it. Thankfully, all terminals appear to understand BEL as extension.
Superfluous spaces have been removed from vcs segment when using a monospace font and not using my_git_formatter.
Wizard:
Generated configs now set POWERLEVEL9K_ICON_PADDING in favor of *_VISUAL_IDENTIFIER_EXPANSION. The value of this parameters depends on the answers to the first few questions that concern terminal font capabilities.
Generated configs no longer attempt to work around misconfigured locale. The workarounds in Powerlevel10k proper are sufficient.
gitstatus:
Fix a regression on Linux systems where uname doesn't understand -o.
Fix a regression on Cygwin and MinGW when running on older versions of Windows.
Fix a bug that can result in occasional gitstatus initialization failure on WSL when using Powerlevel10k with Instant Prompt.
Changes since the last release
New prompt segments:
haskell_stack: haskell version from stack.
New and changed parameters:
POWERLEVEL9K_MODE can now be set to ascii for ASCII prompt.
The default value of POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES now contains env.
New parameter: POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY. Display java_version only in java project (sub)directories.
POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND now contains istioctl and kogito in all config templates. Thanks, @errantepiphany!
All *env segments now respect POWERLEVEL9K_*ENV_SHOW_SYSTEM. If set to false, the segment will be hidden if its content is "system". The default value is true.
nodenv now understand POWERLEVEL9K_NODENV_SOURCES, just like all other *env segments.
POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER now has useful semantics (incompatible with powerleve9k, where it was useless). If set to true, it'll remove the leading slash from the current directory if it's absolute. It no longer does anything if the directory is not absolute or if the leading character has been removed or changed by the shortener. This is meant for users who override POWERLEVEL9K_DIR_PATH_SEPARATOR.
Robustness improvements:
Powerlevel10k now works when there are no utf-8 locales on the machine.
Configuration wizard:
Lean, Classic and Rainbow styles now have an option to restrict prompt character set to ASCII.
Styles that require 256 colors are not offered when terminal cannot display 256 colors.
Rainbow and Classic styles now have an option to use flat heads. This option is offered in ASCII mode and when powerline glyphs are unavailable.
Configuration wizard now restores screen upon exit.
New segments in config templates: haskell_stack (enabled by default) and java_version (disabled by default).
Bug fixes:
Visual mode indicator now correctly switches back to command mode indicator after pressing d and similar when using Zsh >= 5.3. Visual mode indicator no longer gets displayed in Zsh prior to 5.3. Please upgrade Zsh if this matters to you.
*ENV_DIR parameters are now handled the same way as in the underlying *env projects.
Misc:
There is no longer an empty line at the top of the screen after hitting Ctrl-L or typing clear or reset, even with POWERLEVEL9K_PROMPT_ADD_NEWLINE=true and POWERLEVEL9K_TRANSIENT_PROMPT=always.
It's now possible to install powerlevel10k with Homebrew.
Subseparators are now displayed with the foreground color of the previous/next segment in left/right prompt. Used to be the other way around. Thanks, @ahaasler!
gitstatus:
make now produces usrbin/gitstatusd instead of ./gitstatusd.
build.zsh now puts the binary in usrbin subdirectory. If you place it in the same subdirectory of your gitstatus installation without changing the file name, gitstatus will pick it up automatically.
Changes since the last release
New segments:
wifi: shows WiFi data transfer speed; can optionally display security level, SSID, etc.
asdf: tool versions from asdf.
taskwarrior: task counts from taskwarrior.
phpenv: PHP version from phpenv.
New parameters:
POWERLEVEL9K_${SEGMENT}_${STATE}_SHOW_ON_UPGLOB with regular fallback; this allows you to display a prompt segment only whethere is a file matching a certain pattern in the current directory, or in .., or in ../.., etc. For example: POWERLEVEL9K_NODE_VERSION_SHOW_ON_UPGLOB='package.json|node_modules' to show node_version segment only in Node project directories.
POWERLEVEL9K_VPN_IP_SHOW_ALL: if set to true, vpn_ip will show IPs from all matching network interfaces instead of just the first.
POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER: when set to true, drops path before the last marked directory (usually a Git repo root).
More fine grained control over battery colors: POWERLEVEL9K_BATTERY_${state}_{STAGES,LEVEL_BACKGROUND,LEVEL_FOREGROUND}.
Network transfer speed: P9K_IP_TX_RATE and P9K_IP_RX_RATE in ip segment.
Configuration wizard:
Gracefully handle non-writable ~/.zshrc.
New segments enabled by default: asdf, taskwarrior, phpenv.
New segments disabled by default: php_version, laravel_version.
Git status now displays VCS_STATUS_PUSH_COMMITS_{AHEAD,BEHIND}.
Git status now displays "─" when POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY is in effect.
Git status by default ignores the git repo rooted at $HOME; see POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN.
Pure style now has context on the very left; upstream: sindresorhus/pure#530.
When installing the recommended font for iTerm2, detect and attempt to delete (after confirmation from the user) other versions of MesloLGS NF.
New style: robbyrussell; not exposed through the wizard; enable it with source .../powerlevel10k/config/p10k-robbyrussell.zsh.
Prompt performance improvements:
Async worker chatter is now 2x faster.
Prompt rendering and gitstatus_query now run in parallel; this reduces prompt latency by up to 5ms.
Bug fixes:
truncate_to_last now behaves exactly like %1~.
Don't crap out when file names contain colon.
Don't crap out when using more than one prompt_char.
Don't crap out when PATH is empty.
gcloud now works when using non-default configs.
timewarrior segment now respects $TIMEWARRIORDB (thanks, @errantepiphany!).
Pick up ip and ifconfig tools from PATH (used to be /sbin/ip and /sbin/ifconfig).
SHOW_ON_COMMAND now works with legacy custom prompt segments.
Git status in Pure style now has correct number of spaces.
Robustness improvements:
Work around a bug in sysread in Zsh (fixed in Zsh 5.8).
Replace all wide icons with narrow by default (many terminals choke on wide icons).
Replace terraform icons with another (emacs crashes on the old icon).
Prompt should now function even when locale is misconfigured as long as there is at least one UTF-8 locale installed on the system.
Workarounds for Zsh bugs in handling of ZLE_RPROMPT_INDENT=0 are now applied in more cases.
gitstatus:
Support repositories where .git is a symbolic link.
Support repositories with preciousObjects extension.
Add VCS_STATUS_PUSH_{REMOTE_NAME,REMOTE_URL,COMMITS_AHEAD,COMMITS_BEHIND}: similar to VCS_STATUS_{REMOTE_NAME,REMOTE_URL,COMMITS_AHEAD,COMMITS_BEHIND} but for @push remote.
Add VCS_STATUS_NUM_SKIP_WORKTREE and VCS_STATUS_NUM_ASSUME_UNCHANGED: the number of files in the index with --skip-worktree and --assume-unchanged bits respectively`.
Support Cygwin on older versions of Windows
Completely rewritten Zsh API (similar to async worker in powerlevel10k); this makes startup about 5x faster and should be more robust.
The gitstatusd binary is now looked up as follows:
If GITSTATUS_DAEMON is an absolute path, use that.
Else if GITSTATUS_DAEMON is a valid command name (PATH lookup), use that.
Else if GITSTATUS_DAEMON is not empty, try $gitstatus_dir/{usrbin,bin}/$GITSTATUS_DAEMON (in this order).
Else try $gitstatus_dir/{usrbin,bin}/gitstatusd-$os-$arch{,-static} (in this order).
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.
This reverts commit 0be87c7979.
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.
This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
