Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

some todo notes, take @chris2's titlebar improvements and poke at com…

…pletions
  • Loading branch information...
commit 89d86d869c298642e809dfa7530b7ef2539cd07f 1 parent 7d51137
James Cox imajes authored
Showing with 53 additions and 21 deletions.
  1. +4 −0 README.textile
  2. +7 −4 completion.zsh
  3. +21 −1 key-bindings.zsh
  4. +21 −16 xterms.zsh
4 README.textile
View
@@ -59,3 +59,7 @@ h3. Send us your theme!
I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
+h3. Todo from imajes:
+
+* need to make the title bar support git folder
+*
11 completion.zsh
View
@@ -1,6 +1,8 @@
+## fixme - the load process here seems a bit bizarre
+
setopt noautomenu
-setopt COMPLETE_IN_WORD
-setopt ALWAYS_TO_END
+setopt complete_in_word
+setopt always_to_end
unsetopt flowcontrol
@@ -17,9 +19,10 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:
zstyle ':completion:*' list-colors ''
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
-unsetopt MENU_COMPLETE
-setopt AUTO_MENU
+#unsetopt MENU_COMPLETE
+#setopt AUTO_MENU
+# should this be in keybindings?
bindkey -M menuselect '^o' accept-and-infer-next-history
zstyle ':completion:*:*:*:*:*' menu yes select
22 key-bindings.zsh
View
@@ -11,4 +11,24 @@ bindkey "^[[H" beginning-of-line
bindkey "^[[1~" beginning-of-line
bindkey "^[[F" end-of-line
bindkey "^[[4~" end-of-line
-bindkey ' ' magic-space # also do history expansion on space
+bindkey ' ' magic-space # also do history expansion on space
+
+
+# consider emacs keybindings:
+
+#bindkey -e ## emacs key bindings
+#
+#bindkey '^[[A' up-line-or-search
+#bindkey '^[[B' down-line-or-search
+#bindkey '^[^[[C' emacs-forward-word
+#bindkey '^[^[[D' emacs-backward-word
+#
+#bindkey -s '^X^Z' '%-^M'
+#bindkey '^[e' expand-cmd-path
+#bindkey '^[^I' reverse-menu-complete
+#bindkey '^X^N' accept-and-infer-next-history
+#bindkey '^W' kill-region
+#bindkey '^I' complete-word
+## Fix weird sequence that rxvt produces
+#bindkey -s '^[[Z' '\t'
+#
37 xterms.zsh
View
@@ -1,16 +1,21 @@
-# Specific to xterms, such as OS X terminal
-
-if [[ "${TERM}" == xterm* ]]; then
- unset TMOUT
-
- precmd () {
- print -Pn "\033]0;%n@%m %~\007"
- #print -Pn "\033]0;%n@%m%# %~ %l %w :: %T\a" ## or use this
- }
-
- preexec () {
- print -Pn "\033]0;%n@%m <$1> %~\007"
- #print -Pn "\033]0;%n@%m%# <$1> %~ %l %w :: %T\a" ## or use this
- }
-
-fi
+case "$TERM" in
+ xterm*|rxvt*)
+ preexec () {
+ print -Pn "\e]0;%n@%m: $1\a" # xterm
+ }
+ precmd () {
+ print -Pn "\e]0;%n@%m: %~\a" # xterm
+ }
+ ;;
+ screen*)
+ preexec () {
+ local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]}
+ echo -ne "\ek$CMD\e\\"
+ print -Pn "\e]0;%n@%m: $1\a" # xterm
+ }
+ precmd () {
+ echo -ne "\ekzsh\e\\"
+ print -Pn "\e]0;%n@%m: %~\a" # xterm
+ }
+ ;;
+esac
Please sign in to comment.
Something went wrong with that request. Please try again.