From f8ffc142f635a368aa333d0f84effd2e17e017b3 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Thu, 15 Feb 2024 22:56:02 +0100 Subject: [PATCH 1/3] Bump pure zsh prompt to v1.22.0 --- modules/home-manager/cli/zsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index 8fde37b..bf92b7b 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -37,8 +37,8 @@ in src = pkgs.fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; - rev = "v1.21.0"; - hash = "sha256-YfasTKCABvMtncrfoWR1Su9QxzCqPED18/BTXaJHttg="; + rev = "v1.22.0"; + hash = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w="; }; } { From e4031d162670ea8eba3141c20e7ea1bfa68b612c Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 16 Feb 2024 00:06:55 +0100 Subject: [PATCH 2/3] zsh highlight is done with default configuration --- modules/home-manager/cli/zsh/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index bf92b7b..044a2ad 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -24,6 +24,10 @@ in searchDownKey = "^[OB"; searchUpKey = "^[OA"; }; + syntaxHighlighting = { + enable = true; + highlighters = [ "brackets" ]; + }; completionInit = '' autoload -Uz compinit for dump in ''${ZDOTDIR}/.zcompdump(N.mh+24); do @@ -50,15 +54,6 @@ in hash = "sha256-X89FsG9QICDw3jZvOCB/KsPBVOLUeE7xN3VCtf0DD3E="; }; } - { - name = "fast-syntax-highlighting"; - src = pkgs.fetchFromGitHub { - owner = "zdharma-continuum"; - repo = "fast-syntax-highlighting"; - rev = "v1.55"; - hash = "sha256-DWVFBoICroKaKgByLmDEo4O+xo6eA8YO792g8t8R7kA="; - }; - } { name = "history-search-multi-word"; src = pkgs.fetchFromGitHub { From 51142c3af0ff5679cb7575bce0163e715ef6a401 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 16 Feb 2024 00:54:17 +0100 Subject: [PATCH 3/3] Add some options for highlight theme --- modules/home-manager/cli/zsh/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index 044a2ad..23e4eb4 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -26,7 +26,11 @@ in }; syntaxHighlighting = { enable = true; - highlighters = [ "brackets" ]; + highlighters = [ "brackets" "main" ]; + styles = { + double-hyphen-option = "fg=blue"; + single-hyphen-option = "fg=blue"; + }; }; completionInit = '' autoload -Uz compinit