cleanup lib

diff --git a/zsh/lib/aliases.zsh b/zsh/lib/aliases.zsh
deleted file mode 100644 (file)
index a7f699c..0000000
--- a/zsh/lib/aliases.zsh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
-alias ...='cd ../..'
-alias -- -='cd -'
-
-# Super user
-alias _='sudo'
-alias please='sudo'
-
-#alias g='grep -in'
-
-# Show history
-alias history='fc -l 1'
-
-# List direcory contents
-alias lsa='ls -lah'
-alias l='ls -lA1'
-alias ll='ls -l'
-alias la='ls -lA'
-alias sl=ls # often screw this up
-
-alias afind='ack-grep -il'
-

diff --git a/zsh/lib/completion.zsh b/zsh/lib/completion.zsh
index ba839a067c81085e283c71cbd4ee4ead3c5a4727..66ad0025e7a91d5ec5194c3fd08f1d1baa5f05fe 100644 (file)
--- a/zsh/lib/completion.zsh
+++ b/zsh/lib/completion.zsh
@@ -2,7 +2,7 @@
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol

-setopt auto_menu         # show completion menu on succesive tab press
+setopt no_auto_menu         # don't show completion menu on succesive tab press

 setopt complete_in_word
 setopt always_to_end
 
 setopt complete_in_word
 setopt always_to_end
 

diff --git a/zsh/lib/correction.zsh b/zsh/lib/correction.zsh
index fc60dcdbdbead80c8336e4aaeaeb53dc657fce57..0ad789881b16ea85b43264e00f84acad0d7eb6fc 100644 (file)
--- a/zsh/lib/correction.zsh
+++ b/zsh/lib/correction.zsh
@@ -4,7 +4,3 @@ alias man='nocorrect man'
 alias mv='nocorrect mv'
 alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'
 alias mv='nocorrect mv'
 alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'

-alias gist='nocorrect gist'
-alias heroku='nocorrect heroku'
-alias ebuild='nocorrect ebuild'
-alias hpodder='nocorrect hpodder'

diff --git a/zsh/lib/directories.zsh b/zsh/lib/directories.zsh
index e445eb84cf69b96d968eff970751b00d556392b3..4d24fafedea240dbc16051773ca2827c9896d3e9 100644 (file)
--- a/zsh/lib/directories.zsh
+++ b/zsh/lib/directories.zsh
@@ -10,6 +10,7 @@ alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
 alias cd/='cd /'
 
 alias cd.....='cd ../../../..'
 alias cd/='cd /'
 

+alias -- -='cd -'

 alias 1='cd -'
 alias 2='cd +2'
 alias 3='cd +3'
 alias 1='cd -'
 alias 2='cd +2'
 alias 3='cd +3'

diff --git a/zsh/lib/history.zsh b/zsh/lib/history.zsh
index 876936b87888a60d1fc7ece2cdfa8dcdd6d9d8c8..c03575041f021cd7954fdf4140ca96b9871aa9b1 100644 (file)
--- a/zsh/lib/history.zsh
+++ b/zsh/lib/history.zsh
@@ -1,5 +1,5 @@
 ## Command history configuration
 ## Command history configuration

-HISTFILE=$HOME/.zsh_history
+HISTFILE=$HOME/.histfile

 HISTSIZE=10000
 SAVEHIST=10000
 
 HISTSIZE=10000
 SAVEHIST=10000
 


@@ -11,3 +11,5 @@ setopt hist_ignore_space
 setopt hist_verify
 setopt inc_append_history
 setopt share_history # share command history data
 setopt hist_verify
 setopt inc_append_history
 setopt share_history # share command history data

+
+alias history='fc -l 1'