Updates.

- [vim] add break indent
- [mutt] remove attachment re-encoding
- [zhh] change pdf viewer

3 files changed, 14 insertions, 5 deletions

diff --git a/files/.mutt/muttrc b/files/.mutt/muttrc
index 8cafeb6..fa26da1 100644
--- a/files/.mutt/muttrc
+++ b/files/.mutt/muttrc
@@ -20,7 +20,7 @@ set header_cache="~/.mutt/cache/headers"
 set signature="~/.mutt/signature"
 
 set assumed_charset="cp1251:koi8-r:utf-8"
-set attach_charset="cp1251:koi8-r:utf-8"
+#set attach_charset="cp1251:koi8-r:utf-8"
 
 alternates "anton@bobov.name" "abobov@gmail.com"
 
@@ -100,6 +100,8 @@ set mailcap_path=~/.mutt/mutt_mailcap:/etc/mailcap
 auto_view application/octet-stream
 auto_view text/html
 
+alternative_order text/plain text/html
+
 # Ignore some headers
 ignore *
 unignore From Subject To CC Date Attach
diff --git a/files/.vimrc b/files/.vimrc
index e90b06b..785b576 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -100,6 +100,9 @@ set imsearch=0
 
 set autoread
 set visualbell t_vb=
+if exists('&belloff')
+    set belloff=all
+endif
 set title
 " Скрывать буфер редактировании другого
 set hidden
@@ -116,8 +119,6 @@ set backspace=indent,eol,start
 set number
 set relativenumber
 set nostartofline " many jump commands move the cursor to the first non-blank character of a line
-" Символ показывающий перенос текста
-set showbreak=↵
 " Сколько строк оставлять при прокрутке с низу и с боку
 set scrolljump=4
 set scrolloff=4
@@ -190,11 +191,17 @@ set smarttab
 set shiftround
 set expandtab
 set wrap
-set linebreak
 set textwidth=80
 set formatoptions=rqnl1j
 set cpoptions+=J
 
+set linebreak
+set showbreak=↵
+set breakindent
+if exists('&breakindentopt')
+    set breakindentopt=shift:2
+endif
+
 " }}}
 
 let mapleader=","
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 7633451..2cb207e 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -9,7 +9,7 @@ alias ag="ag --page less"
 
 
 alias -s html=x-www-browser
-alias -s pdf=mupdf
+alias -s pdf=evince
 
 alias -s exe=wine