From 63c4239e0ca99e6ebafd67ce5d0a94b17c593cf5 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Sun, 19 Nov 2023 16:37:24 +1100 Subject: [PATCH 1/4] Install zsh-autopair plugin --- dot-config/zsh/zinit | 1 + 1 file changed, 1 insertion(+) diff --git a/dot-config/zsh/zinit b/dot-config/zsh/zinit index 5cbe2b1..2e2ef33 100644 --- a/dot-config/zsh/zinit +++ b/dot-config/zsh/zinit @@ -23,6 +23,7 @@ else fi zinit wait lucid light-mode for \ + hlissner/zsh-autopair \ mollifier/cd-gitroot \ atinit"dot-zsh-compinit" \ zdharma-continuum/fast-syntax-highlighting \ From cabd702cbe830396f81aa492c0e0e420db3403a3 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Sun, 19 Nov 2023 16:41:58 +1100 Subject: [PATCH 2/4] Move plugin setup to plugins.zsh --- dot-config/zsh/{zinit => plugins.zsh} | 0 dot-config/zsh/zshrc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename dot-config/zsh/{zinit => plugins.zsh} (100%) diff --git a/dot-config/zsh/zinit b/dot-config/zsh/plugins.zsh similarity index 100% rename from dot-config/zsh/zinit rename to dot-config/zsh/plugins.zsh diff --git a/dot-config/zsh/zshrc b/dot-config/zsh/zshrc index 70ce6e4..a829dfa 100644 --- a/dot-config/zsh/zshrc +++ b/dot-config/zsh/zshrc @@ -20,7 +20,7 @@ dot-zsh-compinit() { return 0 } -source $ZDOTDIR/zinit +source $ZDOTDIR/plugins.zsh for f in $ZDOTDIR/interactive/^*.zwc(N); source $f [[ -o login ]] && for f in $ZDOTDIR/interactive+login/^*.zwc(N); source $f From 5559156c59c66a9958646b36f077218e2097deeb Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Sun, 19 Nov 2023 16:42:26 +1100 Subject: [PATCH 3/4] Remove unused functions for old prompts --- .../zsh/functions/prompt_pure_set_title | 27 ------------------- .../zsh/functions/starship_pure_title_precmd | 3 --- .../zsh/functions/starship_pure_title_preexec | 3 --- 3 files changed, 33 deletions(-) delete mode 100644 dot-config/zsh/functions/prompt_pure_set_title delete mode 100644 dot-config/zsh/functions/starship_pure_title_precmd delete mode 100644 dot-config/zsh/functions/starship_pure_title_preexec diff --git a/dot-config/zsh/functions/prompt_pure_set_title b/dot-config/zsh/functions/prompt_pure_set_title deleted file mode 100644 index 21376f5..0000000 --- a/dot-config/zsh/functions/prompt_pure_set_title +++ /dev/null @@ -1,27 +0,0 @@ -#! zsh -# copied from https://github.com/sindresorhus/pure/blob/43aafe0b4dc05174c57ee623c03c64400e832ece/pure.zsh#L56 -setopt localoptions noshwordsplit - -# Emacs terminal does not support settings the title. -(( ${+EMACS} || ${+INSIDE_EMACS} )) && return - -case $TTY in - # Don't set title over serial console. - /dev/ttyS[0-9]*) return;; -esac - -# Show hostname if connected via SSH. -local hostname= -if [[ -n $prompt_pure_state[username] ]]; then - # Expand in-place in case ignore-escape is used. - hostname="${(%):-(%m) }" -fi - -local -a opts -case $1 in - expand-prompt) opts=(-P);; - ignore-escape) opts=(-r);; -esac - -# Set title atomically in one print statement so that it works when XTRACE is enabled. -print -n $opts $'\e]0;'${hostname}${2}$'\a' diff --git a/dot-config/zsh/functions/starship_pure_title_precmd b/dot-config/zsh/functions/starship_pure_title_precmd deleted file mode 100644 index 3498cc3..0000000 --- a/dot-config/zsh/functions/starship_pure_title_precmd +++ /dev/null @@ -1,3 +0,0 @@ -#! zsh -autoload prompt_pure_set_title -prompt_pure_set_title 'expand-prompt' '%~' diff --git a/dot-config/zsh/functions/starship_pure_title_preexec b/dot-config/zsh/functions/starship_pure_title_preexec deleted file mode 100644 index cd8e657..0000000 --- a/dot-config/zsh/functions/starship_pure_title_preexec +++ /dev/null @@ -1,3 +0,0 @@ -#! zsh -autoload prompt_pure_set_title -prompt_pure_set_title 'ignore-escape' "$PWD:t: $2" From 7a1c3fe32fe50f68121e58d2eec423a160dd3500 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Sun, 19 Nov 2023 16:48:47 +1100 Subject: [PATCH 4/4] Remove unused environment setup --- dot-config/zsh/interactive/desk | 14 -------------- dot-config/zsh/login/tiny-care-terminal | 14 -------------- 2 files changed, 28 deletions(-) delete mode 100644 dot-config/zsh/interactive/desk delete mode 100644 dot-config/zsh/login/tiny-care-terminal diff --git a/dot-config/zsh/interactive/desk b/dot-config/zsh/interactive/desk deleted file mode 100644 index 348f294..0000000 --- a/dot-config/zsh/interactive/desk +++ /dev/null @@ -1,14 +0,0 @@ -#! zsh -alias d=desk -alias d.='desk .' - -# Conveniently, the current desk never changes within a single shell session, -# so we can safely just set this once during shell startup. -psvar[1]=$DESK_NAME -# Extend the prompt with desk name display. -PROMPT="%(V.%F{242}%v%f .)$PROMPT" - -export DESK_DIR=$XDG_CONFIG_HOME/desk -if [[ -n $DESK_ENV ]]; then - source $DESK_ENV -fi diff --git a/dot-config/zsh/login/tiny-care-terminal b/dot-config/zsh/login/tiny-care-terminal deleted file mode 100644 index c235dde..0000000 --- a/dot-config/zsh/login/tiny-care-terminal +++ /dev/null @@ -1,14 +0,0 @@ -#! zsh -export TTC_WEATHER='Sydney, NSW' -export -UT TTC_REPOS ttc_repos , -ttc_repos=(~/projects) - -if [[ -r $XDG_DATA_HOME/twitter/api.zsh ]]; then - source $XDG_DATA_HOME/twitter/api.zsh - export TTC_CONSUMER_KEY=$twitter[consumer_key] - export TTC_CONSUMER_SECRET=$twitter[consumer_secret] - export TTC_ACCESS_TOKEN=$twitter[access_token] - export TTC_ACCESS_TOKEN_SECRET=$twitter[access_secret] -else - export TTC_APIKEYS=false -fi