dotfiles

commit 5ea6ffcfac61d4f2d70dd8ca34b2c6105946b384
parent 1451a8bff074a0b4a7ddf0abb70e3a1a0f4383b0
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date:   Sat, 23 Jul 2016 18:51:40 -0700

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.vimrc
 | 
10
+++++++---
M
bin/battery-osx
 | 
1
+

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.vimrc b/.vimrc
@@ -223,7 +223,8 @@ set backupcopy=yes  " see :help crontab
 set cursorline      " highlight current line
 "set encoding=utf-8  " Necessary to show unicode glyphs
 set expandtab       " convert tab char to spaces
-set formatoptions=aw2qt " automatically reflow paragraphs to line width upon change
+set formatoptions=alw2qt " automatically reflow paragraphs to line width upon change
+set lbr             " break lines between words
 set hlsearch        " highlight search matches
 set ignorecase      " case-insensitive search
 set incsearch       " search as you type
@@ -438,8 +439,8 @@ nmap <leader>= <C-w>=
 
 " Commit all changes
 "nmap <leader>g :Gcommit<CR>
-nmap <leader>g :Start git commit -a -v<CR>
-nmap <leader>G :Start git commit -a -v && git push<CR>
+nmap <leader>g :Start git commit -a -v -S<CR>
+nmap <leader>G :Start git commit -a -v -S && git push<CR>
 
 " Toggle fold
 "nmap <leader>f za
@@ -655,3 +656,6 @@ nnoremap <leader>M :CtrlPMpc<cr>
 
 " use improved encryption method by default
 set cm=blowfish
+
+" toggle autoformatting of text
+nnoremap <leader>f :exe 'set fo'.(&fo=~'a'?'-':'+').'=a'<CR>
diff --git a/bin/battery-osx b/bin/battery-osx
@@ -11,6 +11,7 @@ pmset -g batt | head -n 2 | tail -n 1 |\
     sed 's/finishingcharge/☇/' |\
     sed 's/ $//' |\
     sed "s/drawingfrom'AC//" |\
+    sed "s/from'ACPower'//" |\
     sed 's/failure.*/batt fail/'
 
 # El Capitan and prior