commit 254e3077ad532570a98b2b8385a4fdc771ce0683
parent bb4f5a935a65b184401e186b78c9a7d12736ad11
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 26 Feb 2016 17:17:08 -0800
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.mutt/muttrc b/.mutt/muttrc
@@ -82,7 +82,7 @@ set meta_key=yes
set attribution="* %n <%a> [%{%Y-%m-%d %H:%M:%S %Z}]:\n"
set edit_headers # edit the message headers.
set fast_reply # skip initial prompts when replying
-set editor="vim +8 -c 'set ft=mail noautoindent'"
+set editor="vim +8 -c 'set ft=mail noautoindent spell spelllang=en_US,da'"
set nomark_old # Don't mark unread new msgs as old.
set nosmart_wrap # Don't want smart wrapping.
set nomarkers # Don't want any wrap markers.
diff --git a/.vimrc b/.vimrc
@@ -164,6 +164,10 @@ NeoBundle 'mhinz/vim-startify'
" Show color table with :XtermColorTable
NeoBundle 'guns/xterm-color-table.vim'
+" Auto-complete mutt aliases according to ~/.mutt/aliases
+"NeoBundle 'guanqun/vim-mutt-aliases-plugin'
+NeoBundle 'vim-scripts/mutt-aliases'
+
call neobundle#end()
filetype plugin indent on
@@ -175,6 +179,9 @@ NeoBundleCheck
" Enable syntax highligting
syntax on
+" specify mutt aliases path, autocomplete aliases with @@ in insert mode
+let g:mutt_aliases_file = '~/.mutt/aliases'
+
" Select non-default syntax colorscheme. Found in /usr/share/vim/vim72/colors/
set background=dark " adjust colors for better contrast
colorscheme desert
diff --git a/bin/uu b/bin/uu
@@ -12,8 +12,8 @@ if [[ "$UNAMESTR" == 'Darwin' ]]; then
#read -p "Do you want to update KWM? [y/N] " -n 1 -r
#echo
#if [[ $REPLY =~ ^[Yy]$ ]]; then
- echo "Updating kwm"
- cd ~/code/kwm && git pull && make ; cd -
+ #echo "Updating kwm"
+ #cd ~/code/kwm && git pull && make ; cd -
#fi
fi
diff --git a/osx-install.sh b/osx-install.sh
@@ -38,6 +38,7 @@ brews=( \
"--HEAD neovim/neovim/neovim"\
"nmap"\
"notmuch"\
+ "homebrew/binary/kwm"\
"homebrew/science/octave"\
"offlineimap"\
"openssl"\
