93af38f154174f8af9e2aa71a1a64bdc640c3655

Author
James Cox <james@imaj.es>
Committer
James Cox <james@imaj.es>
Date

Message

further refactorings

Diff

 1diff --git a/.gitignore b/.gitignore
 2index 56d0a21228f7447131b7c91a396576652096a953..e8074095077525861e917414924411efc0f01942 100644
 3--- a/.gitignore
 4+++ b/.gitignore
 5@@ -1,3 +1,3 @@
 6+locals.zsh
 7 log/.zsh_history
 8-
 9 projects.zsh
10diff --git a/completion.zsh b/completion.zsh
11index c993620ce90600ced442480b318767193cace6c7..795903d0dee5a4433955814241e6c8ae3845ae13 100644
12--- a/completion.zsh
13+++ b/completion.zsh
14@@ -19,7 +19,7 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:
15 zstyle ':completion:*' list-colors ''
16 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
17 
18-#unsetopt MENU_COMPLETE
19+unsetopt MENU_COMPLETE
20 #setopt AUTO_MENU
21 
22 # should this be in keybindings?
23@@ -31,3 +31,10 @@ zstyle ':completion:*:*:*:*:*' menu yes select
24 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
25 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
26 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
27+
28+
29+#complete on history
30+# zstyle ':completion:*:history-words' stop yes
31+# zstyle ':completion:*:history-words' remove-all-dups yes
32+# zstyle ':completion:*:history-words' list false
33+# zstyle ':completion:*:history-words' menu yes
34diff --git a/directories.zsh b/directories.zsh
35index 32b801470e6ed1ef561f396e68cc7a56de596dc1..31d5336bf36f6abbe059e188c3dcc346fca60ae4 100644
36--- a/directories.zsh
37+++ b/directories.zsh
38@@ -1,5 +1,5 @@
39 # Changing/making/removing directory
40-
41+setopt auto_name_dirs
42 
43 alias ..='cd ..'
44 alias cd..='cd ..'
45diff --git a/key-bindings.zsh b/key-bindings.zsh
46index 43082ae1fafa1a37072ccb38e3cf46be9f23d15f..2fae6d05daeb9a5a3bddd8901a9d43ee0220edf9 100644
47--- a/key-bindings.zsh
48+++ b/key-bindings.zsh
49@@ -1,6 +1,8 @@
50 # TODO: Explain what some of this does..
51 autoload -U compinit
52 compinit
53+
54+bindkey -e
55 bindkey '\ew' kill-region
56 bindkey -s '\el' "ls\n"
57 bindkey -s '\e.' "..\n"
58diff --git a/prompt.zsh b/prompt.zsh
59index 31c33feb5e56d0fd89830a862226481afab803d5..39689684f725c00f01ea86c199a8dd6288470885 100644
60--- a/prompt.zsh
61+++ b/prompt.zsh
62@@ -1,19 +1,12 @@
63 export PAGER=less
64 export LC_CTYPE=en_US.UTF-8
65 
66-bindkey -e
67+# speed stuff.
68 
69-# Directory stuff.
70-setopt AUTO_NAME_DIRS
71-
72-# Speed stuff.
73-
74-#setopt NO_BEEP
75-setopt AUTO_CD
76-setopt MULTIOS
77-setopt CDABLEVARS
78-
79-bindkey -e
80+#setopt no_beep
81+setopt auto_cd
82+setopt multios
83+setopt cdablevarS
84 
85 if [[ x$WINDOW != x ]]
86 then