Remove zsh-autopair and package zsh-history-substring-search

Autopair is a bit annoying.

I've been missing zsh-history-substring-search though, so package it.

1 files changed, 41 insertions, 19 deletions

diff --git a/tw/packages/shell.scm b/tw/packages/shell.scm
index b1ea15f9..d46820d6 100644
--- a/tw/packages/shell.scm
+++ b/tw/packages/shell.scm
@@ -7,24 +7,46 @@
 
 (define-public zsh-completions
   (package
-   (name "zsh-completions")
-   (version "0.34.0")
-   (source (origin
-	    (method git-fetch)
-	    (uri (git-reference
-		  (url "https://github.com/zsh-users/zsh-completions")
-		  (commit version)))
-	    (file-name (git-file-name name version))
-	    (sha256 (base32 "0jjgvzj3v31yibjmq50s80s3sqi4d91yin45pvn3fpnihcrinam9"))))
-   (build-system copy-build-system)
-   (arguments '(#:install-plan '(("src/" "share/zsh/site-functions/")
-				 ("README.md" "share/doc/zsh-completions/"))))
-   (inputs (list zsh))
-   (home-page "https://github.com/zsh-users/zsh-completions")
-   (description "Additional completion definitions for Zsh")
-   (synopsis "This projects aims at gathering/developing new
+    (name "zsh-completions")
+    (version "0.34.0")
+    (home-page "https://github.com/zsh-users/zsh-completions")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference (url home-page) (commit version)))
+	      (file-name (git-file-name name version))
+	      (sha256 (base32 "0jjgvzj3v31yibjmq50s80s3sqi4d91yin45pvn3fpnihcrinam9"))))
+    (build-system copy-build-system)
+    (arguments '(#:install-plan '(("src/" "share/zsh/site-functions/")
+				  ("README.md" "share/doc/zsh-completions/"))))
+    (synopsis "Additional completion definitions for Zsh")
+    (description "This projects aims at gathering/developing new
 completion scripts that are not available in Zsh yet.  The scripts may
 be contributed to the Zsh project when stable enough.")
-   (license (license:non-copyleft
-	     "file://LICENSE"
-	     "Custom BSD-like, permissive, non-copyleft license."))))
+    (license (license:non-copyleft
+	      "file://LICENSE"
+	      "Custom BSD-like, permissive, non-copyleft license."))))
+
+(define-public zsh-history-substring-search
+  (package
+    (name "zsh-history-substring-search")
+    (version "1.0.2")
+    (home-page "https://github.com/zsh-users/zsh-history-substring-search")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference (url home-page) (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256 (base32 "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y"))))
+    (build-system copy-build-system)
+    (arguments '(#:install-plan
+                 '(("zsh-history-substring-search.plugin.zsh"
+                    "share/zsh/plugins/zsh-history-substring-search/")
+                   ("zsh-history-substring-search.zsh"
+                    "share/zsh/plugins/zsh-history-substring-search/")
+                   ("README.md"
+                    "share/doc/zsh-history-substring-search/"))))
+    (synopsis "ZSH port of Fish history search (up arrow)")
+    (description "This is a clean-room implementation of the Fish shell's
+history search feature, where you can type in any part of any command from
+history and then press chosen keys, such as the UP and DOWN arrows, to cycle
+through matches.")
+    (license license:bsd-3)))