diff options
author | Tom Willemsen | 2012-02-25 21:53:39 +0100 |
---|---|---|
committer | Tom Willemsen | 2012-02-25 21:53:39 +0100 |
commit | fada655438a5021123e6b46014f9ab0db2cebca3 (patch) | |
tree | 2f9c93056daed3a1a72d30d50521d607a75d12c4 | |
parent | ab27e7a3bb8b20a3efb7186c65d982345de5fdd4 (diff) | |
parent | 4e448f27ecaf9c3776f2e3cc691281aaeb5f7f05 (diff) | |
download | dotfiles-fada655438a5021123e6b46014f9ab0db2cebca3.tar.gz dotfiles-fada655438a5021123e6b46014f9ab0db2cebca3.zip |
Merge remote-tracking branch 'gitorious/master' into phoenix
-rw-r--r-- | .bash_profile | 7 | ||||
-rw-r--r-- | .conkerorrc/webjumps.js | 3 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .zshenv | 1 | ||||
-rw-r--r-- | .zshrc | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/.bash_profile b/.bash_profile new file mode 100644 index 0000000..ebd9117 --- /dev/null +++ b/.bash_profile @@ -0,0 +1,7 @@ +# -*- eval: (git-auto-commit-mode 1) -*- +export BROWSER=conkeror +export EDITOR="emacsclient -c -a emacs" +export INFOPATH="${HOME}/documents/info:${INFOPATH}" +export PATH="${HOME}/bin:${PATH}:/usr/local/bin" + +alias cower="cower --color=always --target=$HOME/var/aur" diff --git a/.conkerorrc/webjumps.js b/.conkerorrc/webjumps.js index 68ee7f5..608c3b6 100644 --- a/.conkerorrc/webjumps.js +++ b/.conkerorrc/webjumps.js @@ -24,3 +24,6 @@ define_webjump("ddg", define_webjump("metal-archives", "http://www.metal-archives.com/search?searchString=%s&type=band_name", $alternative="http://www.metal-arhives.com"); +define_webjump("djangodocs", + "https://docs.djangoproject.com/search/?q=%s&release=5", + $alternative="https://docs.djangoproject.com/"); @@ -104,7 +104,6 @@ xhtml-loader.rnc .emacs.d/ .cuyo .lgames -.bash* .beetsmusic.blb .beetsstate .msmtprc @@ -10,7 +10,6 @@ export LESS_TERMCAP_ue=$'\e[0m' export LESS_TERMCAP_us=$'\e[0;36m' export PAGER=$LESSCMD -export EDITOR="emacsclient -c" # Aliases alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc""" @@ -1,11 +1,5 @@ # -*- Mode: shell-script; eval: (git-auto-commit-mode 1) -*- # Setup variables -PATH="${HOME}/bin:${PATH}:/usr/local/bin" -INFOPATH="${HOME}/documents/info:${INFOPATH}" - -export INFOPATH -export BROWSER=conkeror - HISTFILE=~/.zsh/histfile HISTSIZE=1000 SAVEHIST=1000 |