From e7aef9d18b2f7cf75c339e2840fff2c2ca9eee7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Mar 2020 23:39:40 +0100 Subject: [PATCH 1/2] =?UTF-8?q?zsh-powerlevel10k=20v1.2.0=20=E2=86=92=20v1?= =?UTF-8?q?.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7daa8fa1fd75..35355bf29759 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1hvhql7564j6n6xwg4wckzvzs4fk5zlrdxkx5nd9i3g2d477nbac"; + sha256 = "1w2iy9anc3cxb5kffrdz8knml8nsl6v3lcrdsigfzfp0zignb4cw"; }; patches = [ From 4307ef63edf7d1dc8c6c7ada29caeacbf8320a9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Mar 2020 23:52:49 +0100 Subject: [PATCH 2/2] =?UTF-8?q?gitstatusd:=20unstable-2020-02-26=20?= =?UTF-8?q?=E2=86=92=20unstable-2020-03-06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../git-and-tools/gitstatus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index ee4cc61c63f9..57caada72b54 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-02-26"; + version = "unstable-2020-03-06"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49"; - sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m"; + rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; + sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh ''; installPhase = '' - install -Dm755 gitstatusd $out/bin/gitstatusd + install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.zsh $out '';