adopt zsh4humans

Author: danielmmetz

README.md

@@ -22,7 +22,7 @@ See [here for an example config](./settle.yaml).
 * cleans up packages no longer specified
 
 **Zsh Support**:
-* plugins using zinit
+* installing zsh4humans's .zshenv
 * configuring history size and history sharing
 * variables
 * aliases

install.sh

@@ -27,7 +27,7 @@
 
 set -euo pipefail
 
-version=0.0.13  # TODO integrate with releases.
+version=0.0.14  # TODO integrate with releases.
 
 settle_base=$(pwd)
 

internal/zsh/zsh.go

@@ -3,30 +3,31 @@ package zsh
 import (
 	"context"
 	"fmt"
+	"io"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 
-	"github.com/go-git/go-git/v5"
 	"golang.org/x/exp/slices"
 )
 
 type Zsh struct {
-	Zinit   []string `json:"zinit"`
-	History struct {
+	Zsh4Humans bool `json:"zsh4humans"`
+	History    struct {
 		Size          int  `json:"size"`
 		ShareHistory  bool `json:"share_history"`
 		IncAppend     bool `json:"inc_append"`
 		IgnoreAllDups bool `json:"ignore_all_dups"`
 		IgnoreSpace   bool `json:"ignore_space"`
 	} `json:"history"`
-	Paths       []string `json:"paths"`
-	Variables   []KV     `json:"variables"`
-	Aliases     []KV     `json:"aliases"`
-	Functions   []KV     `json:"functions"`
-	ExtraPrefix string   `json:"extra_prefix"`
-	ExtraSuffix string   `json:"extra_suffix"`
+	Paths     []string `json:"paths"`
+	Variables []KV     `json:"variables"`
+	Aliases   []KV     `json:"aliases"`
+	Functions []KV     `json:"functions"`
+	Prefix    string   `json:"prefix"`
+	Suffix    string   `json:"suffix"`
 }
 
 type KV struct {
@@ -39,7 +40,7 @@ func (z *Zsh) Ensure(ctx context.Context) error {
 		return nil
 	}
 
-	if err := z.ensureZinit(ctx); err != nil {
+	if err := z.ensureZsh4Humans(ctx); err != nil {
 		return fmt.Errorf("error ensuring zinit: %w", err)
 	}
 	home, err := os.UserHomeDir()
@@ -53,32 +54,44 @@ func (z *Zsh) Ensure(ctx context.Context) error {
 	return nil
 }
 
-const (
-	zinitURL = "https://raw.githubusercontent.com/zdharma-continuum/zinit/master/zinit.zsh"
-)
-
-func (z *Zsh) ensureZinit(ctx context.Context) error {
-	if len(z.Zinit) == 0 {
+func (z *Zsh) ensureZsh4Humans(ctx context.Context) error {
+	if !z.Zsh4Humans {
 		return nil
 	}
 
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return fmt.Errorf("unable to determine home dir: %w", err)
 	}
-	dstPath := filepath.Join(home, ".zinit", "bin", "zinit.zsh")
+	zshenv := filepath.Join(home, ".zshenv")
 
-	_, err = os.Stat(dstPath)
+	_, err = os.Stat(zshenv)
 	if err == nil {
 		return nil // file already exists
 	} else if err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
-	fmt.Println("installing Zinit")
-	_, err = git.PlainCloneContext(ctx, filepath.Join(home, ".zinit", "bin"), false, &git.CloneOptions{URL: "https://github.com/zdharma-continuum/zinit.git"})
+	fmt.Println("writing zsh4humans .zshenv file")
+	url := "https://raw.githubusercontent.com/romkatv/zsh4humans/v5/.zshenv"
+	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	if err != nil {
+		return fmt.Errorf("building request to fetch zsh4humans .zshenv: %w", err)
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("fetching zsh4humans .zshenv: %w", err)
+	}
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return fmt.Errorf("error cloning zinit: %w", err)
+		return fmt.Errorf("reading zsh4humans .zshenv body: %w", err)
+	}
+	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusBadRequest {
+		return fmt.Errorf("bad response fetching %s (%d): %s", url, resp.StatusCode, string(body))
+	}
+	if err := os.WriteFile(zshenv, body, 0o644); err != nil {
+		return fmt.Errorf("writing .zshenv: %w", err)
 	}
 	return nil
 }
@@ -87,13 +100,7 @@ func (z *Zsh) String() string {
 	var sb strings.Builder
 
 	// extra prefix
-	sb.WriteString(z.ExtraPrefix)
-	sb.WriteString("\n")
-
-	// zinit
-	for _, line := range z.Zinit {
-		sb.WriteString(fmt.Sprintf("zinit %s\n", line))
-	}
+	sb.WriteString(z.Prefix)
 	sb.WriteString("\n")
 
 	// history
@@ -147,7 +154,7 @@ func (z *Zsh) String() string {
 	sb.WriteString("\n")
 
 	// extra suffix
-	sb.WriteString(z.ExtraSuffix)
+	sb.WriteString(z.Suffix)
 	sb.WriteString("\n")
 	return sb.String()
 }

settle.yaml

@@ -99,22 +99,19 @@ brew:
     - vlc
 
 zsh:
-  zinit:
-    - ice pick=async.zsh src=pure.zsh
-    - light sindresorhus/pure
-    - light zdharma-continuum/fast-syntax-highlighting
-    - snippet OMZ::plugins/fasd/fasd.plugin.zsh
-    - snippet OMZ::plugins/fzf/fzf.plugin.zsh
+  zsh4humans: true
   history:
     size: 50000
     share_history: true
     inc_append: true
     ignore_all_dups: true
     ignore_space: true
+  paths:
+    - $HOME/go/bin
+    - $HOME/bin
   variables:
     - {name: DOTFILES, value: "$HOME/src/danielmmetz/dotfiles"}
     - {name: EDITOR, value: "nvim"}
-    - {name: PATH, value: "$PATH:$HOME/go/bin:$HOME/bin"}
     - {name: HOMEBREW_NO_AUTO_UPDATE, value: "1"}
   aliases:
     - {name: cat, value: "bat"}
@@ -126,29 +123,27 @@ zsh:
     - {name: vim, value: "nvim"}
     - {name: vimrc, value: "nvim $DOTFILES/nvim.yaml"}
     - {name: zshrc, value: "nvim $DOTFILES/settle.yaml"}
-  extra_prefix: |
-    if [[ ! -f $HOME/.zinit/bin/zinit.zsh ]]; then
-        echo "Installing DHARMA Initiative Plugin Manager (zdharma-continuum/zinit)…"
-        mkdir -p "$HOME/.zinit" && chmod g-rwX "$HOME/.zinit"
-        git clone https://github.com/zdharma-continuum/zinit "$HOME/.zinit/bin" && \
-            echo "Installation successful" || \
-            echo "The clone has failed."
-    fi
+  prefix: |
+    zstyle ':z4h:' auto-update      'no'
+    zstyle ':z4h:bindkey' keyboard  'mac'
+    zstyle ':z4h:' start-tmux       no
+    zstyle ':z4h:' term-shell-integration 'yes'
+    zstyle ':z4h:autosuggestions' forward-char 'accept'
+    zstyle ':z4h:fzf-complete' recurse-dirs 'no'
+    zstyle ':z4h:direnv'         enable 'no'
+    zstyle ':z4h:direnv:success' notify 'yes'
+    zstyle ':z4h:ssh:*'                   enable 'no'
+    # Anything that requires I/O must be done at this point.
+    z4h init || return
 
-    source "$HOME/.zinit/bin/zinit.zsh"
-    autoload -Uz _zinit
-    (( ${+_comps} )) && _comps[zinit]=_zinit
-  extra_suffix: |
-    _direnv_hook() {
-    trap -- '' SIGINT;
-      eval "$("/usr/local/bin/direnv" export zsh)";
-      trap - SIGINT;
-    }
-    typeset -ag precmd_functions;
-    if [[ -z ${precmd_functions[(r)_direnv_hook]} ]]; then
-      precmd_functions=( _direnv_hook ${precmd_functions[@]} )
-    fi
-    typeset -ag chpwd_functions;
-    if [[ -z ${chpwd_functions[(r)_direnv_hook]} ]]; then
-      chpwd_functions=( _direnv_hook ${chpwd_functions[@]} )
-    fi
+    z4h bindkey undo Ctrl+/   Shift+Tab  # undo the last command line change
+    z4h bindkey redo Option+/            # redo the last undone command line change
+
+    z4h bindkey z4h-cd-back    Shift+Left   # cd into the previous directory
+    z4h bindkey z4h-cd-forward Shift+Right  # cd into the next directory
+    z4h bindkey z4h-cd-up      Shift+Up     # cd into the parent directory
+    z4h bindkey z4h-cd-down    Shift+Down   # cd into a child directory
+
+    autoload -Uz zmv
+  suffix: |
+    # hello everybody